Now uses only stdarg and no varargs. See #130079.

Side-effect: non-ANSI C compilers will probably no longer work (anyone
still uses MIPS compiler on DEcstation/Ultrix?)

SRC/echoping.h

@@ -28,10 +28,7 @@
 #include	<sys/socket.h>
 #include	<netinet/in.h>
 #include	<arpa/inet.h>
-#ifndef OPENSSL
+#include        <stdarg.h>
-/* OpenSSL includes stdarg :-( */
-#include        <varargs.h>
-#endif
 #include        <sys/time.h>
 #include        <errno.h>
 #include        <unistd.h>
@@ -44,8 +41,6 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-
-#include        <varargs.h>
 #endif /* OpenSSL */
 
 #ifndef FALSE
@@ -120,9 +115,9 @@ char *server;
 
 /* error.c */
 void usage ();
-void err_sys ();
+void err_sys (char *str, ...);
-void err_ret ();
+void err_ret (char *str, ...);
-void err_quit ();
+void err_quit (char *str, ...);
 char *sys_err_str ();
 /* writen.c */
 int writen ();

SRC/error.c

@@ -20,17 +20,12 @@ my_perror ()
 
 /* VARARGS1 */
 void
-err_ret (va_alist)
+err_ret (char *str, ...)
-     va_dcl
 {
   va_list args;
-  char *fmt;
 
-  va_start (args);		/* TODO: use stdarg, otherwise, on *some*
+  va_start (args, str);		
-				   platforms: "macro `va_start' used with just one arg" because OpenSSL
+  vfprintf (stderr, str, args);
-				   includes stdarg. */
-  fmt = va_arg (args, char *);
-  vfprintf (stderr, fmt, args);
   va_end (args);
 
   my_perror ();
@@ -52,15 +47,12 @@ err_ret (va_alist)
 
 /* VARARGS1 */
 void
-err_quit (va_alist)
+err_quit (char *str, ...)
-     va_dcl
 {
   va_list args;
-  char *fmt;
 
-  va_start (args);
+  va_start (args, str);
-  fmt = va_arg (args, char *);
+  vfprintf (stderr, str, args);
-  vfprintf (stderr, fmt, args);
   fputc ('\n', stderr);
   va_end (args);
 
@@ -78,16 +70,13 @@ err_quit (va_alist)
  */
 
 /* VARARGS1 */
-void
+void 
-err_sys (va_alist)
+err_sys (char *str, ...)
-     va_dcl
 {
   va_list args;
-  char *fmt;
 
-  va_start (args);
+  va_start (args, str);
-  fmt = va_arg (args, char *);
+  vfprintf (stderr, str, args);
-  vfprintf (stderr, fmt, args);
   va_end (args);
 
   my_perror ();