Add more NORETURN and CHECK_PRINTF function attributes.

[nmh] / sbr / error.c

diff --git a/sbr/error.c b/sbr/error.c
index 8057302aa61a81f85a52a9162295590fba6b6d52..96c89f5812ce92b003803cb835ea05f14d354c61 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -1,6 +1,4 @@
-
-/*
- * error.c -- main error handling routines
+/* error.c -- main error handling routines

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -47,7 +45,7 @@ advise (const char *what, const char *fmt, ...)
  * straightforward, e.g. longjmp(3), but it must not return to adios().
  * If it does then it's a bug and adios() will abort(3) as callers do
  * not expect execution to continue. */
  * straightforward, e.g. longjmp(3), but it must not return to adios().
  * If it does then it's a bug and adios() will abort(3) as callers do
  * not expect execution to continue. */

-void
+void NORETURN

 adios (const char *what, const char *fmt, ...)
 {
     va_list ap;
 adios (const char *what, const char *fmt, ...)
 {
     va_list ap;


@@ -85,7 +83,7 @@ void
 advertise (const char *what, char *tail, const char *fmt, va_list ap)
 {
     int        eindex = errno;
 advertise (const char *what, char *tail, const char *fmt, va_list ap)
 {
     int        eindex = errno;

-    char buffer[NMH_BUFSIZ], errbuf[NMH_BUFSIZ], *err;
+    char buffer[NMH_BUFSIZ], *err;

     struct iovec iob[10], *iov;
     size_t niov;
 
     struct iovec iob[10], *iov;
     size_t niov;
 


@@ -113,11 +111,6 @@ advertise (const char *what, char *tail, const char *fmt, va_list ap)
        }
         ADD_LITERAL(": ");
         err = strerror(eindex);
        }
         ADD_LITERAL(": ");
         err = strerror(eindex);

-        if (!err) {
-           /* this shouldn't happen, but we'll test for it just in case */
-           snprintf(errbuf, sizeof(errbuf), "Error %d", eindex);
-            err = errbuf;
-       }

         ADD_VAR(err);
     }
     if (tail && *tail) {
         ADD_VAR(err);
     }
     if (tail && *tail) {