Hoist test of search string for NULL out of loop.

[nmh] / sbr / error.c

diff --git a/sbr/error.c b/sbr/error.c
index fd74d270a2e89200a8674d23cf603a380aa7dc75..beb4ba6d2213e77937e9ac61c116a8ccdea47987 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -17,7 +17,7 @@
  * print out error message
  */
 void
  * print out error message
  */
 void

-advise (char *what, char *fmt, ...)
+advise (const char *what, const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;
 


@@ -31,7 +31,7 @@ advise (char *what, char *fmt, ...)
  * print out error message and exit
  */
 void
  * print out error message and exit
  */
 void

-adios (char *what, char *fmt, ...)
+adios (const char *what, const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;
 


@@ -60,7 +60,7 @@ admonish (char *what, char *fmt, ...)
  * main routine for printing error messages.
  */
 void
  * main routine for printing error messages.
  */
 void

-advertise (char *what, char *tail, char *fmt, va_list ap)
+advertise (const char *what, char *tail, const char *fmt, va_list ap)

 {
     int        eindex = errno;
     char buffer[BUFSIZ], err[BUFSIZ];
 {
     int        eindex = errno;
     char buffer[BUFSIZ], err[BUFSIZ];


@@ -85,7 +85,7 @@ advertise (char *what, char *tail, char *fmt, va_list ap)
        if (*what) {
            iov->iov_len = strlen (iov->iov_base = " ");
            iov++;
        if (*what) {
            iov->iov_len = strlen (iov->iov_base = " ");
            iov++;

-           iov->iov_len = strlen (iov->iov_base = what);
+           iov->iov_len = strlen (iov->iov_base = (void*)what);

            iov++;
            iov->iov_len = strlen (iov->iov_base = ": ");
            iov++;
            iov++;
            iov->iov_len = strlen (iov->iov_base = ": ");
            iov++;


@@ -106,5 +106,11 @@ advertise (char *what, char *tail, char *fmt, va_list ap)
     }
     iov->iov_len = strlen (iov->iov_base = "\n");
     iov++;
     }
     iov->iov_len = strlen (iov->iov_base = "\n");
     iov++;

-    writev (fileno (stderr), iob, iov - iob);
+    if (writev (fileno (stderr), iob, iov - iob) < 0) {
+        snprintf(buffer, sizeof buffer, "%s: write stderr failed: %d\n",
+            invo_name && *invo_name ? invo_name : "nmh", errno);
+        if (write(2, buffer, strlen(buffer)) == -1) {
+            /* Ignore.  if-statement needed to shut up compiler. */
+        }
+    }

 }
 }