Make varargs usage consistent with the rest of the code.

diff --git a/alloc.c b/alloc.c
index 002423a14f152dc788b4abb1080ebfca02e36622..4db6f2f249ad41431b259809a52002282bd49497 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -174,7 +174,9 @@ int
 #ifdef __STDC__
 easprintf(char **ret, const char *fmt, ...)
 #else
-easprintf(va_alist)
+easprintf(ret, fmt, va_alist)
+    char **ret;
+    const char *fmt;
     va_dcl
 #endif
 {
@@ -183,12 +185,7 @@ easprintf(va_alist)
 #ifdef __STDC__
     va_start(ap, fmt);
 #else
-    char **ret;
-    const char *fmt;
-
     va_start(ap);
-    ret = va_arg(ap, char **);
-    fmt = va_arg(ap, const char *);
 #endif
     len = vasprintf(ret, fmt, ap);
     va_end(ap);

diff --git a/logging.c b/logging.c
index a089b2443f14148634dba8576c9685ec691c3bf5..ea08887a871e5ec81978a589f41311686bd5c712 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -337,7 +337,9 @@ void
 #ifdef __STDC__
 log_error(int flags, const char *fmt, ...)
 #else
-log_error(va_alist)
+log_error(flags, fmt, va_alist)
+    int flags;
+    const char *fmt;
     va_dcl
 #endif
 {
@@ -348,12 +350,7 @@ log_error(va_alist)
 #ifdef __STDC__
     va_start(ap, fmt);
 #else
-    int flags;
-    const char *fmt;
-
     va_start(ap);
-    flags = va_arg(ap, int);
-    fmt = va_arg(ap, const char *);
 #endif
 
     /* Become root if we are not already to avoid user control */