Type cleanup.

[~andy/fetchmail] / report.c

diff --git a/report.c b/report.c
index e1e0b745949918681429eada7f148799dbb45866..bcca5f646c07b33f44d50e047164d0eb41afc4d8 100644 (file)
--- a/report.c
+++ b/report.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -124,7 +124,7 @@ error (int status, int errnum, const char *message, ...)
 error (status, errnum, message, va_alist)
      int status;
      int errnum;
-     char *message;
+     const char *message;
      va_dcl
 #endif
 {
@@ -160,7 +160,17 @@ error (status, errnum, message, va_alist)
 #ifdef HAVE_VSYSLOG
          vsyslog (priority, msg, args);
 #else
+         {
+         char *a1 = va_arg(args, char *);
+         char *a2 = va_arg(args, char *);
+         char *a3 = va_arg(args, char *);
+         char *a4 = va_arg(args, char *);
+         char *a5 = va_arg(args, char *);
+         char *a6 = va_arg(args, char *);
+         char *a7 = va_arg(args, char *);
+         char *a8 = va_arg(args, char *);
          syslog (priority, msg, a1, a2, a3, a4, a5, a6, a7, a8);
+         }
 #endif
        }
       else
@@ -168,7 +178,17 @@ error (status, errnum, message, va_alist)
 #ifdef HAVE_VSYSLOG
          vsyslog (priority, message, args);
 #else
+         {
+         char *a1 = va_arg(args, char *);
+         char *a2 = va_arg(args, char *);
+         char *a3 = va_arg(args, char *);
+         char *a4 = va_arg(args, char *);
+         char *a5 = va_arg(args, char *);
+         char *a6 = va_arg(args, char *);
+         char *a7 = va_arg(args, char *);
+         char *a8 = va_arg(args, char *);
          syslog (priority, message, a1, a2, a3, a4, a5, a6, a7, a8);
+         }
 #endif
        }
 
@@ -204,8 +224,15 @@ error (status, errnum, message, va_alist)
       fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
 #endif
 
-      if (errnum)
-       fprintf (stderr, ": %s", strerror (errnum));
+      if (errnum) {
+       char *tmps = strerror(errnum);
+       if (tmps) {
+         fprintf (stderr, ": %s", tmps);
+       }
+       else {
+         fprintf (stderr, ": Error %d", errnum);
+       }
+      }
       putc ('\n', stderr);
       fflush (stderr);
     }
@@ -231,8 +258,8 @@ int foreground;
    empty) by calling error_complete().
    If an intervening call to error() occurs when a partially constructed
    message exists, then, in an attempt to keep the messages in their proper
-   sequence, the partial message will be printed as-is (with a trailing newline)
-   before error() prints its message.
+   sequence, the partial message will be printed as-is (with a trailing 
+   newline) before error() prints its message. */
 /* VARARGS */
 
 void
@@ -240,7 +267,7 @@ void
 error_build (const char *message, ...)
 #else
 error_build (message, va_alist)
-     char *message;
+     const char *message;
      va_dcl
 #endif
 {
@@ -332,7 +359,7 @@ error_build (message, va_alist)
 /* Complete an error message by appending MESSAGE, which is a printf-style
    format string with optional args, to the existing error message (which may
    be empty.)  The completed error message is then printed (and reset to
-   empty.)
+   empty.) */
 /* VARARGS */
 
 void
@@ -342,7 +369,7 @@ error_complete (int status, int errnum, const char *message, ...)
 error_complete (status, errnum, message, va_alist)
      int status;
      int errnum;
-     char *message;
+     const char *message;
      va_dcl
 #endif
 {
@@ -460,7 +487,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
      int errnum;
      const char *file_name;
      unsigned int line_number;
-     char *message;
+     const char *message;
      va_dcl
 #endif
 {