diff options
Diffstat (limited to 'lib/libc/gen')
| -rw-r--r-- | lib/libc/gen/exec.c | 49 | ||||
| -rw-r--r-- | lib/libc/gen/getosreldate.c | 5 | ||||
| -rw-r--r-- | lib/libc/gen/semctl.c | 16 | ||||
| -rw-r--r-- | lib/libc/gen/sethostname.c | 7 | ||||
| -rw-r--r-- | lib/libc/gen/syslog.c | 15 | ||||
| -rw-r--r-- | lib/libc/gen/termios.c | 6 | ||||
| -rw-r--r-- | lib/libc/gen/vis.c | 4 |
7 files changed, 1 insertions, 101 deletions
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c index 1cb8db7..99e3806 100644 --- a/lib/libc/gen/exec.c +++ b/lib/libc/gen/exec.c @@ -48,34 +48,19 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <paths.h> -#if __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "un-namespace.h" 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++; @@ -85,11 +70,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) @@ -99,24 +80,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++; @@ -126,11 +96,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) @@ -141,25 +107,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++; @@ -169,11 +124,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/getosreldate.c b/lib/libc/gen/getosreldate.c index 6cc3f5c..b0421a3 100644 --- a/lib/libc/gen/getosreldate.c +++ b/lib/libc/gen/getosreldate.c @@ -40,13 +40,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> -#if __STDC__ int getosreldate(void) -#else -int -getosreldate() -#endif { int mib[2]; size_t size; diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c index a64e125..a449cac 100644 --- a/lib/libc/gen/semctl.c +++ b/lib/libc/gen/semctl.c @@ -4,30 +4,16 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> -#if __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <stdlib.h> -#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/sethostname.c b/lib/libc/gen/sethostname.c index 1f0a14a..769401a 100644 --- a/lib/libc/gen/sethostname.c +++ b/lib/libc/gen/sethostname.c @@ -40,15 +40,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> -#if __STDC__ int sethostname(const char *name, int namelen) -#else -int -sethostname(name, namelen) - char *name; - int namelen; -#endif { int mib[2]; diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index 621e63a..fa19907 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -54,11 +54,7 @@ __FBSDID("$FreeBSD$"); #include <time.h> #include <unistd.h> -#if __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "un-namespace.h" #include "libc_private.h" @@ -113,22 +109,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/gen/termios.c b/lib/libc/gen/termios.c index 592d7bf..cc57cf8 100644 --- a/lib/libc/gen/termios.c +++ b/lib/libc/gen/termios.c @@ -83,13 +83,7 @@ tcsetattr(fd, opt, t) } int -#if __STDC__ tcsetpgrp(int fd, pid_t pgrp) -#else -tcsetpgrp(fd, pgrp) - int fd; - pid_t pgrp; -#endif { int s; diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c index bc4903c..640ae3af 100644 --- a/lib/libc/gen/vis.c +++ b/lib/libc/gen/vis.c @@ -97,11 +97,7 @@ vis(dst, c, flag, nextc) *dst++ = '\\'; *dst++ = 'b'; goto done; -#if __STDC__ case '\a': -#else - case '\007': -#endif *dst++ = '\\'; *dst++ = 'a'; goto done; |
