remove USEVERARGS

5 files changed, 16 insertions, 171 deletions

diff --git a/src/extern.h b/src/extern.h
index cdec5f0..bd45d3a 100644
--- a/src/extern.h
+++ b/src/extern.h
@@ -39,17 +39,10 @@ extern void  eexit (int) __attribute__((__noreturn__));
 extern void  Detach (int);
 extern void  Hangup (void);
 extern void  Kill (int, int);
-#ifdef USEVARARGS
 extern void  Msg (int, const char *, ...) __attribute__((format(printf, 2, 3)));
 extern void  Panic (int, const char *, ...) __attribute__((format(printf, 2, 3))) __attribute__((__noreturn__));
 extern void  QueryMsg (int, const char *, ...) __attribute__((format(printf, 2, 3)));
 extern void  Dummy (int, const char *, ...) __attribute__((format(printf, 2, 3)));
-#else
-extern void  Msg ();
-extern void  Panic ();
-extern void  QueryMsg ();
-extern void  Dummy ();
-#endif
 extern void  Finit (int);
 extern void  MakeNewEnv (void);
 extern char *MakeWinMsg (char *, struct win *, int);
@@ -382,13 +375,6 @@ extern void  sleep1000 (int);
 #ifdef DEBUG
 extern void  opendebug (int, int);
 #endif
-#ifdef USEVARARGS
-# ifndef HAVE_VSNPRINTF
-extern int   xvsnprintf (char *, int, char *, va_list);
-# endif
-#else
-extern int   xsnprintf ();
-#endif
 
 
 /* acl.c */
@@ -445,11 +431,7 @@ extern void  LSetFlow (struct layer *, int);
 extern void  LKeypadMode (struct layer *, int);
 extern void  LCursorkeysMode (struct layer *, int);
 extern void  LMouseMode (struct layer *, int);
-#if defined(USEVARARGS)
 extern void  LMsg (int, const char *, ...) __attribute__((format(printf, 2, 3)));
-#else
-extern void  LMsg ();
-#endif
 extern void  KillLayerChain (struct layer *);
 extern int   InitOverlayPage (int, struct LayFuncs *, int);
 extern void  ExitOverlayPage (void);
diff --git a/src/layer.c b/src/layer.c
index c6f91b0..b25e1bc 100644
--- a/src/layer.c
+++ b/src/layer.c
@@ -940,15 +940,7 @@ int isblank;
 }
 
 void
-/*VARARGS2*/
-#if defined(USEVARARGS) && defined(__STDC__)
 LMsg(int err, const char *fmt, VA_DOTS)
-#else
-LMsg(err, fmt, VA_DOTS)
-int err;
-const char *fmt;
-VA_DECL
-#endif
 {
   VA_LIST(ap)
   char buf[MAXPATHLEN*2];
diff --git a/src/misc.c b/src/misc.c
index a757522..dec1457 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -655,117 +655,6 @@ int (*outc) (int);
 #endif /* TERMINFO */
 
 
-
-#ifndef USEVARARGS
-
-# define xva_arg(s, t, tn) (*(t *)(s += xsnoff(tn, 0, 0), s - xsnoff(tn, 0, 0)))
-# define xva_list char *
-
-static int
-xsnoff(a, b, c)
-int a;
-char *b;
-int c;
-{
-  return a ? (char *)&c  - (char *)&b : (char *)&b - (char *)&a;
-}
-
-int
-xsnprintf(s, n, fmt, p1, p2, p3, p4, p5, p6)
-char *s;
-int n;
-char *fmt;
-unsigned long p1, p2, p3, p4, p5, p6;
-{
-  int xvsnprintf (char *, int, char *, xva_list);
-  return xvsnprintf(s, n, fmt, (char *)&fmt + xsnoff(1, 0, 0));
-}
-
-#else
-
 # define xva_arg(s, t, tn) va_arg(s, t)
 # define xva_list va_list
 
-#endif
-
-
-#if !defined(USEVARARGS) || !defined(HAVE_VSNPRINTF)
-
-int
-xvsnprintf(s, n, fmt, stack)
-char *s;
-int n;
-char *fmt;
-xva_list stack;
-{
-  char *f, *sf = 0;
-  int i, on, argl = 0;
-  char myf[10], buf[20];
-  char *arg, *myfp;
-
-  on = n;
-  f = fmt;
-  arg = 0;
-  while(arg || (sf = index(f, '%')) || (sf = f + strlen(f)))
-    {
-      if (arg == 0)
-	{
-	  arg = f;
-	  argl = sf - f;
-	}
-      if (argl)
-	{
-	  i = argl > n - 1 ? n - 1 : argl;
-	  strncpy(s, arg, i);
-          s += i;
-	  n -= i;
-	  if (i < argl)
-	    {
-	      *s = 0;
-	      return on;
-	    }
-	}
-      arg = 0;
-      if (sf == 0)
-	continue;
-      f = sf;
-      sf = 0;
-      if (!*f)
-	break;
-      myfp = myf;
-      *myfp++ = *f++;
-      while (((*f >= '0' && *f <='9') || *f == '#') && myfp - myf < 8)
-        *myfp++ = *f++;
-      *myfp++ = *f;
-      *myfp = 0;
-      if (!*f++)
-	break;
-      switch(f[-1])
-	{
-	case '%':
-	  arg = "%";
-	  break;
-	case 'c':
-	case 'o':
-	case 'd':
-	case 'x':
-	  i = xva_arg(stack, int, 0);
-	  sprintf(buf, myf, i);
-	  arg = buf;
-	  break;
-	case 's':
-	  arg = xva_arg(stack, char *, 1);
-	  if (arg == 0)
-	    arg = "NULL";
-	  break;
-	default:
-	  arg = "";
-	  break;
-	}
-      argl = strlen(arg);
-    }
-  *s = 0;
-  return on - n;
-}
-
-#endif
diff --git a/src/os.h b/src/os.h
index 55de249..ab69d6e 100644
--- a/src/os.h
+++ b/src/os.h
@@ -86,33 +86,22 @@ extern int errno;
 # include <string.h>
 #endif
 
-#ifdef USEVARARGS
-# if defined(__STDC__)
-#  include <stdarg.h>
-#  define VA_LIST(var) va_list var;
-#  define VA_DOTS ...
-#  define VA_DECL
-#  define VA_START(ap, fmt) va_start(ap, fmt)
-#  define VA_ARGS(ap) ap
-#  define VA_END(ap) va_end(ap)
-# else
-#  include <varargs.h>
-#  define VA_LIST(var) va_list var;
-#  define VA_DOTS va_alist
-#  define VA_DECL va_dcl
-#  define VA_START(ap, fmt) va_start(ap)
-#  define VA_ARGS(ap) ap
-#  define VA_END(ap) va_end(ap)
-# endif
+#if defined(__STDC__)
+# include <stdarg.h>
+# define VA_LIST(var) va_list var;
+# define VA_DOTS ...
+# define VA_DECL
+# define VA_START(ap, fmt) va_start(ap, fmt)
+# define VA_ARGS(ap) ap
+# define VA_END(ap) va_end(ap)
 #else
-# define VA_LIST(var)
-# define VA_DOTS p1, p2, p3, p4, p5, p6
-# define VA_DECL unsigned long VA_DOTS;
-# define VA_START(ap, fmt)
-# define VA_ARGS(ap) VA_DOTS
-# define VA_END(ap)
-# undef vsnprintf
-# define vsnprintf xsnprintf
+# include <varargs.h>
+# define VA_LIST(var) va_list var;
+# define VA_DOTS va_alist
+# define VA_DECL va_dcl
+# define VA_START(ap, fmt) va_start(ap)
+# define VA_ARGS(ap) ap
+# define VA_END(ap) va_end(ap)
 #endif
 
 #if !defined(sun) && !defined(B43) && !defined(ISC) && !defined(pyr) && !defined(_CX_UX)
diff --git a/src/screen.c b/src/screen.c
index 5d0129d..9c5c0a8 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2086,14 +2086,7 @@ MakeNewEnv()
   *np = 0;
 }
 
-#if defined(USEVARARGS) && defined(__STDC__)
-  #define DEFINE_VARARGS_FN(fnname)	void fnname (int err, const char *fmt, VA_DOTS)
-#else
-  #define DEFINE_VARARGS_FN(fnname)	void fnname(err, fmt, VA_DOTS) \
-  int err;	\
-  const char *fmt;	\
-  VA_DECL
-#endif
+#define DEFINE_VARARGS_FN(fnname)	void fnname (int err, const char *fmt, VA_DOTS)
 
 #define	PROCESS_MESSAGE(B) do { \
     char *p = B;	\