From e4c94154f8b972d4a8bf59997d4436017cf699d0 Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Tue, 27 Jul 2004 07:59:10 +0000 Subject: [PATCH] Get rid of varargs.h. Add $DragonFly$ where needed. --- lib/libc/db/test/dbtest.c | 16 +----------- lib/libc/gen/exec.c | 51 +-------------------------------------- lib/libc/gen/semctl.c | 17 ++----------- lib/libc/gen/syslog.c | 17 +------------ lib/libc/stdio/fprintf.c | 6 +---- 5 files changed, 6 insertions(+), 101 deletions(-) diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c index fa05b2651f..d1fb66fe11 100644 --- a/lib/libc/db/test/dbtest.c +++ b/lib/libc/db/test/dbtest.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)dbtest.c 8.17 (Berkeley) 9/1/94 * $FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.3.8.1 2000/08/21 22:44:47 jhb Exp $ - * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ + * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.4 2004/07/27 07:59:09 asmodai Exp $ */ #include @@ -718,27 +718,13 @@ usage() exit(1); } -#if __STDC__ #include -#else -#include -#endif void -#if __STDC__ err(const char *fmt, ...) -#else -err(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "dbtest: "); (void)vfprintf(stderr, fmt, ap); va_end(ap); diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c index c787f9cfe2..c874cee7ca 100644 --- a/lib/libc/gen/exec.c +++ b/lib/libc/gen/exec.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/exec.c,v 1.15 2000/01/27 23:06:14 jasone Exp $ - * $DragonFly: src/lib/libc/gen/exec.c,v 1.3 2004/06/06 15:05:55 hmp Exp $ + * $DragonFly: src/lib/libc/gen/exec.c,v 1.4 2004/07/27 07:59:10 asmodai Exp $ * * @(#)exec.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gen/exec.c,v 1.15 2000/01/27 23:06:14 jasone Exp $ @@ -47,33 +47,18 @@ #include #include -#if __STDC__ #include -#else -#include -#endif extern char **environ; int -#if __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; -#if __STDC__ va_start(ap, arg); -#else - va_start(ap); -#endif n = 1; while (va_arg(ap, char *) != NULL) n++; @@ -83,11 +68,7 @@ execl(name, arg, va_alist) errno = ENOMEM; return (-1); } -#if __STDC__ va_start(ap, arg); -#else - va_start(ap); -#endif n = 1; argv[0] = (char *)arg; while ((argv[n] = va_arg(ap, char *)) != NULL) @@ -97,24 +78,13 @@ execl(name, arg, va_alist) } int -#if __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; -#if __STDC__ va_start(ap, arg); -#else - va_start(ap); -#endif n = 1; while (va_arg(ap, char *) != NULL) n++; @@ -124,11 +94,7 @@ execle(name, arg, va_alist) errno = ENOMEM; return (-1); } -#if __STDC__ va_start(ap, arg); -#else - va_start(ap); -#endif n = 1; argv[0] = (char *)arg; while ((argv[n] = va_arg(ap, char *)) != NULL) @@ -139,25 +105,14 @@ execle(name, arg, va_alist) } int -#if __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; int sverrno; char **argv; int n; -#if __STDC__ va_start(ap, arg); -#else - va_start(ap); -#endif n = 1; while (va_arg(ap, char *) != NULL) n++; @@ -167,11 +122,7 @@ execlp(name, arg, va_alist) errno = ENOMEM; return (-1); } -#if __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/semctl.c b/lib/libc/gen/semctl.c index 03ecdbc8ce..0a92accb92 100644 --- a/lib/libc/gen/semctl.c +++ b/lib/libc/gen/semctl.c @@ -1,30 +1,17 @@ +/* $DragonFly: src/lib/libc/gen/semctl.c,v 1.2 2004/07/27 07:59:10 asmodai Exp $ */ + #include #include #include -#if __STDC__ #include -#else -#include -#endif #include -#if __STDC__ int semctl(int semid, int semnum, int cmd, ...) -#else -int semctl(semid, semnum, cmd, va_alist) - int semid, semnum; - int cmd; - va_dcl -#endif { va_list ap; union semun semun; union semun *semun_ptr; -#if __STDC__ va_start(ap, cmd); -#else - va_start(ap); -#endif if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL || cmd == SETVAL || cmd == SETALL) { semun = va_arg(ap, union semun); diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index d6723b42e8..24561b84ce 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -32,7 +32,7 @@ * * @(#)syslog.c 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/lib/libc/gen/syslog.c,v 1.21.2.3 2002/11/18 11:49:55 ru Exp $ - * $DragonFly: src/lib/libc/gen/syslog.c,v 1.4 2004/06/06 15:05:55 hmp Exp $ + * $DragonFly: src/lib/libc/gen/syslog.c,v 1.5 2004/07/27 07:59:10 asmodai Exp $ */ #include @@ -50,11 +50,7 @@ #include #include -#if __STDC__ #include -#else -#include -#endif static int LogFile = -1; /* fd for log */ static int connected; /* have done connect */ @@ -107,22 +103,11 @@ int writehook(cookie, buf, len) * print message on log file; output is intended for syslogd(8). */ void -#if __STDC__ syslog(int pri, const char *fmt, ...) -#else -syslog(pri, fmt, va_alist) - int pri; - char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vsyslog(pri, fmt, ap); va_end(ap); } diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 7818f93ff6..6dcc6d81e0 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -35,15 +35,11 @@ * * @(#)fprintf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.6 1999/08/28 00:01:02 peter Exp $ - * $DragonFly: src/lib/libc/stdio/fprintf.c,v 1.3 2004/06/07 20:35:41 hmp Exp $ + * $DragonFly: src/lib/libc/stdio/fprintf.c,v 1.4 2004/07/27 07:59:10 asmodai Exp $ */ #include -#if __STDC__ #include -#else -#include -#endif int fprintf(FILE *fp, const char *fmt, ...) -- 2.41.0