summaryrefslogtreecommitdiff
path: root/libexec/ld.elf_so/xprintf.c
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2002-05-26 00:02:06 +0000
committerwiz <wiz@NetBSD.org>2002-05-26 00:02:06 +0000
commitbf840df2cdba0729bc7a94289ba477c48b4e0da7 (patch)
treecc28a6a0021548208caaf586c2671ec502420f5e /libexec/ld.elf_so/xprintf.c
parentc632c8bea4d53868b577c0e9e15ed54638ff7320 (diff)
__STDC__ is always defined on NetBSD.
Diffstat (limited to 'libexec/ld.elf_so/xprintf.c')
-rw-r--r--libexec/ld.elf_so/xprintf.c91
1 files changed, 6 insertions, 85 deletions
diff --git a/libexec/ld.elf_so/xprintf.c b/libexec/ld.elf_so/xprintf.c
index 3f4509e8790..a93ac8995ae 100644
--- a/libexec/ld.elf_so/xprintf.c
+++ b/libexec/ld.elf_so/xprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xprintf.c,v 1.8 2001/08/14 20:13:56 eeh Exp $ */
+/* $NetBSD: xprintf.c,v 1.9 2002/05/26 00:02:07 wiz Exp $ */
/*
* Copyright 1996 Matt Thomas <matt@3am-software.com>
@@ -33,11 +33,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef RTLD_LOADER
#define SZ_SHORT 0x01
@@ -213,23 +209,11 @@ xvprintf(fmt, ap)
}
void
-#ifdef __STDC__
xprintf(const char *fmt, ...)
-#else
-xprintf(va_alist)
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- const char *fmt;
-
- va_start(ap);
- fmt = va_arg(ap, const char *);
-#endif
xvprintf(fmt, ap);
@@ -237,26 +221,12 @@ xprintf(va_alist)
}
void
-#ifdef __STDC__
xsnprintf(char *buf, size_t buflen, const char *fmt, ...)
-#else
-xsnprintf(va_alist)
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
+
va_start(ap, fmt);
-#else
- char *buf;
- size_t buflen;
- const char *fmt;
- va_start(ap);
- buf = va_arg(ap, char *);
- buflen = va_arg(ap, size_t);
- fmt = va_arg(ap, const char *);
-#endif
xvsnprintf(buf, buflen, fmt, ap);
va_end(ap);
@@ -275,25 +245,11 @@ xstrerror(error)
}
void
-#ifdef __STDC__
xerrx(int eval, const char *fmt, ...)
-#else
-xerrx(va_alist)
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
- va_start(ap, fmt);
-#else
- int eval;
- const char *fmt;
-
- va_start(ap);
- eval = va_arg(ap, int);
- fmt = va_arg(ap, const char *);
-#endif
+ va_start(ap, fmt);
xvprintf(fmt, ap);
va_end(ap);
@@ -301,25 +257,12 @@ xerrx(va_alist)
}
void
-#ifdef __STDC__
xerr(int eval, const char *fmt, ...)
-#else
-xerr(va_alist)
- va_dcl
-#endif
{
int saved_errno = errno;
va_list ap;
-#ifdef __STDC__
- va_start(ap, fmt);
-#else
- int eval;
- const char *fmt;
- va_start(ap);
- eval = va_arg(ap, int);
- fmt = va_arg(ap, const char *);
-#endif
+ va_start(ap, fmt);
xvprintf(fmt, ap);
va_end(ap);
@@ -328,23 +271,12 @@ xerr(va_alist)
}
void
-#ifdef __STDC__
xwarn(const char *fmt, ...)
-#else
-xwarn(va_alist)
- va_dcl
-#endif
{
int saved_errno = errno;
va_list ap;
-#ifdef __STDC__
- va_start(ap, fmt);
-#else
- const char *fmt;
- va_start(ap);
- fmt = va_arg(ap, const char *);
-#endif
+ va_start(ap, fmt);
xvprintf(fmt, ap);
va_end(ap);
@@ -353,22 +285,11 @@ xwarn(va_alist)
}
void
-#ifdef __STDC__
xwarnx(const char *fmt, ...)
-#else
-xwarnx(va_alist)
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
- va_start(ap, fmt);
-#else
- const char *fmt;
- va_start(ap);
- fmt = va_arg(ap, const char *);
-#endif
+ va_start(ap, fmt);
xvprintf(fmt, ap);
(void) write(2, "\n", 1);
va_end(ap);