commit ac47eebf5f4b8160993616c8d9e345f756d63473
parent eb8fa81fde9468b9e9c0609857169da72d76ad08
Author: Kyle Milz <krwmilz@gmail.com>
Date: Mon, 16 Aug 2021 18:35:47 +0000
Assume stdarg.h
Diffstat:
| M | dvi-draw.c | | | 19 | ------------------- |
| M | popups.c | | | 46 | +--------------------------------------------- |
| M | util.c | | | 19 | ------------------- |
| M | xdvi.c | | | 21 | +-------------------- |
| M | xdvi.h | | | 11 | +++-------- |
5 files changed, 5 insertions(+), 111 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -43,11 +43,7 @@ NOTE:
# define XBell(dpy, percent) XkbBell(dpy, mane.win, percent, (Atom) None)
#endif
-#if NeedVarargsPrototypes /* this is for tell_oops */
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef DOPRNT /* define this if vfprintf gives you trouble */
#define vfprintf(stream, message, args) _doprnt(message, args, stream)
@@ -283,30 +279,15 @@ xskip(offset)
SEEK_CUR);
}
-#if NeedVarargsPrototypes
static void tell_oops(const char *, ...) NORETURN;
static void
tell_oops(const char *message, ...)
-#else
-/* VARARGS */
-static void
-tell_oops(va_alist)
- va_dcl
-#endif
{
-#if !NeedVarargsPrototypes
- const char *message;
-#endif
va_list args;
Fprintf(stderr, "%s: ", prog);
-#if NeedVarargsPrototypes
va_start(args, message);
-#else
- va_start(args);
- message = va_arg(args, const char *);
-#endif
(void) vfprintf(stderr, message, args);
va_end(args);
if (currinf.virtual)
diff --git a/popups.c b/popups.c
@@ -54,11 +54,7 @@ IN THE SOFTWARE.
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
#endif
-#if NeedVarargsPrototypes
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
#ifndef va_copy
# ifdef __va_copy
@@ -198,26 +194,12 @@ vnprintf(format, args)
#if 0 /* not needed (yet) */
static int
-#if NeedVarargsPrototypes
nprintf(const char *format, ...)
-#else
-/* VARARGS */
-nprintf(va_alist)
- va_dcl
-#endif
{
-#if !NeedVarargsPrototypes
- const char *format;
-#endif
va_list args;
int len;
-#if NeedVarargsPrototypes
va_start(args, format);
-#else
- va_start(args);
- format = va_arg(args, const char *);
-#endif
len = vnprintf(format, args);
va_end(args);
@@ -264,26 +246,12 @@ vmprintf(format, args)
}
static char *
-#if NeedVarargsPrototypes
mprintf(const char *format, ...)
-#else
-/* VARARGS */
-mprintf(va_alist)
- va_dcl
-#endif
{
-#if !NeedVarargsPrototypes
- const char *format;
-#endif
va_list args;
char *result;
-#if NeedVarargsPrototypes
va_start(args, format);
-#else
- va_start(args);
- format = va_arg(args, const char *);
-#endif
result = vmprintf(format, args);
va_end(args);
@@ -557,26 +525,14 @@ warning_popup(message, button_name, callback)
Widget
-#if NeedVarargsPrototypes
warning_popup_long(const char *format,
const char *button_name, XtCallbackProc callback, ...)
-#else /* ! NeedVarargsPrototypes */
-warning_popup_long(format, button_name, callback, va_alist)
- const char *format;
- const char *button_name;
- XtCallbackProc callback;
- va_dcl
-#endif /* ! NeedVarargsPrototypes */
{
va_list args;
char *str;
Widget w;
-#if NeedVarargsPrototypes
va_start(args, callback);
-#else
- va_start(args);
-#endif
str = vmprintf(format, args);
va_end(args);
diff --git a/util.c b/util.c
@@ -45,11 +45,7 @@ extern void *malloc();
extern void *realloc();
#endif
-#if NeedVarargsPrototypes /* this is for oops */
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef DOPRNT /* define this if vfprintf gives you trouble */
#define vfprintf(stream, message, args) _doprnt(message, args, stream)
@@ -171,28 +167,13 @@ xdvi_exit(status)
* Print error message and quit.
*/
-#if NeedVarargsPrototypes
void
oops(const char *message, ...)
-#else
-/* VARARGS */
-void
-oops(va_alist)
- va_dcl
-#endif
{
-#if !NeedVarargsPrototypes
- const char *message;
-#endif
va_list args;
Fprintf(stderr, "%s: ", prog);
-#if NeedVarargsPrototypes
va_start(args, message);
-#else
- va_start(args);
- message = va_arg(args, const char *);
-#endif
(void) vfprintf(stderr, message, args);
va_end(args);
Putc('\n', stderr);
diff --git a/xdvi.c b/xdvi.c
@@ -85,11 +85,7 @@ static char copyright[] UNUSED =
#include <math.h> /* sometimes includes atof() */
#include <ctype.h>
-#if NeedVarargsPrototypes /* this is for usage() */
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifndef ALTFONT
#define ALTFONT "cmr10"
@@ -811,21 +807,11 @@ static Arg form_args[] = {
#endif
-static void usage VARGS((const char *, ...)) NORETURN;
+static void usage(const char *, ...) NORETURN;
-#if NeedVarargsPrototypes
static void
usage(const char *message, ...)
-#else
-/* VARARGS */
-void
-usage(va_alist)
- va_dcl
-#endif
{
-#if !NeedVarargsPrototypes
- const char *message;
-#endif
va_list args;
XrmOptionDescRec *opt;
const char **usageptr = usagestr;
@@ -837,12 +823,7 @@ usage(va_alist)
Fprintf(stderr, "%s: ", prog);
-#if NeedVarargsPrototypes
va_start(args, message);
-#else
- va_start(args);
- message = va_arg(args, const char *);
-#endif
(void) vfprintf(stderr, message, args);
va_end(args);
diff --git a/xdvi.h b/xdvi.h
@@ -109,11 +109,6 @@ typedef char Bool3; /* Yes/No/Maybe */
#endif /* not KPATHSEA */
-#if NeedVarargsPrototypes
-#define VARGS(x) x
-#else
-#define VARGS(x) ()
-#endif
#ifndef _XFUNCPROTOBEGIN
#define _XFUNCPROTOBEGIN
@@ -1004,8 +999,8 @@ extern void simple_popdown ARGS((struct status_popup *));
extern void do_popup ARGS((Widget));
extern Widget warning_popup ARGS((const char *, const char *,
XtCallbackProc));
-extern Widget warning_popup_long VARGS((const char *, const char *,
- XtCallbackProc, ...));
+extern Widget warning_popup_long(const char *, const char *,
+ XtCallbackProc, ...);
extern void Act_print ARGS((Widget, XEvent *, String *, Cardinal *));
extern void Act_open_dvi_file ARGS((Widget, XEvent *, String *,
Cardinal *));
@@ -1070,7 +1065,7 @@ extern void applicationDoSpecial ARGS((char *));
extern void scan_special ARGS((char *));
extern void geom_do_special ARGS((struct geom_info *, char *, double));
extern void xdvi_exit ARGS((int)) NORETURN;
-extern void oops VARGS((const char *, ...)) NORETURN;
+extern void oops(const char *, ...) NORETURN;
#ifndef KPATHSEA
extern void *xmalloc ARGS((unsigned));
extern void *xrealloc ARGS((void *, unsigned));
