Many files:

[thirdparty/e2fsprogs.git] / lib / et / com_err.c

diff --git a/lib/et/com_err.c b/lib/et/com_err.c
index 9f4ba5faf94a0db13523b5fb7653f25b985efcf5..8ee332a312c7da39da82e58d4f9f532c91bfcb1d 100644 (file)
--- a/lib/et/com_err.c
+++ b/lib/et/com_err.c
@@ -5,42 +5,24 @@
  */
 
 #include <stdio.h>
+#include "com_err.h"
 #include "mit-sipb-copyright.h"
-
-#if __STDC__ || defined(STDARG_PROTOTYPES)
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#define VARARGS
-#endif
-
 #include "error_table.h"
 #include "internal.h"
 
-#ifdef notdef
-/*
- * Protect us from header version (externally visible) of com_err, so
- * we can survive in a <varargs.h> environment.  I think.
- */
-#define com_err com_err_external
-#include "com_err.h"
-#undef com_err
-#else
-#include "com_err.h"
+#if !defined(__STDC__) && !defined(STDARG_PROTOTYPES)
+#include <varargs.h>
+#define VARARGS
 #endif
 
-#if ! lint
-static const char rcsid[] =
-    "$Header$";
-#endif /* ! lint */
-
 static void
 #ifdef __STDC__
-    default_com_err_proc (const char *whoami, long code, const char *fmt, va_list args)
+    default_com_err_proc (const char *whoami, errcode_t code, const
+                         char *fmt, va_list args)
 #else
     default_com_err_proc (whoami, code, fmt, args)
     const char *whoami;
-    long code;
+    errcode_t code;
     const char *fmt;
     va_list args;
 #endif
@@ -56,32 +38,37 @@ static void
     if (fmt) {
         vfprintf (stderr, fmt, args);
     }
-    putc('\n', stderr);
     /* should do this only on a tty in raw mode */
     putc('\r', stderr);
+    putc('\n', stderr);
     fflush(stderr);
 }
 
 #ifdef __STDC__
-typedef void (*errf) (const char *, long, const char *, va_list);
+typedef void (*errf) (const char *, errcode_t, const char *, va_list);
 #else
 typedef void (*errf) ();
 #endif
 
 errf com_err_hook = default_com_err_proc;
 
+#ifdef __STDC__
+void com_err_va (const char *whoami, errcode_t code, const char *fmt,
+                va_list args)
+#else
 void com_err_va (whoami, code, fmt, args)
     const char *whoami;
-    long code;
+    errcode_t code;
     const char *fmt;
     va_list args;
+#endif
 {
     (*com_err_hook) (whoami, code, fmt, args);
 }
 
 #ifndef VARARGS
 void com_err (const char *whoami,
-             long code,
+             errcode_t code,
              const char *fmt, ...)
 {
 #else
@@ -89,7 +76,7 @@ void com_err (va_alist)
     va_dcl
 {
     const char *whoami, *fmt;
-    long code;
+    errcode_t code;
 #endif
     va_list pvar;
 
@@ -98,7 +85,7 @@ void com_err (va_alist)
 #ifdef VARARGS
     va_start (pvar);
     whoami = va_arg (pvar, const char *);
-    code = va_arg (pvar, long);
+    code = va_arg (pvar, errcode_t);
     fmt = va_arg (pvar, const char *);
 #else
     va_start(pvar, fmt);