summaryrefslogtreecommitdiff
path: root/lib/libc/gen/exec.c
diff options
context:
space:
mode:
authorjtc <jtc@NetBSD.org>1996-07-03 19:53:46 +0000
committerjtc <jtc@NetBSD.org>1996-07-03 19:53:46 +0000
commita174b58e2cd81bf353e25bbfe1b816f829010ace (patch)
treedaf893d3c7dcb300944f6a16e5223e0ffe2f6c61 /lib/libc/gen/exec.c
parentde867628ced3879ecaef66d43434e6553fd3cb46 (diff)
Added a new VA_START macro to hide the differences between varargs.h
and stdargs.h. This cleans up a lot of conditionals throughout this file.
Diffstat (limited to 'lib/libc/gen/exec.c')
-rw-r--r--lib/libc/gen/exec.c42
1 files changed, 10 insertions, 32 deletions
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 3ae266082d2..3dab222fb39 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.7 1995/12/14 16:51:27 jtc Exp $ */
+/* $NetBSD: exec.c,v 1.8 1996/07/03 19:53:46 jtc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
-static char rcsid[] = "$NetBSD: exec.c,v 1.7 1995/12/14 16:51:27 jtc Exp $";
+static char rcsid[] = "$NetBSD: exec.c,v 1.8 1996/07/03 19:53:46 jtc Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -52,8 +52,10 @@ static char rcsid[] = "$NetBSD: exec.c,v 1.7 1995/12/14 16:51:27 jtc Exp $";
#if __STDC__
#include <stdarg.h>
+#define VA_START(ap, last) va_start(ap, last)
#else
#include <varargs.h>
+#define VA_START(ap, last) va_start(ap)
#endif
extern char **environ;
@@ -72,22 +74,14 @@ execl(name, arg, va_alist)
char **argv;
int i;
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
for (i = 1; va_arg(ap, char *) != NULL; i++)
;
va_end(ap);
argv = alloca (i * sizeof (char *));
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
argv[0] = (char *) arg;
for (i = 1; (argv[i] = (char *) va_arg(ap, char *)) != NULL; i++)
;
@@ -110,22 +104,14 @@ execle(name, arg, va_alist)
char **argv, **envp;
int i;
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
for (i = 1; va_arg(ap, char *) != NULL; i++)
;
va_end(ap);
argv = alloca (i * sizeof (char *));
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
argv[0] = (char *) arg;
for (i = 1; (argv[i] = (char *) va_arg(ap, char *)) != NULL; i++)
;
@@ -149,22 +135,14 @@ execlp(name, arg, va_alist)
char **argv;
int i;
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
for (i = 1; va_arg(ap, char *) != NULL; i++)
;
va_end(ap);
argv = alloca (i * sizeof (char *));
-#if __STDC__
- va_start(ap, arg);
-#else
- va_start(ap);
-#endif
+ VA_START(ap, arg);
argv[0] = (char *) arg;
for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++)
;