diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
| commit | 3923126b85f9e8a77cab9a41b5a62125acd5b4cd (patch) | |
| tree | 1a8b19c5db03f8c989fc8228811837b182feb7a3 /libexec/smtpd | |
| parent | cc03bdb70090357d2393b6ec82e3cde4d5ce5edd (diff) | |
We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.
Diffstat (limited to 'libexec/smtpd')
| -rw-r--r-- | libexec/smtpd/src/accumlog.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/libexec/smtpd/src/accumlog.c b/libexec/smtpd/src/accumlog.c index aebe5306c4b..216d615b93e 100644 --- a/libexec/smtpd/src/accumlog.c +++ b/libexec/smtpd/src/accumlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: accumlog.c,v 1.2 2001/01/28 19:34:34 niklas Exp $*/ +/* $OpenBSD: accumlog.c,v 1.3 2002/02/19 19:39:38 millert Exp $*/ /* * @@ -73,18 +73,14 @@ # include "config.h" #endif -#include <stdio.h> -#if defined(__STDC__) || defined(__cplusplus) +#include <stdio.h> #include <stdarg.h> -#else -#include <varargs.h> -#endif -#include <syslog.h> -#include <sys/types.h> -#include <string.h> +#include <syslog.h> +#include <sys/types.h> +#include <string.h> #include <sysexits.h> /* exit codes so smtpd/smtpfwdd can exit properly -BB */ #ifdef HAVE_MALLOC_H -# include <malloc.h> +# include <malloc.h> #else extern char *malloc(), *realloc(); #endif @@ -101,28 +97,15 @@ extern char *malloc(), *realloc(); #endif int -#ifdef __STDC__ -accumlog(int level, const char *fmt, ...) { -#else -accumlog(va_alist) - va_dcl +accumlog(int level, const char *fmt, ...) { - int level; - char *fmt; -#endif va_list va; static char *log = 0; static int lsz = 0; static int lx = 0; int i, x, space = 0; -#ifdef __STDC__ va_start(va, fmt); -#else - va_start(va); - level = va_arg(va, int); - fmt = va_arg(va, char *); -#endif if (log == 0) { lsz = 2 * LOG_HUNK; if ((log = (char *) malloc(lsz)) == 0) { |