summaryrefslogtreecommitdiff
path: root/lib/libc/gen
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/gen')
-rw-r--r--lib/libc/gen/err.c22
-rw-r--r--lib/libc/gen/errx.c22
-rw-r--r--lib/libc/gen/exec.c52
-rw-r--r--lib/libc/gen/fnmatch.c12
-rw-r--r--lib/libc/gen/getpwent.c7
-rw-r--r--lib/libc/gen/setdomainname.c9
-rw-r--r--lib/libc/gen/sethostname.c9
-rw-r--r--lib/libc/gen/setmode.c10
-rw-r--r--lib/libc/gen/setproctitle.c17
-rw-r--r--lib/libc/gen/syslog.c30
-rw-r--r--lib/libc/gen/unvis.c9
-rw-r--r--lib/libc/gen/verr.c7
-rw-r--r--lib/libc/gen/verrx.c7
-rw-r--r--lib/libc/gen/vis.c6
-rw-r--r--lib/libc/gen/vwarn.c7
-rw-r--r--lib/libc/gen/vwarnx.c7
-rw-r--r--lib/libc/gen/waitpid.c9
-rw-r--r--lib/libc/gen/warn.c20
-rw-r--r--lib/libc/gen/warnx.c20
19 files changed, 25 insertions, 257 deletions
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 5749b3fada8..701551c3705 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -32,36 +32,18 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: err.c,v 1.4 1997/07/25 20:30:01 mickey Exp $";
+static char rcsid[] = "$OpenBSD: err.c,v 1.5 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
__dead void
-#ifdef __STDC__
_err(int eval, const char *fmt, ...)
-#else
-_err(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);
_verr(eval, fmt, ap);
va_end(ap);
}
diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c
index 8f80294af8d..9b109de9039 100644
--- a/lib/libc/gen/errx.c
+++ b/lib/libc/gen/errx.c
@@ -32,36 +32,18 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: errx.c,v 1.3 1997/07/25 20:30:02 mickey Exp $";
+static char rcsid[] = "$OpenBSD: errx.c,v 1.4 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
__dead void
-#ifdef __STDC__
_errx(int eval, const char *fmt, ...)
-#else
-_errx(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);
_verrx(eval, fmt, ap);
va_end(ap);
}
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 6f42fa3c18a..9341d4f4c4d 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: exec.c,v 1.11 2000/08/22 18:46:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.12 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -44,34 +44,18 @@ static char rcsid[] = "$OpenBSD: exec.c,v 1.11 2000/08/22 18:46:04 deraadt Exp $
#include <string.h>
#include <stdio.h>
#include <paths.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
extern char **environ;
int
-#ifdef __STDC__
execl(const char *name, const char *arg, ...)
-#else
-execl(name, arg, va_alist)
- const char *name;
- const char *arg;
- va_dcl
-#endif
{
va_list ap;
char **argv;
int n;
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
while (va_arg(ap, char *) != NULL)
n++;
@@ -81,11 +65,7 @@ execl(name, arg, va_alist)
errno = ENOMEM;
return (-1);
}
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
argv[0] = (char *)arg;
while ((argv[n] = va_arg(ap, char *)) != NULL)
@@ -95,24 +75,13 @@ execl(name, arg, va_alist)
}
int
-#ifdef __STDC__
execle(const char *name, const char *arg, ...)
-#else
-execle(name, arg, va_alist)
- const char *name;
- const char *arg;
- va_dcl
-#endif
{
va_list ap;
char **argv, **envp;
int n;
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
while (va_arg(ap, char *) != NULL)
n++;
@@ -122,11 +91,7 @@ execle(name, arg, va_alist)
errno = ENOMEM;
return (-1);
}
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
argv[0] = (char *)arg;
while ((argv[n] = va_arg(ap, char *)) != NULL)
@@ -137,24 +102,13 @@ execle(name, arg, va_alist)
}
int
-#ifdef __STDC__
execlp(const char *name, const char *arg, ...)
-#else
-execlp(name, arg, va_alist)
- const char *name;
- const char *arg;
- va_dcl
-#endif
{
va_list ap;
char **argv;
int n;
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
while (va_arg(ap, char *) != NULL)
n++;
@@ -164,11 +118,7 @@ execlp(name, arg, va_alist)
errno = ENOMEM;
return (-1);
}
-#ifdef __STDC__
va_start(ap, arg);
-#else
- va_start(ap);
-#endif
n = 1;
argv[0] = (char *)arg;
while ((argv[n] = va_arg(ap, char *)) != NULL)
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index 53bf7965a37..065bc51e1ef 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $ */
+/* $OpenBSD: fnmatch.c,v 1.9 2002/02/19 19:39:36 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.9 2002/02/19 19:39:36 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -165,15 +165,7 @@ fnmatch(pattern, string, flags)
}
static int
-#ifdef __STDC__
rangematch(const char *pattern, char test, int flags, char **newp)
-#else
-rangematch(pattern, test, flags, newp)
- char *pattern;
- char test;
- int flags;
- char **newp;
-#endif
{
int negate, ok;
char c, c2;
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index aa071665213..0ddc32e44b4 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.23 2002/02/16 21:27:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: getpwent.c,v 1.24 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -746,12 +746,7 @@ pwnam_netgrp:
}
struct passwd *
-#ifdef __STDC__
getpwuid(uid_t uid)
-#else
-getpwuid(uid)
- uid_t uid;
-#endif
{
DBT key;
char bf[sizeof(_pw_keynum) + 1];
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 815ab68a197..068a0e859b1 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -32,21 +32,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setdomainname.c,v 1.4 1998/05/13 08:50:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: setdomainname.c,v 1.5 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
#include <sys/sysctl.h>
-#ifdef __STDC__
int
setdomainname(const char *name, size_t namelen)
-#else
-int
-setdomainname(name, namelen)
- char *name;
- size_t namelen;
-#endif
{
int mib[2];
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index cfadd83be91..26a3cc533f4 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -32,21 +32,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sethostname.c,v 1.4 1998/05/13 08:51:00 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sethostname.c,v 1.5 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
#include <sys/sysctl.h>
-#ifdef __STDC__
int
sethostname(const char *name, size_t namelen)
-#else
-int
-sethostname(name, namelen)
- char *name;
- size_t namelen;
-#endif
{
int mib[2];
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 228a046560d..f5e2fb08cc7 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */
+/* $OpenBSD: setmode.c,v 1.11 2002/02/19 19:39:36 millert Exp $ */
/* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */
/*
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: setmode.c,v 1.11 2002/02/19 19:39:36 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -86,13 +86,7 @@ static void dumpmode(BITCMD *);
* bits) followed by a '+' (set bits).
*/
mode_t
-#ifdef __STDC__
getmode(const void *bbox, mode_t omode)
-#else
-getmode(bbox, omode)
- const void *bbox;
- mode_t omode;
-#endif
{
register const BITCMD *set;
register mode_t clrval, newmode, value;
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 7d16d03e795..fd23dbdab3e 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.8 2001/11/06 19:21:40 art Exp $";
+static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.9 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -41,25 +41,14 @@ static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.8 2001/11/06 19:21:40 art Ex
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#define MAX_PROCTITLE 2048
extern char *__progname; /* Program name, from crt0. */
void
-#ifdef __STDC__
setproctitle(const char *fmt, ...)
-#else
-setproctitle(fmt, va_alist)
- const char *fmt;
- va_dcl
-#endif
{
static struct ps_strings *ps;
va_list ap;
@@ -67,11 +56,7 @@ setproctitle(fmt, va_alist)
static char buf[MAX_PROCTITLE], *bufp = buf;
size_t used;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
if (fmt != NULL) {
used = snprintf(buf, MAX_PROCTITLE, "%s: ", __progname);
if (used >= MAX_PROCTITLE)
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index dcfc0b9ac01..a10ecf37702 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: syslog.c,v 1.15 2002/02/18 00:07:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: syslog.c,v 1.16 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -49,12 +49,7 @@ static char rcsid[] = "$OpenBSD: syslog.c,v 1.15 2002/02/18 00:07:56 millert Exp
#include <string.h>
#include <time.h>
#include <unistd.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
static struct syslog_data sdata = SYSLOG_DATA_INIT;
@@ -70,22 +65,11 @@ static void connectlog_r(struct syslog_data *);
* print message on log file; output is intended for syslogd(8).
*/
void
-#ifdef __STDC__
syslog(int pri, const char *fmt, ...)
-#else
-syslog(pri, fmt, va_alist)
- int pri;
- char *fmt;
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
vsyslog(pri, fmt, ap);
va_end(ap);
}
@@ -136,23 +120,11 @@ setlogmask(pmask)
/* Reentrant version of syslog, i.e. syslog_r() */
void
-#ifdef __STDC__
syslog_r(int pri, struct syslog_data *data, const char *fmt, ...)
-#else
-syslog_r(pri, data, fmt, va_alist)
- int pri;
- struct syslog_data *data;
- char *fmt;
- va_dcl
-#endif
{
va_list ap;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
vsyslog_r(pri, data, fmt, ap);
va_end(ap);
}
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index c494c1c1965..6f0d2ebd593 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.6 1997/07/25 20:30:05 mickey Exp $";
+static char rcsid[] = "$OpenBSD: unvis.c,v 1.7 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -56,14 +56,7 @@ static char rcsid[] = "$OpenBSD: unvis.c,v 1.6 1997/07/25 20:30:05 mickey Exp $"
* unvis - decode characters previously encoded by vis
*/
int
-#ifdef __STDC__
unvis(char *cp, char c, int *astate, int flag)
-#else
-unvis(cp, c, astate, flag)
- char *cp;
- char c;
- int *astate, flag;
-#endif
{
if (flag & UNVIS_END) {
diff --git a/lib/libc/gen/verr.c b/lib/libc/gen/verr.c
index a95590f7bcc..512d2565b7e 100644
--- a/lib/libc/gen/verr.c
+++ b/lib/libc/gen/verr.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: verr.c,v 1.2 1996/08/19 08:27:30 tholo Exp $";
+static char rcsid[] = "$OpenBSD: verr.c,v 1.3 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
@@ -40,12 +40,7 @@ static char rcsid[] = "$OpenBSD: verr.c,v 1.2 1996/08/19 08:27:30 tholo Exp $";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
extern char *__progname; /* Program name, from crt0. */
diff --git a/lib/libc/gen/verrx.c b/lib/libc/gen/verrx.c
index 6724c2cd682..3c336c75a88 100644
--- a/lib/libc/gen/verrx.c
+++ b/lib/libc/gen/verrx.c
@@ -32,18 +32,13 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: verrx.c,v 1.2 1996/08/19 08:27:32 tholo Exp $";
+static char rcsid[] = "$OpenBSD: verrx.c,v 1.3 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
extern char *__progname; /* Program name, from crt0. */
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 45abbf7aff7..894366e8cc1 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vis.c,v 1.7 2001/08/13 15:30:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -80,11 +80,7 @@ vis(dst, c, flag, nextc)
*dst++ = '\\';
*dst++ = 'b';
goto done;
-#ifdef __STDC__
case '\a':
-#else
- case '\007':
-#endif
*dst++ = '\\';
*dst++ = 'a';
goto done;
diff --git a/lib/libc/gen/vwarn.c b/lib/libc/gen/vwarn.c
index b5b051cac47..d659ace55c8 100644
--- a/lib/libc/gen/vwarn.c
+++ b/lib/libc/gen/vwarn.c
@@ -32,19 +32,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vwarn.c,v 1.2 1996/08/19 08:27:38 tholo Exp $";
+static char rcsid[] = "$OpenBSD: vwarn.c,v 1.3 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
extern char *__progname; /* Program name, from crt0. */
diff --git a/lib/libc/gen/vwarnx.c b/lib/libc/gen/vwarnx.c
index cc7adb146e5..40619302413 100644
--- a/lib/libc/gen/vwarnx.c
+++ b/lib/libc/gen/vwarnx.c
@@ -32,17 +32,12 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vwarnx.c,v 1.2 1996/08/19 08:27:39 tholo Exp $";
+static char rcsid[] = "$OpenBSD: vwarnx.c,v 1.3 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
#include <stdio.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
extern char *__progname; /* Program name, from crt0. */
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 87b485fdba0..c38aea6f75b 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: waitpid.c,v 1.3 1997/07/25 20:30:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: waitpid.c,v 1.4 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -41,14 +41,7 @@ static char rcsid[] = "$OpenBSD: waitpid.c,v 1.3 1997/07/25 20:30:06 mickey Exp
#include <sys/resource.h>
pid_t
-#ifdef __STDC__
waitpid(pid_t pid, int *istat, int options)
-#else
-waitpid(pid, istat, options)
- pid_t pid;
- int *istat;
- int options;
-#endif
{
return (wait4(pid, istat, options, (struct rusage *)0));
}
diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c
index 422d94b2059..cfb4e66c363 100644
--- a/lib/libc/gen/warn.c
+++ b/lib/libc/gen/warn.c
@@ -32,34 +32,18 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: warn.c,v 1.3 1997/07/25 20:30:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: warn.c,v 1.4 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
void
-#ifdef __STDC__
_warn(const char *fmt, ...)
-#else
-_warn(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);
_vwarn(fmt, ap);
va_end(ap);
}
diff --git a/lib/libc/gen/warnx.c b/lib/libc/gen/warnx.c
index 02367b0ec88..f7255262716 100644
--- a/lib/libc/gen/warnx.c
+++ b/lib/libc/gen/warnx.c
@@ -32,34 +32,18 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: warnx.c,v 1.2 1996/08/19 08:27:50 tholo Exp $";
+static char rcsid[] = "$OpenBSD: warnx.c,v 1.3 2002/02/19 19:39:36 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
-
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
void
-#ifdef __STDC__
_warnx(const char *fmt, ...)
-#else
-_warnx(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);
_vwarnx(fmt, ap);
va_end(ap);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 23:54:28 +0000