* src/lha.h: support de-ANSI variable arguments.

* src/lharc.c: ditto.

* src/util.c: ditto.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@303 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/lha.h b/src/lha.h
index df11af6..82b6e40 100644 (file)
--- a/src/lha.h
+++ b/src/lha.h
@@ -25,8 +25,10 @@
 
 #if STDC_HEADERS
 # include <stdarg.h>
+# define va_init(a,b) va_start(a,b)
 #else
 # include <varargs.h>
+# define va_init(a,b) va_start(a)
 #endif
 
 #if HAVE_PWD_H

diff --git a/src/lharc.c b/src/lharc.c
index 9cbf71f..b7bd6f6 100644 (file)
--- a/src/lharc.c
+++ b/src/lharc.c
@@ -466,14 +466,20 @@ print_version()
 }
 
 void
+#if PROTOTYPES
 message(char *fmt, ...)
+#else
+message(fmt, va_alist)
+    char *fmt;
+    va_dcl
+#endif
 {
     int errno_sv = errno;
     va_list v;
 
        fprintf(stderr, "LHa: ");
 
-    va_start(v, fmt);
+    va_init(v, fmt);
     vfprintf(stderr, fmt, v);
     va_end(v);
 
@@ -484,14 +490,20 @@ message(char *fmt, ...)
 
 /* ------------------------------------------------------------------------ */
 void
+#if PROTOTYPES
 warning(char *fmt, ...)
+#else
+warning(fmt, va_alist)
+    char *fmt;
+    va_dcl
+#endif
 {
     int errno_sv = errno;
     va_list v;
 
        fprintf(stderr, "LHa: Warning: ");
 
-    va_start(v, fmt);
+    va_init(v, fmt);
     vfprintf(stderr, fmt, v);
     va_end(v);
 
@@ -502,14 +514,20 @@ warning(char *fmt, ...)
 
 /* ------------------------------------------------------------------------ */
 void
+#if PROTOTYPES
 error(char *fmt, ...)
+#else
+error(fmt, va_alist)
+    char *fmt;
+    va_dcl
+#endif
 {
     int errno_sv = errno;
     va_list v;
 
        fprintf(stderr, "LHa: Error: ");
 
-    va_start(v, fmt);
+    va_init(v, fmt);
     vfprintf(stderr, fmt, v);
     va_end(v);
 
@@ -519,14 +537,20 @@ error(char *fmt, ...)
 }
 
 void
+#if PROTOTYPES
 fatal_error(char *fmt, ...)
+#else
+fatal_error(fmt, va_alist)
+    char *fmt;
+    va_dcl
+#endif
 {
     int errno_sv = errno;
     va_list v;
 
        fprintf(stderr, "LHa: Fatal error: ");
 
-    va_start(v, fmt);
+    va_init(v, fmt);
     vfprintf(stderr, fmt, v);
     va_end(v);
 

diff --git a/src/util.c b/src/util.c
index ab2d947..da01caa 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -368,12 +368,19 @@ memset(s, c, n)
 #endif
 
 int
+#if STDC_HEADERS
 xsnprintf(char *dest, size_t size, char *fmt, ...)
+#else
+xsnprintf(dest, size, fmt, va_alist)
+    char *dest, *fmt;
+    size_t size;
+    va_dcl
+#endif
 {
     int len;
     va_list v;
 
-    va_start(v, fmt);
+    va_init(v, fmt);
     len = vsnprintf(dest, size, fmt, v);
     va_end(v);