Code style cleanup. (No functional changes)

[moira.git] / update / log.c

diff --git a/update/log.c b/update/log.c
index 05c2453cb8bfc95d684fb25e6f52b75724966410..2f31db2f72d7a8d38c128ee8f833c82c60b9f9fb 100644 (file)
--- a/update/log.c
+++ b/update/log.c
@@ -24,12 +24,7 @@ static char *rcsid_log_c = "$Header$";
 #include <mit-copyright.h>
 #include <stdio.h>
 #include "com_err.h"
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#define const
-#endif
 #include "update.h"
 #include <krb.h>
 
@@ -41,81 +36,70 @@ static char *rcsid_log_c = "$Header$";
 
 #ifdef use_syslog
 int syslog_prio[] = {
-    LOG_DEBUG,
-    LOG_INFO,
-    LOG_WARNING,
-    LOG_ERR
+  LOG_DEBUG,
+  LOG_INFO,
+  LOG_WARNING,
+  LOG_ERR
 };
 #endif
 extern int log_priority;
 extern char *whoami;
 
-void mr_update_com_err_hook(whoami, code, fmt, args)
-    const char *whoami;
-    long code;
-    const char *fmt;
-    va_list args;
+void mr_update_com_err_hook(const char *whoami, long code,
+                           const char *fmt, va_list args)
 {
-    char buf[BUFSIZ], *cp;
-    FILE _strbuf;
+  char buf[BUFSIZ], *cp;
+  FILE _strbuf;
 
 #ifndef use_syslog
-    strcpy(buf, whoami);
-    for (cp = buf; *cp; cp++)
-       ;
-    *cp++ = ':';
-    *cp++ = ' ';
+  strcpy(buf, whoami);
+  for (cp = buf; *cp; cp++)
+    ;
+  *cp++ = ':';
+  *cp++ = ' ';
 #else
-    cp = buf;
-    *cp = '\0';
+  cp = buf;
+  *cp = '\0';
 #endif
-    if (code) {
-       strcpy(cp, error_message(code));
-       while (*cp)
-           cp++;
+  if (code)
+    {
+      strcpy(cp, error_message(code));
+      while (*cp)
+       cp++;
     }
-#ifdef HAS_VSPRINTF
-    vsprintf(cp, fmt, args);
-#else
-    _strbuf._flag = _IOWRT+_IOSTRG;
-    _strbuf._ptr = cp;
-    _strbuf._cnt = BUFSIZ-(cp-buf);
-    _doprnt(fmt, args, &_strbuf);
-    putc('\0', &_strbuf);
-#endif
+  vsprintf(cp, fmt, args);
 #ifdef use_syslog
-    syslog(syslog_prio[log_priority], "%s", buf);
+  syslog(syslog_prio[log_priority], "%s", buf);
 #endif
 #ifdef use_tty
-    puts(buf);
+  puts(buf);
 #endif
 }
 
-mr_update_initialize()
+mr_update_initialize(void)
 {
-    static int initialized = 0;
-    if (initialized)
-       return;
+  static int initialized = 0;
+  if (initialized)
+    return;
 #ifdef use_syslog
-    openlog(whoami, LOG_PID, LOG_DAEMON);
+  openlog(whoami, LOG_PID, LOG_DAEMON);
 #endif
-    (void) set_com_err_hook(mr_update_com_err_hook);
-    log_priority = log_INFO;
-    initialized = 1;
+  set_com_err_hook(mr_update_com_err_hook);
+  log_priority = log_INFO;
+  initialized = 1;
 }
 
 
 static char fmt[] = "[%s] %s";
 
-#define        def(name,level,prio) \
-    name(msg) \
-    char *msg; \
+#define        def(name, level, prio) \
+name(char *msg)\
 {\
-     register int old_prio; \
-     old_prio = log_priority; \
-     mr_update_initialize(); \
-     com_err(whoami, 0, fmt, level, msg); \
-     log_priority = old_prio; \
+   register int old_prio; \
+   old_prio = log_priority; \
+   mr_update_initialize(); \
+   com_err(whoami, 0, fmt, level, msg); \
+   log_priority = old_prio; \
 }
 
 def(mr_log_error, "error", log_ERROR)