diff options
399 files changed, 907 insertions, 6695 deletions
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c index 6a3efa83c91..4d13c86a133 100644 --- a/bin/csh/alloc.c +++ b/bin/csh/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.6 2001/06/25 10:03:48 art Exp $ */ +/* $OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: alloc.c,v 1.6 2001/06/25 10:03:48 art Exp $"; +static char rcsid[] = "$OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <unistd.h> #include <stdlib.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/csh.c b/bin/csh/csh.c index eecb80ab37b..4e5e8c5b86f 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: csh.c,v 1.16 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.16 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -60,11 +60,7 @@ static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $" #include <locale.h> #include <unistd.h> #include <vis.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "proc.h" diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 342f8cffcde..1f940916827 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "dir.h" diff --git a/bin/csh/dol.c b/bin/csh/dol.c index a3432c4b291..316cf4b7467 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/error.c b/bin/csh/error.c index 982de021feb..e54f9a7a395 100644 --- a/bin/csh/error.c +++ b/bin/csh/error.c @@ -1,4 +1,4 @@ -/* $OpenBSD: error.c,v 1.3 2000/08/30 01:46:34 mickey Exp $ */ +/* $OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: error.c,v 1.3 2000/08/30 01:46:34 mickey Exp $"; +static char rcsid[] = "$OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" @@ -293,23 +289,13 @@ static char *errorlist[] = * e.g. in process. */ void -#ifdef __STDC__ seterror(int id, ...) -#else -seterror(id, va_alist) - int id; - va_dcl -#endif { if (seterr == 0) { char berr[BUFSIZ]; va_list va; -#ifdef __STDC__ va_start(va, id); -#else - va_start(va); -#endif if (id < 0 || id > sizeof(errorlist) / sizeof(errorlist[0])) id = ERR_INVALID; vsnprintf(berr, sizeof(berr), errorlist[id], va); @@ -338,13 +324,7 @@ seterror(id, va_alist) * place error unwinds are ever caught. */ void -#ifdef __STDC__ stderror(int id, ...) -#else -stderror(id, va_alist) - int id; - va_dcl -#endif { va_list va; register Char **v; @@ -371,11 +351,7 @@ stderror(id, va_alist) /* Old error. */ (void) fprintf(csherr, "%s.\n", seterr); else { -#ifdef __STDC__ va_start(va, id); -#else - va_start(va); -#endif (void) vfprintf(csherr, errorlist[id], va); va_end(va); (void) fprintf(csherr, ".\n"); diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 59d8c05021a..02022d968ac 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -51,11 +51,7 @@ static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/exp.c b/bin/csh/exp.c index 862485423f0..fa41415703b 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/file.c b/bin/csh/file.c index 5f4c46545cf..303dac5cfaf 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -55,11 +55,7 @@ static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $" #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/func.c b/bin/csh/func.c index c64f90da9bc..625bb099fa3 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/glob.c b/bin/csh/glob.c index cd3e1175002..24bb3e2b5a2 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/hist.c b/bin/csh/hist.c index a4dfa650281..856c7e3488b 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */ /*- @@ -38,17 +38,13 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/init.c b/bin/csh/init.c index ca60a6b2449..ec61f3bea0e 100644 --- a/bin/csh/init.c +++ b/bin/csh/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $ */ +/* $OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */ /*- @@ -38,15 +38,11 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 0c43487682c..c9b141c409b 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 946680f7494..c5bb60565da 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/param.h> #include <stdlib.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/parse.c b/bin/csh/parse.c index ba347b595bf..7cd949554e1 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,18 +38,14 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> #include <string.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/proc.c b/bin/csh/proc.c index 2d1a4b2dece..e4dbfaa0d7c 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: proc.c,v 1.15 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.15 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -48,11 +48,7 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ #include <unistd.h> #include <stdlib.h> #include <string.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "dir.h" diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 9f1fad0c130..29e7bcd3165 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: sem.c,v 1.11 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.11 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -50,11 +50,7 @@ static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "proc.h" diff --git a/bin/csh/set.c b/bin/csh/set.c index 37c052afb11..8d04fa3bf45 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: set.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: set.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -47,11 +47,7 @@ static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/csh/str.c b/bin/csh/str.c index 09efefa53a1..d00a4fe2e67 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $ */ +/* $OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -50,11 +50,7 @@ static char rcsid[] = "$OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $"; */ #include <sys/types.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include <vis.h> #include "csh.h" diff --git a/bin/csh/time.c b/bin/csh/time.c index b37b87aacec..e1071abff96 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */ /*- @@ -38,16 +38,12 @@ #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include "csh.h" #include "extern.h" diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c index 5654ad5ed54..d2874ba023a 100644 --- a/bin/mt/mtrmt.c +++ b/bin/mt/mtrmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrmt.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: mtrmt.c,v 1.10 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */ /*- @@ -65,11 +65,9 @@ #include <pwd.h> #include <signal.h> #include <stdio.h> -#ifdef __STDC__ #include <stdlib.h> #include <string.h> #include <unistd.h> -#endif #include "pathnames.h" #include "mt.h" diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 37e1561cd37..567208bc012 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: ar_io.c,v 1.26 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar_io.c,v 1.26 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -103,14 +103,8 @@ static void ar_start_gzip(int, const char *, int); * -1 on failure, 0 otherwise */ -#ifdef __STDC__ int ar_open(char *name) -#else -int -ar_open(name) - char *name; -#endif { struct mtget mb; @@ -308,13 +302,8 @@ ar_open(name) * ar_close() * closes archive device, increments volume number, and prints i/o summary */ -#ifdef __STDC__ void ar_close(void) -#else -void -ar_close() -#endif { if (arfd < 0) { @@ -430,13 +419,8 @@ ar_close() * other side of the pipe from getting a SIGPIPE (pax will stop * reading an archive once a format dependent trailer is detected). */ -#ifdef __STDC__ void ar_drain(void) -#else -void -ar_drain() -#endif { register int res; char drbuf[MAXBLK]; @@ -467,13 +451,8 @@ ar_drain() * 0 if all ready to write, -1 otherwise */ -#ifdef __STDC__ int ar_set_wr(void) -#else -int -ar_set_wr() -#endif { off_t cpos; @@ -510,13 +489,8 @@ ar_set_wr() * 0 if we can append, -1 otherwise. */ -#ifdef __STDC__ int ar_app_ok(void) -#else -int -ar_app_ok() -#endif { if (artyp == ISPIPE) { paxwarn(1, "Cannot append to an archive obtained from a pipe."); @@ -539,15 +513,8 @@ ar_app_ok() * Number of bytes in buffer. 0 for end of file, -1 for a read error. */ -#ifdef __STDC__ int ar_read(register char *buf, register int cnt) -#else -int -ar_read(buf, cnt) - register char *buf; - register int cnt; -#endif { register int res = 0; @@ -629,15 +596,8 @@ ar_read(buf, cnt) * error in the archive occurred. */ -#ifdef __STDC__ int ar_write(register char *buf, register int bsz) -#else -int -ar_write(buf, bsz) - register char *buf; - register int bsz; -#endif { register int res; off_t cpos; @@ -754,13 +714,8 @@ ar_write(buf, bsz) * 0 when ok to try i/o again, -1 otherwise. */ -#ifdef __STDC__ int ar_rdsync(void) -#else -int -ar_rdsync() -#endif { long fsbz; off_t cpos; @@ -845,15 +800,8 @@ ar_rdsync() * partial move (the amount moved is in skipped) */ -#ifdef __STDC__ int ar_fow(off_t sksz, off_t *skipped) -#else -int -ar_fow(sksz, skipped) - off_t sksz; - off_t *skipped; -#endif { off_t cpos; off_t mpos; @@ -911,14 +859,8 @@ ar_fow(sksz, skipped) * 0 if moved the requested distance, -1 on complete failure */ -#ifdef __STDC__ int ar_rev(off_t sksz) -#else -int -ar_rev(sksz) - off_t sksz; -#endif { off_t cpos; struct mtop mb; @@ -1049,13 +991,8 @@ ar_rev(sksz) * physical block size if ok (ok > 0), -1 otherwise */ -#ifdef __STDC__ static int get_phys(void) -#else -static int -get_phys() -#endif { register int padsz = 0; register int res; @@ -1167,13 +1104,8 @@ get_phys() * 0 when ready to continue, -1 when all done */ -#ifdef __STDC__ int ar_next(void) -#else -int -ar_next() -#endif { char buf[PAXPATHLEN+2]; static int freeit = 0; diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index c5ceee60c88..bd598706f1c 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: ar_subs.c,v 1.18 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.18 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -79,13 +79,8 @@ u_long flcnt; /* number of files processed */ * (no pattern matches all). */ -#ifdef __STDC__ void list(void) -#else -void -list() -#endif { register ARCHD *arcn; register int res; @@ -161,13 +156,8 @@ list() * pattern(s) (no patterns extracts all members) */ -#ifdef __STDC__ void extract(void) -#else -void -extract() -#endif { register ARCHD *arcn; register int res; @@ -372,15 +362,8 @@ extract() * previously written archive. */ -#ifdef __STDC__ static void wr_archive(register ARCHD *arcn, int is_app) -#else -static void -wr_archive(arcn, is_app) - register ARCHD *arcn; - int is_app; -#endif { register int res; register int hlk; @@ -582,13 +565,8 @@ wr_archive(arcn, is_app) * over write existing files that it creates. */ -#ifdef __STDC__ void append(void) -#else -void -append() -#endif { register ARCHD *arcn; register int res; @@ -723,13 +701,8 @@ append() * write a new archive */ -#ifdef __STDC__ void archive(void) -#else -void -archive() -#endif { ARCHD archd; @@ -754,13 +727,8 @@ archive() * (except the files are forced to be under the destination directory). */ -#ifdef __STDC__ void copy(void) -#else -void -copy() -#endif { register ARCHD *arcn; register int res; @@ -1006,14 +974,8 @@ copy() * the specs for rd_wrbuf() for more details) */ -#ifdef __STDC__ static int next_head(register ARCHD *arcn) -#else -static int -next_head(arcn) - register ARCHD *arcn; -#endif { register int ret; register char *hdend; @@ -1164,13 +1126,8 @@ next_head(arcn) * 0 if archive found -1 otherwise */ -#ifdef __STDC__ static int get_arc(void) -#else -static int -get_arc() -#endif { register int i; register int hdsz = 0; diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 3050fcada14..24dfb6b1d8e 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf_subs.c,v 1.10 2001/10/06 20:21:55 niklas Exp $ */ +/* $OpenBSD: buf_subs.c,v 1.11 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.10 2001/10/06 20:21:55 niklas Exp $"; +static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.11 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -89,13 +89,8 @@ off_t rdcnt; /* # of bytes read on current vol */ * 0 if ok, -1 if the user specified write block size violates pax spec */ -#ifdef __STDC__ int wr_start(void) -#else -int -wr_start() -#endif { buf = &(bufmem[BLKMULT]); /* @@ -142,13 +137,8 @@ wr_start() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int rd_start(void) -#else -int -rd_start() -#endif { /* * leave space for the header pushback (see get_arc()). If we are @@ -185,13 +175,8 @@ rd_start() * set up buffer system for copying within the file system */ -#ifdef __STDC__ void cp_start(void) -#else -void -cp_start() -#endif { buf = &(bufmem[BLKMULT]); rdblksz = blksz = MAXBLK; @@ -229,14 +214,8 @@ cp_start() * 0 for success, -1 for failure */ -#ifdef __STDC__ int appnd_start(off_t skcnt) -#else -int -appnd_start(skcnt) - off_t skcnt; -#endif { register int res; off_t cnt; @@ -334,13 +313,8 @@ appnd_start(skcnt) * 0 on success, and -1 on failure */ -#ifdef __STDC__ int rd_sync(void) -#else -int -rd_sync() -#endif { register int errcnt = 0; register int res; @@ -407,15 +381,8 @@ rd_sync() * pback space is increased. */ -#ifdef __STDC__ void pback(char *pt, int cnt) -#else -void -pback(pt, cnt) - char *pt; - int cnt; -#endif { bufpt -= cnt; memcpy(bufpt, pt, cnt); @@ -430,14 +397,8 @@ pback(pt, cnt) * 0 if ok, -1 failure, and 1 when EOF on the archive volume was detected. */ -#ifdef __STDC__ int rd_skip(off_t skcnt) -#else -int -rd_skip(skcnt) - off_t skcnt; -#endif { off_t res; off_t cnt; @@ -505,13 +466,8 @@ rd_skip(skcnt) * BE a requirement.... */ -#ifdef __STDC__ void wr_fin(void) -#else -void -wr_fin() -#endif { if (bufpt > buf) { memset(bufpt, 0, bufend - bufpt); @@ -531,15 +487,8 @@ wr_fin() * 0 if buffer was filled ok, -1 o.w. (buffer flush failure) */ -#ifdef __STDC__ int wr_rdbuf(register char *out, register int outcnt) -#else -int -wr_rdbuf(out, outcnt) - register char *out; - register int outcnt; -#endif { register int cnt; @@ -574,15 +523,8 @@ wr_rdbuf(out, outcnt) * -1 is a read error */ -#ifdef __STDC__ int rd_wrbuf(register char *in, register int cpcnt) -#else -int -rd_wrbuf(in, cpcnt) - register char *in; - register int cpcnt; -#endif { register int res; register int cnt; @@ -629,14 +571,8 @@ rd_wrbuf(in, cpcnt) * 0 if ok, -1 if there was a buf_flush failure */ -#ifdef __STDC__ int wr_skip(off_t skcnt) -#else -int -wr_skip(skcnt) - off_t skcnt; -#endif { register int cnt; @@ -673,16 +609,8 @@ wr_skip(skcnt) * 0, but "left" is set to be greater than zero. */ -#ifdef __STDC__ int wr_rdfile(ARCHD *arcn, int ifd, off_t *left) -#else -int -wr_rdfile(arcn, ifd, left) - ARCHD *arcn; - int ifd; - off_t *left; -#endif { register int cnt; register int res = 0; @@ -742,16 +670,8 @@ wr_rdfile(arcn, ifd, left) * we return a 0 but "left" is set to be the amount unwritten */ -#ifdef __STDC__ int rd_wrfile(ARCHD *arcn, int ofd, off_t *left) -#else -int -rd_wrfile(arcn, ofd, left) - ARCHD *arcn; - int ofd; - off_t *left; -#endif { register int cnt = 0; register off_t size = arcn->sb.st_size; @@ -838,16 +758,8 @@ rd_wrfile(arcn, ofd, left) * destination file so we can properly copy files with holes. */ -#ifdef __STDC__ void cp_file(ARCHD *arcn, int fd1, int fd2) -#else -void -cp_file(arcn, fd1, fd2) - ARCHD *arcn; - int fd1; - int fd2; -#endif { register int cnt; register off_t cpcnt = 0L; @@ -927,13 +839,8 @@ cp_file(arcn, fd1, fd2) * 0 when finished (user specified termination in ar_next()). */ -#ifdef __STDC__ int buf_fill(void) -#else -int -buf_fill() -#endif { register int cnt; static int fini = 0; @@ -977,14 +884,8 @@ buf_fill() * 0 if all is ok, -1 when a write error occurs. */ -#ifdef __STDC__ int buf_flush(register int bufcnt) -#else -int -buf_flush(bufcnt) - register int bufcnt; -#endif { register int cnt; register int push = 0; diff --git a/bin/pax/cache.c b/bin/pax/cache.c index 36a9280c5f3..eb9e1e35c25 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.9 2001/06/26 14:19:33 lebel Exp $ */ +/* $OpenBSD: cache.c,v 1.10 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cache.c,v 1.9 2001/06/26 14:19:33 lebel Exp $"; +static char rcsid[] = "$OpenBSD: cache.c,v 1.10 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -81,13 +81,8 @@ static GIDC **grptb = NULL; /* group name to gid cache */ * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int uidtb_start(void) -#else -int -uidtb_start() -#endif { static int fail = 0; @@ -110,13 +105,8 @@ uidtb_start() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int gidtb_start(void) -#else -int -gidtb_start() -#endif { static int fail = 0; @@ -139,13 +129,8 @@ gidtb_start() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int usrtb_start(void) -#else -int -usrtb_start() -#endif { static int fail = 0; @@ -168,13 +153,8 @@ usrtb_start() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int grptb_start(void) -#else -int -grptb_start() -#endif { static int fail = 0; @@ -198,15 +178,8 @@ grptb_start() * Pointer to stored name (or a empty string) */ -#ifdef __STDC__ char * name_uid(uid_t uid, int frc) -#else -char * -name_uid(uid, frc) - uid_t uid; - int frc; -#endif { register struct passwd *pw; register UIDC *ptr; @@ -271,15 +244,8 @@ name_uid(uid, frc) * Pointer to stored name (or a empty string) */ -#ifdef __STDC__ char * name_gid(gid_t gid, int frc) -#else -char * -name_gid(gid, frc) - gid_t gid; - int frc; -#endif { register struct group *gr; register GIDC *ptr; @@ -343,15 +309,8 @@ name_gid(gid, frc) * the uid (if any) for a user name, or a -1 if no match can be found */ -#ifdef __STDC__ int uid_name(char *name, uid_t *uid) -#else -int -uid_name(name, uid) - char *name; - uid_t *uid; -#endif { register struct passwd *pw; register UIDC *ptr; @@ -413,15 +372,8 @@ uid_name(name, uid) * the gid (if any) for a group name, or a -1 if no match can be found */ -#ifdef __STDC__ int gid_name(char *name, gid_t *gid) -#else -int -gid_name(name, gid) - char *name; - gid_t *gid; -#endif { register struct group *gr; register GIDC *ptr; diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index 5d75a0567f9..d6e516fe391 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: cpio.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: cpio.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -79,13 +79,8 @@ static int swp_head; /* binary cpio header byte swap */ * 0 if ok -1 otherwise (the return values of lnk_start()) */ -#ifdef __STDC__ int cpio_strd(void) -#else -int -cpio_strd() -#endif { return(lnk_start()); } @@ -100,14 +95,8 @@ cpio_strd() * 0 if a valid trailer, -1 if not a valid trailer, */ -#ifdef __STDC__ int cpio_trail(register ARCHD *arcn) -#else -int -cpio_trail(arcn) - register ARCHD *arcn; -#endif { /* * look for trailer id in file we are about to process @@ -124,14 +113,8 @@ cpio_trail(arcn) * 0 */ -#ifdef __STDC__ static int com_rd(register ARCHD *arcn) -#else -static int -com_rd(arcn) - register ARCHD *arcn; -#endif { arcn->skip = 0; arcn->pat = NULL; @@ -179,13 +162,8 @@ com_rd(arcn) * result of the write of the trailer from the cpio specific write func */ -#ifdef __STDC__ int cpio_endwr(void) -#else -int -cpio_endwr() -#endif { ARCHD last; @@ -207,15 +185,8 @@ cpio_endwr() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ static int rd_nm(register ARCHD *arcn, int nsz) -#else -static int -rd_nm(arcn, nsz) - register ARCHD *arcn; - int nsz; -#endif { /* * do not even try bogus values @@ -244,14 +215,8 @@ rd_nm(arcn, nsz) * 0 if ok, -1 otherwise */ -#ifdef __STDC__ static int rd_ln_nm(register ARCHD *arcn) -#else -static int -rd_ln_nm(arcn) - register ARCHD *arcn; -#endif { /* * check the length specified for bogus values @@ -301,15 +266,8 @@ rd_ln_nm(arcn) * 0 if a valid header, -1 otherwise */ -#ifdef __STDC__ int cpio_id(char *blk, int size) -#else -int -cpio_id(blk, size) - char *blk; - int size; -#endif { if ((size < sizeof(HD_CPIO)) || (strncmp(blk, AMAGIC, sizeof(AMAGIC) - 1) != 0)) @@ -325,15 +283,8 @@ cpio_id(blk, size) * 0 if a valid header, -1 otherwise. */ -#ifdef __STDC__ int cpio_rd(register ARCHD *arcn, register char *buf) -#else -int -cpio_rd(arcn, buf) - register ARCHD *arcn; - register char *buf; -#endif { register int nsz; register HD_CPIO *hd; @@ -408,13 +359,8 @@ cpio_rd(arcn, buf) * size of trailer header in this format */ -#ifdef __STDC__ off_t cpio_endrd(void) -#else -off_t -cpio_endrd() -#endif { return((off_t)(sizeof(HD_CPIO) + sizeof(TRAILER))); } @@ -426,13 +372,8 @@ cpio_endrd() * 0 if ok, -1 otherwise (what dev_start() returns) */ -#ifdef __STDC__ int cpio_stwr(void) -#else -int -cpio_stwr() -#endif { return(dev_start()); } @@ -446,14 +387,8 @@ cpio_stwr() * data to write after the header, -1 if archive write failed */ -#ifdef __STDC__ int cpio_wr(register ARCHD *arcn) -#else -int -cpio_wr(arcn) - register ARCHD *arcn; -#endif { register HD_CPIO *hd; register int nsz; @@ -582,15 +517,8 @@ cpio_wr(arcn) * 0 if a valid header, -1 otherwise */ -#ifdef __STDC__ int vcpio_id(char *blk, int size) -#else -int -vcpio_id(blk, size) - char *blk; - int size; -#endif { if ((size < sizeof(HD_VCPIO)) || (strncmp(blk, AVMAGIC, sizeof(AVMAGIC) - 1) != 0)) @@ -606,15 +534,8 @@ vcpio_id(blk, size) * 0 if a valid header, -1 otherwise */ -#ifdef __STDC__ int crc_id(char *blk, int size) -#else -int -crc_id(blk, size) - char *blk; - int size; -#endif { if ((size < sizeof(HD_VCPIO)) || (strncmp(blk, AVCMAGIC, sizeof(AVCMAGIC) - 1) != 0)) @@ -629,13 +550,8 @@ crc_id(blk, size) * 0 if ok -1 otherwise (the return values of lnk_start()) */ -#ifdef __STDC__ int crc_strd(void) -#else -int -crc_strd() -#endif { docrc = 1; return(lnk_start()); @@ -649,15 +565,8 @@ crc_strd() * 0 if a valid header, -1 otherwise. */ -#ifdef __STDC__ int vcpio_rd(register ARCHD *arcn, register char *buf) -#else -int -vcpio_rd(arcn, buf) - register ARCHD *arcn; - register char *buf; -#endif { register HD_VCPIO *hd; dev_t devminor; @@ -755,13 +664,8 @@ vcpio_rd(arcn, buf) * size of trailer header in this format */ -#ifdef __STDC__ off_t vcpio_endrd(void) -#else -off_t -vcpio_endrd() -#endif { return((off_t)(sizeof(HD_VCPIO) + sizeof(TRAILER) + (VCPIO_PAD(sizeof(HD_VCPIO) + sizeof(TRAILER))))); @@ -774,13 +678,8 @@ vcpio_endrd() * 0 if ok, -1 otherwise (what dev_start() returns) */ -#ifdef __STDC__ int crc_stwr(void) -#else -int -crc_stwr() -#endif { docrc = 1; return(dev_start()); @@ -795,14 +694,8 @@ crc_stwr() * NO data to write after the header, -1 if archive write failed */ -#ifdef __STDC__ int vcpio_wr(register ARCHD *arcn) -#else -int -vcpio_wr(arcn) - register ARCHD *arcn; -#endif { register HD_VCPIO *hd; unsigned int nsz; @@ -958,15 +851,8 @@ vcpio_wr(arcn) * 0 if a valid header, -1 otherwise */ -#ifdef __STDC__ int bcpio_id(char *blk, int size) -#else -int -bcpio_id(blk, size) - char *blk; - int size; -#endif { if (size < sizeof(HD_BCPIO)) return(-1); @@ -993,15 +879,8 @@ bcpio_id(blk, size) * 0 if a valid header, -1 otherwise. */ -#ifdef __STDC__ int bcpio_rd(register ARCHD *arcn, register char *buf) -#else -int -bcpio_rd(arcn, buf) - register ARCHD *arcn; - register char *buf; -#endif { register HD_BCPIO *hd; register int nsz; @@ -1097,13 +976,8 @@ bcpio_rd(arcn, buf) * size of trailer header in this format */ -#ifdef __STDC__ off_t bcpio_endrd(void) -#else -off_t -bcpio_endrd() -#endif { return((off_t)(sizeof(HD_BCPIO) + sizeof(TRAILER) + (BCPIO_PAD(sizeof(HD_BCPIO) + sizeof(TRAILER))))); @@ -1120,14 +994,8 @@ bcpio_endrd() * data to write after the header, -1 if archive write failed */ -#ifdef __STDC__ int bcpio_wr(register ARCHD *arcn) -#else -int -bcpio_wr(arcn) - register ARCHD *arcn; -#endif { register HD_BCPIO *hd; register int nsz; diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 8138094c8d2..eccfb08a971 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: file_subs.c,v 1.17 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: file_subs.c,v 1.17 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -80,14 +80,8 @@ mk_link(register char *,register struct stat *,register char *, int); * file descriptor or -1 for failure */ -#ifdef __STDC__ int file_creat(register ARCHD *arcn) -#else -int -file_creat(arcn) - register ARCHD *arcn; -#endif { int fd = -1; mode_t file_mode; @@ -143,15 +137,8 @@ file_creat(arcn) * 0 for success, -1 for failure */ -#ifdef __STDC__ void file_close(register ARCHD *arcn, int fd) -#else -void -file_close(arcn, fd) - register ARCHD *arcn; - int fd; -#endif { int res = 0; @@ -190,14 +177,8 @@ file_close(arcn, fd) * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int lnk_creat(register ARCHD *arcn) -#else -int -lnk_creat(arcn) - register ARCHD *arcn; -#endif { struct stat sb; @@ -230,14 +211,8 @@ lnk_creat(arcn) * 0 if cross_lnk() ok, -1 for fatal flaw (like linking to self). */ -#ifdef __STDC__ int cross_lnk(register ARCHD *arcn) -#else -int -cross_lnk(arcn) - register ARCHD *arcn; -#endif { /* * try to make a link to orginal file (-l flag in copy mode). make sure @@ -260,14 +235,8 @@ cross_lnk(arcn) * 0 skip it file exists (-k) or may be the same as source file */ -#ifdef __STDC__ int chk_same(register ARCHD *arcn) -#else -int -chk_same(arcn) - register ARCHD *arcn; -#endif { struct stat sb; @@ -303,18 +272,9 @@ chk_same(arcn) * allowed option). -1 an error occurred. */ -#ifdef __STDC__ static int mk_link(register char *to, register struct stat *to_sb, register char *from, int ign) -#else -static int -mk_link(to, to_sb, from, ign) - register char *to; - register struct stat *to_sb; - register char *from; - int ign; -#endif { struct stat sb; int oerrno; @@ -385,14 +345,8 @@ mk_link(to, to_sb, from, ign) * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int node_creat(register ARCHD *arcn) -#else -int -node_creat(arcn) - register ARCHD *arcn; -#endif { register int res; register int ign = 0; @@ -581,15 +535,8 @@ badlink: * 1 we found a directory and we were going to create a directory. */ -#ifdef __STDC__ int unlnk_exist(register char *name, register int type) -#else -int -unlnk_exist(name, type) - register char *name; - register int type; -#endif { struct stat sb; @@ -639,16 +586,8 @@ unlnk_exist(name, type) * 0 otherwise */ -#ifdef __STDC__ int chk_path( register char *name, uid_t st_uid, gid_t st_gid) -#else -int -chk_path(name, st_uid, st_gid) - register char *name; - uid_t st_uid; - gid_t st_gid; -#endif { register char *spt = name; struct stat sb; @@ -731,17 +670,8 @@ chk_path(name, st_uid, st_gid) * not set request. */ -#ifdef __STDC__ void set_ftime(char *fnm, time_t mtime, time_t atime, int frc) -#else -void -set_ftime(fnm, mtime, atime, frc) - char *fnm; - time_t mtime; - time_t atime; - int frc; -#endif { static struct timeval tv[2] = {{0L, 0L}, {0L, 0L}}; struct stat sb; @@ -778,16 +708,8 @@ set_ftime(fnm, mtime, atime, frc) * 0 when set, -1 on failure */ -#ifdef __STDC__ int set_ids(char *fnm, uid_t uid, gid_t gid) -#else -int -set_ids(fnm, uid, gid) - char *fnm; - uid_t uid; - gid_t gid; -#endif { if (chown(fnm, uid, gid) < 0) { /* @@ -810,16 +732,8 @@ set_ids(fnm, uid, gid) * 0 when set, -1 on failure */ -#ifdef __STDC__ int set_lids(char *fnm, uid_t uid, gid_t gid) -#else -int -set_lids(fnm, uid, gid) - char *fnm; - uid_t uid; - gid_t gid; -#endif { if (lchown(fnm, uid, gid) < 0) { /* @@ -840,15 +754,8 @@ set_lids(fnm, uid, gid) * Set file access mode */ -#ifdef __STDC__ void set_pmode(char *fnm, mode_t mode) -#else -void -set_pmode(fnm, mode) - char *fnm; - mode_t mode; -#endif { mode &= ABITS; if (chmod(fnm, mode) < 0) @@ -904,21 +811,9 @@ set_pmode(fnm, mode) * number of bytes written, -1 on write (or lseek) error. */ -#ifdef __STDC__ int file_write(int fd, char *str, register int cnt, int *rem, int *isempt, int sz, char *name) -#else -int -file_write(fd, str, cnt, rem, isempt, sz, name) - int fd; - char *str; - register int cnt; - int *rem; - int *isempt; - int sz; - char *name; -#endif { register char *pt; register char *end; @@ -997,16 +892,8 @@ file_write(fd, str, cnt, rem, isempt, sz, name) * write the last BYTE with a zero (back up one byte and write a zero). */ -#ifdef __STDC__ void file_flush(int fd, char *fname, int isempt) -#else -void -file_flush(fd, fname, isempt) - int fd; - char *fname; - int isempt; -#endif { static char blnk[] = "\0"; @@ -1036,15 +923,8 @@ file_flush(fd, fname, isempt) * reset access time (tflag) do so (the times are stored in arcn). */ -#ifdef __STDC__ void rdfile_close(register ARCHD *arcn, register int *fd) -#else -void -rdfile_close(arcn, fd) - register ARCHD *arcn; - register int *fd; -#endif { /* * make sure the file is open @@ -1073,15 +953,8 @@ rdfile_close(arcn, fd) * 0 if was able to calculate the crc, -1 otherwise */ -#ifdef __STDC__ int set_crc(register ARCHD *arcn, register int fd) -#else -int -set_crc(arcn, fd) - register ARCHD *arcn; - register int fd; -#endif { register int i; register int res; diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index c5e400409a5..4fa1a2cfcfc 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: ftree.c,v 1.18 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftree.c,v 1.18 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -95,13 +95,8 @@ static int ftree_arg(void); * 0 if there is at least one valid file arg to process, -1 otherwise */ -#ifdef __STDC__ int ftree_start(void) -#else -int -ftree_start() -#endif { /* * set up the operation mode of fts, open the first file arg. We must @@ -150,15 +145,8 @@ ftree_start() * 0 if added to the linked list, -1 if failed */ -#ifdef __STDC__ int ftree_add(register char *str, int chflg) -#else -int -ftree_add(str, chflg) - register char *str; - int chflg; -#endif { register FTREE *ft; register int len; @@ -202,14 +190,8 @@ ftree_add(str, chflg) * -n and -d processing. */ -#ifdef __STDC__ void ftree_sel(register ARCHD *arcn) -#else -void -ftree_sel(arcn) - register ARCHD *arcn; -#endif { /* * set reference bit for this pattern. This linked list is only used @@ -241,13 +223,8 @@ ftree_sel(arcn) * have a selected member (reference count still 0) */ -#ifdef __STDC__ void ftree_chk(void) -#else -void -ftree_chk() -#endif { register FTREE *ft; register int wban = 0; @@ -283,13 +260,8 @@ ftree_chk() * stdin). */ -#ifdef __STDC__ static int ftree_arg(void) -#else -static int -ftree_arg() -#endif { register char *pt; @@ -362,14 +334,8 @@ ftree_arg() * 0 when contents of arcn have been set with the next file, -1 when done. */ -#ifdef __STDC__ int next_file(register ARCHD *arcn) -#else -int -next_file(arcn) - register ARCHD *arcn; -#endif { register int cnt; time_t atime; diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index c9a40df003e..7ac24c7c62f 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gen_subs.c,v 1.12 2001/07/17 18:19:49 millert Exp $ */ +/* $OpenBSD: gen_subs.c,v 1.13 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.12 2001/07/17 18:19:49 millert Exp $"; +static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.13 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -79,16 +79,8 @@ static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.12 2001/07/17 18:19:49 millert E * list the members of an archive in ls format */ -#ifdef __STDC__ void ls_list(register ARCHD *arcn, time_t now, FILE *fp) -#else -void -ls_list(arcn, now, fp) - register ARCHD *arcn; - time_t now; - FILE *fp; -#endif { register struct stat *sbp; char f_mode[MODELEN]; @@ -173,14 +165,8 @@ ls_list(arcn, now, fp) * print a short summary of file to tty. */ -#ifdef __STDC__ void ls_tty(register ARCHD *arcn) -#else -void -ls_tty(arcn) - register ARCHD *arcn; -#endif { char f_date[DATELEN]; char f_mode[MODELEN]; @@ -208,15 +194,8 @@ ls_tty(arcn) return; } -#ifdef __STDC__ void safe_print(char *str, FILE *fp) -#else -void -safe_print(str, fp) - char *str; - FILE *fp; -#endif { char visbuf[5]; char *cp; @@ -244,16 +223,8 @@ safe_print(str, fp) * unsigned long value */ -#ifdef __STDC__ u_long asc_ul(register char *str, int len, register int base) -#else -u_long -asc_ul(str, len, base) - register char *str; - int len; - register int base; -#endif { register char *stop; u_long tval = 0; @@ -295,17 +266,8 @@ asc_ul(str, len, base) * NOTE: the string created is NOT TERMINATED. */ -#ifdef __STDC__ int ul_asc(u_long val, register char *str, register int len, register int base) -#else -int -ul_asc(val, str, len, base) - u_long val; - register char *str; - register int len; - register int base; -#endif { register char *pt; u_long digit; @@ -358,16 +320,8 @@ ul_asc(val, str, len, base) * u_quad_t value */ -#ifdef __STDC__ u_quad_t asc_uqd(register char *str, int len, register int base) -#else -u_quad_t -asc_uqd(str, len, base) - register char *str; - int len; - register int base; -#endif { register char *stop; u_quad_t tval = 0; @@ -409,17 +363,8 @@ asc_uqd(str, len, base) * NOTE: the string created is NOT TERMINATED. */ -#ifdef __STDC__ int uqd_asc(u_quad_t val, register char *str, register int len, register int base) -#else -int -uqd_asc(val, str, len, base) - u_quad_t val; - register char *str; - register int len; - register int base; -#endif { register char *pt; u_quad_t digit; diff --git a/bin/pax/options.c b/bin/pax/options.c index 95192097057..08d668dce15 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: options.c,v 1.50 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.50 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -153,15 +153,8 @@ int ford[] = {5, 4, 3, 2, 1, 0, -1 }; * parser */ -#ifdef __STDC__ void options(register int argc, register char **argv) -#else -void -options(argc, argv) - register int argc; - register char **argv; -#endif { /* @@ -189,15 +182,8 @@ options(argc, argv) * the user specified a legal set of flags. If not, complain and exit */ -#ifdef __STDC__ static void pax_options(register int argc, register char **argv) -#else -static void -pax_options(argc, argv) - register int argc; - register char **argv; -#endif { register int c; register int i; @@ -594,15 +580,8 @@ pax_options(argc, argv) * the user specified a legal set of flags. If not, complain and exit */ -#ifdef __STDC__ static void tar_options(register int argc, register char **argv) -#else -static void -tar_options(argc, argv) - register int argc; - register char **argv; -#endif { register int c; int fstdin = 0; @@ -1026,15 +1005,8 @@ mkpath(path) * the user specified a legal set of flags. If not, complain and exit */ -#ifdef __STDC__ static void cpio_options(register int argc, register char **argv) -#else -static void -cpio_options(argc, argv) - register int argc; - register char **argv; -#endif { register int c, i; char *str; @@ -1293,14 +1265,8 @@ cpio_options(argc, argv) * print out those invalid flag sets found to the user */ -#ifdef __STDC__ static void printflg(unsigned int flg) -#else -static void -printflg(flg) - unsigned int flg; -#endif { int nxt; int pos = 0; @@ -1320,15 +1286,8 @@ printflg(flg) * by the user */ -#ifdef __STDC__ static int c_frmt(const void *a, const void *b) -#else -static int -c_frmt(a, b) - void *a; - void *b; -#endif { return(strcmp(((FSUB *)a)->name, ((FSUB *)b)->name)); } @@ -1341,13 +1300,8 @@ c_frmt(a, b) * pointer to next OPLIST entry or NULL (end of list). */ -#ifdef __STDC__ OPLIST * opt_next(void) -#else -OPLIST * -opt_next() -#endif { OPLIST *opt; @@ -1362,13 +1316,8 @@ opt_next() * when the format does not support options. */ -#ifdef __STDC__ int bad_opt(void) -#else -int -bad_opt() -#endif { register OPLIST *opt; @@ -1393,14 +1342,8 @@ bad_opt() * 0 if format in name=value format, -1 if -o is passed junk */ -#ifdef __STDC__ int opt_add(register char *str) -#else -int -opt_add(str) - register char *str; -#endif { register OPLIST *opt; register char *frpt; @@ -1468,14 +1411,8 @@ opt_add(str) * 0 for an error, a positive value o.w. */ -#ifdef __STDC__ static off_t str_offt(char *val) -#else -static off_t -str_offt(val) - char *val; -#endif { char *expr; off_t num, t; @@ -1536,14 +1473,8 @@ str_offt(val) return(num); } -#ifdef __STDC__ char * getline(FILE *f) -#else -char * -getline(f) - FILE *f; -#endif { char *name, *temp; size_t len; @@ -1572,13 +1503,8 @@ getline(f) * 0 */ -#ifdef __STDC__ static int no_op(void) -#else -static int -no_op() -#endif { return(0); } @@ -1588,13 +1514,8 @@ no_op() * print the usage summary to the user */ -#ifdef __STDC__ void pax_usage(void) -#else -void -pax_usage() -#endif { (void)fputs("usage: pax [-cdnvz] [-E limit] [-f archive] ", stderr); (void)fputs("[-s replstr] ... [-U user] ...", stderr); @@ -1627,13 +1548,8 @@ pax_usage() * print the usage summary to the user */ -#ifdef __STDC__ void tar_usage(void) -#else -void -tar_usage() -#endif { (void)fputs("usage: tar [-]{crtux}[-befhmopqsvwzHLOPXZ014578] [blocksize] ", stderr); @@ -1647,13 +1563,8 @@ tar_usage() * print the usage summary to the user */ -#ifdef __STDC__ void cpio_usage(void) -#else -void -cpio_usage() -#endif { (void)fputs("usage: cpio -o [-aABcLvVzZ] [-C bytes] [-H format] [-O archive]\n", stderr); (void)fputs(" [-F archive] < name-list [> archive]\n", stderr); diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 9e9474f755e..f88ce717c12 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: pat_rep.c,v 1.17 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.17 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -96,14 +96,8 @@ static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); * the list of replacement patterns; -1 otherwise. */ -#ifdef __STDC__ int rep_add(register char *str) -#else -int -rep_add(str) - register char *str; -#endif { register char *pt1; register char *pt2; @@ -226,15 +220,8 @@ rep_add(str) * 0 if the pattern was added to the list, -1 otherwise */ -#ifdef __STDC__ int pat_add(char *str, char *chdname) -#else -int -pat_add(str, chdname) - char *str; - char *chdname; -#endif { register PATTERN *pt; @@ -278,13 +265,8 @@ pat_add(str, chdname) * a selected archive member. */ -#ifdef __STDC__ void pat_chk(void) -#else -void -pat_chk() -#endif { register PATTERN *pt; register int wban = 0; @@ -320,14 +302,8 @@ pat_chk() * match, -1 otherwise. */ -#ifdef __STDC__ int pat_sel(register ARCHD *arcn) -#else -int -pat_sel(arcn) - register ARCHD *arcn; -#endif { register PATTERN *pt; register PATTERN **ppt; @@ -445,14 +421,8 @@ pat_sel(arcn) * looking for more members) */ -#ifdef __STDC__ int pat_match(register ARCHD *arcn) -#else -int -pat_match(arcn) - register ARCHD *arcn; -#endif { register PATTERN *pt; @@ -523,16 +493,8 @@ pat_match(arcn) * Note: *pend may be changed to show where the prefix ends. */ -#ifdef __STDC__ static int fn_match(register char *pattern, register char *string, char **pend) -#else -static int -fn_match(pattern, string, pend) - register char *pattern; - register char *string; - char **pend; -#endif { register char c; char test; @@ -604,15 +566,8 @@ fn_match(pattern, string, pend) /* NOTREACHED */ } -#ifdef __STDC__ static char * range_match(register char *pattern, register int test) -#else -static char * -range_match(pattern, test) - register char *pattern; - register int test; -#endif { register char c; register char c2; @@ -654,14 +609,8 @@ range_match(pattern, test) * 0 continue to process file, 1 skip this file, -1 pax is finished */ -#ifdef __STDC__ int mod_name(register ARCHD *arcn) -#else -int -mod_name(arcn) - register ARCHD *arcn; -#endif { register int res = 0; @@ -753,14 +702,8 @@ mod_name(arcn) * 0 process this file, 1 skip this file, -1 we need to exit pax */ -#ifdef __STDC__ static int tty_rename(register ARCHD *arcn) -#else -static int -tty_rename(arcn) - register ARCHD *arcn; -#endif { char tmpname[PAXPATHLEN+2]; int res; @@ -824,16 +767,8 @@ tty_rename(arcn) * 0 if ok, -1 if failure (name too long) */ -#ifdef __STDC__ int set_dest(register ARCHD *arcn, char *dest_dir, int dir_len) -#else -int -set_dest(arcn, dest_dir, dir_len) - register ARCHD *arcn; - char *dest_dir; - int dir_len; -#endif { if (fix_path(arcn->name, &(arcn->nlen), dest_dir, dir_len) < 0) return(-1); @@ -859,17 +794,8 @@ set_dest(arcn, dest_dir, dir_len) * 0 if ok, -1 if the final name is too long */ -#ifdef __STDC__ static int fix_path( char *or_name, int *or_len, char *dir_name, int dir_len) -#else -static int -fix_path(or_name, or_len, dir_name, dir_len) - char *or_name; - int *or_len; - char *dir_name; - int dir_len; -#endif { register char *src; register char *dest; @@ -931,16 +857,8 @@ fix_path(or_name, or_len, dir_name, dir_len) * ended up empty) */ -#ifdef __STDC__ static int rep_name(char *name, int *nlen, int prnt) -#else -static int -rep_name(name, nlen, prnt) - char *name; - int *nlen; - int prnt; -#endif { register REPLACE *pt; register char *inpt; @@ -1085,20 +1003,9 @@ rep_name(name, nlen, prnt) * -1 if error, or the number of characters added to the destination. */ -#ifdef __STDC__ static int resub(regex_t *rp, register regmatch_t *pm, char *src, char *inpt, char *dest, register char *destend) -#else -static int -resub(rp, pm, src, inpt, dest, destend) - regex_t *rp; - register regmatch_t *pm; - char *src; - char *inpt; - char *dest; - register char *destend; -#endif { register char *spt; register char *dpt; diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 91f3fc8e2db..142dd059c73 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: pax.c,v 1.20 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: pax.c,v 1.20 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -232,15 +232,8 @@ char *tempbase; /* basename of tempfile to use for mkstemp(3) */ * Return: 0 if ok, 1 otherwise */ -#ifdef __STDC__ int main(int argc, char **argv) -#else -int -main(argc, argv) - int argc; - char **argv; -#endif { char *tmpdir; size_t tdlen; @@ -314,14 +307,8 @@ main(argc, argv) * never.... */ -#ifdef __STDC__ void sig_cleanup(int which_sig) -#else -void -sig_cleanup(which_sig) - int which_sig; -#endif { /* XXX signal races */ @@ -349,13 +336,8 @@ sig_cleanup(which_sig) * when dealing with a medium to large sized archives. */ -#ifdef __STDC__ static int gen_init(void) -#else -static int -gen_init() -#endif { struct rlimit reslimit; struct sigaction n_hand; diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 34f4512e017..aa7efceaa36 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: sel_subs.c,v 1.10 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.10 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -81,14 +81,8 @@ static GRPT **grptb = NULL; /* group selection table */ * 0 if this archive member should be processed, 1 if it should be skipped */ -#ifdef __STDC__ int sel_chk(register ARCHD *arcn) -#else -int -sel_chk(arcn) - register ARCHD *arcn; -#endif { if (((usrtb != NULL) && usr_match(arcn)) || ((grptb != NULL) && grp_match(arcn)) || @@ -112,14 +106,8 @@ sel_chk(arcn) * 0 if added ok, -1 otherwise; */ -#ifdef __STDC__ int usr_add(register char *str) -#else -int -usr_add(str) - register char *str; -#endif { register u_int indx; register USRT *pt; @@ -187,14 +175,8 @@ usr_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#ifdef __STDC__ static int usr_match(register ARCHD *arcn) -#else -static int -usr_match(arcn) - register ARCHD *arcn; -#endif { register USRT *pt; @@ -221,14 +203,8 @@ usr_match(arcn) * 0 if added ok, -1 otherwise; */ -#ifdef __STDC__ int grp_add(register char *str) -#else -int -grp_add(str) - register char *str; -#endif { register u_int indx; register GRPT *pt; @@ -296,14 +272,8 @@ grp_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#ifdef __STDC__ static int grp_match(register ARCHD *arcn) -#else -static int -grp_match(arcn) - register ARCHD *arcn; -#endif { register GRPT *pt; @@ -352,14 +322,8 @@ grp_match(arcn) * 0 if the time range was added to the list, -1 otherwise */ -#ifdef __STDC__ int trng_add(register char *str) -#else -int -trng_add(str) - register char *str; -#endif { register TIME_RNG *pt; register char *up_pt = NULL; @@ -498,14 +462,8 @@ trng_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#ifdef __STDC__ static int trng_match(register ARCHD *arcn) -#else -static int -trng_match(arcn) - register ARCHD *arcn; -#endif { register TIME_RNG *pt; @@ -573,15 +531,8 @@ trng_match(arcn) * 0 if converted ok, -1 otherwise */ -#ifdef __STDC__ static int str_sec(register char *str, time_t *tval) -#else -static int -str_sec(str, tval) - register char *str; - time_t *tval; -#endif { register struct tm *lt; register char *dot = NULL; diff --git a/bin/pax/tables.c b/bin/pax/tables.c index ebdfdf0de29..b52c469e95b 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: tables.c,v 1.15 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: tables.c,v 1.15 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -109,13 +109,8 @@ static DEVT *chk_dev(dev_t, int); * 0 if created, -1 if failure */ -#ifdef __STDC__ int lnk_start(void) -#else -int -lnk_start() -#endif { if (ltab != NULL) return(0); @@ -138,14 +133,8 @@ lnk_start() * if found returns 1; if not found returns 0; -1 on error */ -#ifdef __STDC__ int chk_lnk(register ARCHD *arcn) -#else -int -chk_lnk(arcn) - register ARCHD *arcn; -#endif { register HRDLNK *pt; register HRDLNK **ppt; @@ -230,14 +219,8 @@ chk_lnk(arcn) * we do not want to accidently point another file at it later on. */ -#ifdef __STDC__ void purg_lnk(register ARCHD *arcn) -#else -void -purg_lnk(arcn) - register ARCHD *arcn; -#endif { register HRDLNK *pt; register HRDLNK **ppt; @@ -290,13 +273,8 @@ purg_lnk(arcn) * write phase */ -#ifdef __STDC__ void lnk_end(void) -#else -void -lnk_end() -#endif { register int i; register HRDLNK *pt; @@ -355,13 +333,8 @@ lnk_end() * 0 if the table and file was created ok, -1 otherwise */ -#ifdef __STDC__ int ftime_start(void) -#else -int -ftime_start() -#endif { if (ftab != NULL) @@ -398,14 +371,8 @@ ftime_start() * -1 on error */ -#ifdef __STDC__ int chk_ftime(register ARCHD *arcn) -#else -int -chk_ftime(arcn) - register ARCHD *arcn; -#endif { register FTM *pt; register int namelen; @@ -523,13 +490,8 @@ chk_ftime(arcn) * 0 if successful, -1 otherwise */ -#ifdef __STDC__ int name_start(void) -#else -int -name_start() -#endif { if (ntab != NULL) return(0); @@ -549,16 +511,8 @@ name_start() * 0 if added, -1 otherwise */ -#ifdef __STDC__ int add_name(register char *oname, int onamelen, char *nname) -#else -int -add_name(oname, onamelen, nname) - register char *oname; - int onamelen; - char *nname; -#endif { register NAMT *pt; register u_int indx; @@ -625,16 +579,8 @@ add_name(oname, onamelen, nname) * new name (oname is the link to name) */ -#ifdef __STDC__ void sub_name(register char *oname, int *onamelen, size_t onamesize) -#else -void -sub_name(oname, onamelen, onamesize) - register char *oname; - int *onamelen; - size_t onamesize; -#endif { register NAMT *pt; register u_int indx; @@ -716,13 +662,8 @@ sub_name(oname, onamelen, onamesize) * 0 if successful, -1 otherwise */ -#ifdef __STDC__ int dev_start(void) -#else -int -dev_start() -#endif { if (dtab != NULL) return(0); @@ -743,14 +684,8 @@ dev_start() * 0 if added ok, -1 otherwise */ -#ifdef __STDC__ int add_dev(register ARCHD *arcn) -#else -int -add_dev(arcn) - register ARCHD *arcn; -#endif { if (chk_dev(arcn->sb.st_dev, 1) == NULL) return(-1); @@ -770,15 +705,8 @@ add_dev(arcn) * is returned (indicates an error). */ -#ifdef __STDC__ static DEVT * chk_dev(dev_t dev, int add) -#else -static DEVT * -chk_dev(dev, add) - dev_t dev; - int add; -#endif { register DEVT *pt; register u_int indx; @@ -835,16 +763,8 @@ chk_dev(dev, add) * 0 if all ok, -1 otherwise. */ -#ifdef __STDC__ int map_dev(register ARCHD *arcn, u_long dev_mask, u_long ino_mask) -#else -int -map_dev(arcn, dev_mask, ino_mask) - register ARCHD *arcn; - u_long dev_mask; - u_long ino_mask; -#endif { register DEVT *pt; register DLIST *dpt; @@ -985,13 +905,8 @@ map_dev(arcn, dev_mask, ino_mask) * 0 is created ok, -1 otherwise. */ -#ifdef __STDC__ int atdir_start(void) -#else -int -atdir_start() -#endif { if (atab != NULL) return(0); @@ -1010,13 +925,8 @@ atdir_start() * entries are for directories READ by pax */ -#ifdef __STDC__ void atdir_end(void) -#else -void -atdir_end() -#endif { register ATDIR *pt; register int i; @@ -1046,18 +956,8 @@ atdir_end() * and chained by inode number. This is for directories READ by pax */ -#ifdef __STDC__ void add_atdir(char *fname, dev_t dev, ino_t ino, time_t mtime, time_t atime) -#else -void -add_atdir(fname, dev, ino, mtime, atime) - char *fname; - dev_t dev; - ino_t ino; - time_t mtime; - time_t atime; -#endif { register ATDIR *pt; register u_int indx; @@ -1118,17 +1018,8 @@ add_atdir(fname, dev, ino, mtime, atime) * 0 if found, -1 if not found. */ -#ifdef __STDC__ int get_atdir(dev_t dev, ino_t ino, time_t *mtime, time_t *atime) -#else -int -get_atdir(dev, ino, mtime, atime) - dev_t dev; - ino_t ino; - time_t *mtime; - time_t *atime; -#endif { register ATDIR *pt; register ATDIR **ppt; @@ -1202,13 +1093,8 @@ get_atdir(dev, ino, mtime, atime) * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int dir_start(void) -#else -int -dir_start() -#endif { if (dirfd != -1) @@ -1240,17 +1126,8 @@ dir_start() * pax spec) */ -#ifdef __STDC__ void add_dir(char *name, int nlen, struct stat *psb, int frc_mode) -#else -void -add_dir(name, nlen, psb, frc_mode) - char *name; - int nlen; - struct stat *psb; - int frc_mode; -#endif { DIRDATA dblk; @@ -1290,13 +1167,8 @@ add_dir(name, nlen, psb, frc_mode) * by pax */ -#ifdef __STDC__ void proc_dir(void) -#else -void -proc_dir() -#endif { char name[PAXPATHLEN+1]; DIRDATA dblk; @@ -1358,16 +1230,8 @@ proc_dir() * the hash value of the string MOD (%) the table size. */ -#ifdef __STDC__ u_int st_hash(char *name, int len, int tabsz) -#else -u_int -st_hash(name, len, tabsz) - char *name; - int len; - int tabsz; -#endif { register char *pt; register char *dest; diff --git a/bin/pax/tar.c b/bin/pax/tar.c index adf8967b298..3b121659234 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: tar.c,v 1.25 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: tar.c,v 1.25 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -82,13 +82,8 @@ static int tar_nodir; /* do not write dirs under old tar */ * 0 if ok, -1 otherwise (what wr_skip returns) */ -#ifdef __STDC__ int tar_endwr(void) -#else -int -tar_endwr() -#endif { return(wr_skip((off_t)(NULLCNT*BLKMULT))); } @@ -100,13 +95,8 @@ tar_endwr() * size of trailer (2 * BLKMULT) */ -#ifdef __STDC__ off_t tar_endrd(void) -#else -off_t -tar_endrd() -#endif { return((off_t)(NULLCNT*BLKMULT)); } @@ -122,16 +112,8 @@ tar_endrd() * could never contain a header. */ -#ifdef __STDC__ int tar_trail(register char *buf, register int in_resync, register int *cnt) -#else -int -tar_trail(buf, in_resync, cnt) - register char *buf; - register int in_resync; - register int *cnt; -#endif { register int i; @@ -173,17 +155,8 @@ tar_trail(buf, in_resync, cnt) * 0 if the number fit into the string, -1 otherwise */ -#ifdef __STDC__ static int ul_oct(u_long val, register char *str, register int len, int term) -#else -static int -ul_oct(val, str, len, term) - u_long val; - register char *str; - register int len; - int term; -#endif { register char *pt; @@ -237,17 +210,8 @@ ul_oct(val, str, len, term) * 0 if the number fit into the string, -1 otherwise */ -#ifdef __STDC__ static int uqd_oct(u_quad_t val, register char *str, register int len, int term) -#else -static int -uqd_oct(val, str, len, term) - u_quad_t val; - register char *str; - register int len; - int term; -#endif { register char *pt; @@ -300,15 +264,8 @@ uqd_oct(val, str, len, term) * unsigned long checksum */ -#ifdef __STDC__ static u_long tar_chksm(register char *blk, register int len) -#else -static u_long -tar_chksm(blk, len) - register char *blk; - register int len; -#endif { register char *stop; register char *pt; @@ -348,15 +305,8 @@ tar_chksm(blk, len) * 0 if a tar header, -1 otherwise */ -#ifdef __STDC__ int tar_id(register char *blk, int size) -#else -int -tar_id(blk, size) - register char *blk; - int size; -#endif { register HD_TAR *hd; register HD_USTAR *uhd; @@ -389,13 +339,8 @@ tar_id(blk, size) * 0 if ok -1 otherwise */ -#ifdef __STDC__ int tar_opt(void) -#else -int -tar_opt() -#endif { OPLIST *opt; @@ -431,15 +376,8 @@ tar_opt() * 0 */ -#ifdef __STDC__ int tar_rd(register ARCHD *arcn, register char *buf) -#else -int -tar_rd(arcn, buf) - register ARCHD *arcn; - register char *buf; -#endif { register HD_TAR *hd; register char *pt; @@ -565,14 +503,8 @@ tar_rd(arcn, buf) * data to write after the header, -1 if archive write failed */ -#ifdef __STDC__ int tar_wr(register ARCHD *arcn) -#else -int -tar_wr(arcn) - register ARCHD *arcn; -#endif { register HD_TAR *hd; int len; @@ -728,13 +660,8 @@ tar_wr(arcn) * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int ustar_strd(void) -#else -int -ustar_strd() -#endif { if ((usrtb_start() < 0) || (grptb_start() < 0)) return(-1); @@ -748,13 +675,8 @@ ustar_strd() * 0 if ok, -1 otherwise */ -#ifdef __STDC__ int ustar_stwr(void) -#else -int -ustar_stwr() -#endif { if ((uidtb_start() < 0) || (gidtb_start() < 0)) return(-1); @@ -769,15 +691,8 @@ ustar_stwr() * 0 if a ustar header, -1 otherwise */ -#ifdef __STDC__ int ustar_id(char *blk, int size) -#else -int -ustar_id(blk, size) - char *blk; - int size; -#endif { register HD_USTAR *hd; @@ -808,15 +723,8 @@ ustar_id(blk, size) * 0 */ -#ifdef __STDC__ int ustar_rd(register ARCHD *arcn, register char *buf) -#else -int -ustar_rd(arcn, buf) - register ARCHD *arcn; - register char *buf; -#endif { register HD_USTAR *hd; register char *dest; @@ -969,14 +877,8 @@ ustar_rd(arcn, buf) * data to write after the header, -1 if archive write failed */ -#ifdef __STDC__ int ustar_wr(register ARCHD *arcn) -#else -int -ustar_wr(arcn) - register ARCHD *arcn; -#endif { register HD_USTAR *hd; register char *pt; @@ -1147,15 +1049,8 @@ ustar_wr(arcn) * the file name is too long */ -#ifdef __STDC__ static char * name_split(register char *name, register int len) -#else -static char * -name_split(name, len) - register char *name; - register int len; -#endif { register char *start; diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index 7e3b2d88e18..859cdfb013d 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_subs.c,v 1.7 2001/09/05 22:32:27 deraadt Exp $ */ +/* $OpenBSD: tty_subs.c,v 1.8 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.7 2001/09/05 22:32:27 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.8 2002/02/19 19:39:35 millert Exp $"; #endif #endif /* not lint */ @@ -58,11 +58,7 @@ static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.7 2001/09/05 22:32:27 deraadt Ex #include <string.h> #include "pax.h" #include "extern.h" -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif /* * routines that deal with I/O to and from the user @@ -78,13 +74,8 @@ static FILE *ttyinf = NULL; /* input pointing at control tty */ * open fails, future ops that require user input will get an EOF */ -#ifdef __STDC__ int tty_init(void) -#else -int -tty_init() -#endif { int ttyfd; @@ -110,22 +101,12 @@ tty_init() * if there is no controlling terminal, just return. */ -#ifdef __STDC__ void tty_prnt(char *fmt, ...) -#else -void -tty_prnt(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -# ifdef __STDC__ + va_start(ap, fmt); -# else - va_start(ap); -# endif if (ttyoutf == NULL) { va_end(ap); return; @@ -143,15 +124,8 @@ tty_prnt(fmt, va_alist) * 0 if data was read, -1 otherwise. */ -#ifdef __STDC__ int tty_read(char *str, int len) -#else -int -tty_read(str, len) - char *str; - int len; -#endif { register char *pt; @@ -173,23 +147,12 @@ tty_read(str, len) * will be non-zero. */ -#ifdef __STDC__ void paxwarn(int set, char *fmt, ...) -#else -void -paxwarn(set, fmt, va_alist) - int set; - char *fmt; - va_dcl -#endif { va_list ap; -# ifdef __STDC__ + va_start(ap, fmt); -# else - va_start(ap); -# endif if (set) exit_val = 1; /* @@ -213,24 +176,12 @@ paxwarn(set, fmt, va_alist) * will be non-zero. */ -#ifdef __STDC__ void syswarn(int set, int errnum, char *fmt, ...) -#else -void -syswarn(set, errnum, fmt, va_alist) - int set; - int errnum; - char *fmt; - va_dcl -#endif { va_list ap; -# ifdef __STDC__ + va_start(ap, fmt); -# else - va_start(ap); -# endif if (set) exit_val = 1; /* diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 902f8419c48..e11be6a6dfe 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcp.c,v 1.27 2002/02/17 19:42:19 millert Exp $ */ +/* $OpenBSD: rcp.c,v 1.28 2002/02/19 19:39:35 millert Exp $ */ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ /* @@ -869,32 +869,18 @@ usage() exit(1); } -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef KERBEROS void -#ifdef __STDC__ oldw(const char *fmt, ...) -#else -oldw(fmt, va_alist) - char *fmt; - va_dcl -#endif { char realm[REALM_SZ]; va_list ap; if (krb_get_lrealm(realm, 1) != KSUCCESS) return; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "rcp: "); (void)vfprintf(stderr, fmt, ap); (void)fprintf(stderr, ", using standard rcp\n"); @@ -903,13 +889,7 @@ oldw(fmt, va_alist) #endif void -#ifdef __STDC__ run_err(const char *fmt, ...) -#else -run_err(fmt, va_alist) - char *fmt; - va_dcl -#endif { static FILE *fp; va_list ap; @@ -919,22 +899,14 @@ run_err(fmt, va_alist) return; (void)fprintf(fp, "%c", 0x01); (void)fprintf(fp, "rcp: "); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(fp, fmt, ap); va_end(ap); (void)fprintf(fp, "\n"); (void)fflush(fp); if (!iamremote) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vwarnx(fmt, ap); va_end(ap); } diff --git a/games/adventure/hdr.h b/games/adventure/hdr.h index fcbdded5dc0..cf2c71511eb 100644 --- a/games/adventure/hdr.h +++ b/games/adventure/hdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hdr.h,v 1.8 2001/08/06 22:59:05 pjanzen Exp $ */ +/* $OpenBSD: hdr.h,v 1.9 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: hdr.h,v 1.2 1995/03/21 12:05:02 cgd Exp $ */ /*- @@ -163,8 +163,4 @@ int turns, lmwarn, iwest, knfloc, detail, /* various flags & counters */ int demo, newloc, limit; /* We need to get a little tricky to avoid strings */ -#ifdef __STDC__ #define DECR(a,b,c,d,e) decr(*#a+'+',*#b+'-',*#c+'#',*#d+'&',*#e+'%') -#else -#define DECR(a,b,c,d,e) decr('a'+'+','b'+'-','c'+'#','d'+'&','e'+'%') -#endif diff --git a/games/cribbage/io.c b/games/cribbage/io.c index 142db231ba5..f44ea1eeeb5 100644 --- a/games/cribbage/io.c +++ b/games/cribbage/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.6 2001/08/17 23:14:30 pjanzen Exp $ */ +/* $OpenBSD: io.c,v 1.7 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: io.c,v 1.9 1997/07/09 06:25:47 phil Exp $ */ /*- @@ -49,12 +49,7 @@ static char rcsid[] = "$NetBSD: io.c,v 1.7 1995/03/21 15:08:53 cgd Exp $"; #include <string.h> #include <termios.h> #include <unistd.h> - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "deck.h" #include "cribbage.h" @@ -401,21 +396,11 @@ int Mpos = 0; static int Newpos = 0; void -#ifdef __STDC__ msg(const char *fmt, ...) -#else -msg(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vsprintf(&Msgbuf[Newpos], fmt, ap); Newpos = strlen(Msgbuf); va_end(ap); @@ -427,21 +412,11 @@ msg(fmt, va_alist) * Add things to the current message */ void -#ifdef __STDC__ addmsg(const char *fmt, ...) -#else -addmsg(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vsprintf(&Msgbuf[Newpos], fmt, ap); Newpos = strlen(Msgbuf); va_end(ap); diff --git a/games/hunt/hunt/display.c b/games/hunt/hunt/display.c index 57da669b28c..07fcd2d9dc1 100644 --- a/games/hunt/hunt/display.c +++ b/games/hunt/hunt/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.3 2000/02/10 11:13:11 d Exp $ */ +/* $OpenBSD: display.c,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /* * Display abstraction. @@ -92,11 +92,7 @@ display_open() void display_beep() { -#ifdef __STDC__ (void) putchar('\a'); -#else - (void) putchar(CTRL('G')); -#endif } /* diff --git a/games/larn/io.c b/games/larn/io.c index 5adc9cba855..8f0b45734a1 100644 --- a/games/larn/io.c +++ b/games/larn/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.7 2000/06/29 07:55:41 pjanzen Exp $ */ +/* $OpenBSD: io.c,v 1.8 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: io.c,v 1.7 1997/10/18 20:03:26 christos Exp $ */ /* @@ -61,7 +61,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: io.c,v 1.7 2000/06/29 07:55:41 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: io.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; #endif /* not lint */ #include "header.h" @@ -116,11 +116,7 @@ static char saveeof, saveeol; #endif /* not TERMIO or TERMIOS */ #ifndef NOVARARGS /* if we have varargs */ -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #else /* NOVARARGS */ /* if we don't have varargs */ typedef char *va_list; #define va_dcl int va_alist; @@ -250,26 +246,14 @@ sprintf(str) } #else /* lint */ /* VARARGS */ -#ifdef __STDC__ void lprintf(const char *fmt, ...) -#else -void -lprintf(va_alist) -va_dcl -#endif { va_list ap; /* pointer for variable argument list */ char *outb, *tmpb; long wide, left, cont, n; /* data for lprintf */ char db[12]; /* %d buffer in lprintf */ -#ifndef __STDC__ - char *fmt; - va_start(ap); /* initialize the var args pointer */ - fmt = va_arg(ap, char *); /* pointer to format string */ -#else va_start(ap, fmt); -#endif if (lpnt >= lpend) lflush(); outb = lpnt; diff --git a/games/mille/misc.c b/games/mille/misc.c index bc9eeaba250..719c330691e 100644 --- a/games/mille/misc.c +++ b/games/mille/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.7 2001/09/03 21:36:12 pjanzen Exp $ */ +/* $OpenBSD: misc.c,v 1.8 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $ */ /* @@ -38,18 +38,13 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2001/09/03 21:36:12 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; #endif #endif /* not lint */ #include <sys/file.h> #include <termios.h> - -#if __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif +#include <stdarg.h> #include "mille.h" @@ -60,21 +55,11 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2001/09/03 21:36:12 pjanzen Exp $" #define NUMSAFE 4 bool -#if __STDC__ error(char *str, ...) -#else -error(str, arg) - char *str; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, str); -#else - va_start(ap); -#endif wmove(Score, ERR_Y, ERR_X); vwprintw(Score, str, ap); wclrtoeol(Score); diff --git a/games/sail/pl_7.c b/games/sail/pl_7.c index c78e068f47b..9ebd23654b4 100644 --- a/games/sail/pl_7.c +++ b/games/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pl_7.c,v 1.4 2001/09/05 22:32:28 deraadt Exp $ */ +/* $OpenBSD: pl_7.c,v 1.5 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $ */ /* @@ -38,17 +38,13 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: pl_7.c,v 1.4 2001/09/05 22:32:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pl_7.c,v 1.5 2002/02/19 19:39:36 millert Exp $"; #endif #endif /* not lint */ #include <sys/ttydefaults.h> #include "player.h" -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <unistd.h> #include <err.h> @@ -168,25 +164,12 @@ newturn(n) /*VARARGS2*/ void -#ifdef __STDC__ Signal(char *fmt, struct ship *ship, ...) -#else -Signal(va_alist) - va_dcl -#endif { va_list ap; char format[BUFSIZ]; -#ifndef __STDC__ - char *fmt; - struct ship *ship; - va_start(ap); - fmt = va_arg(ap, const char *); - ship = va_arg(ap, struct ship *); -#else va_start(ap, ship); -#endif if (!done_curses) { va_end(va); return; @@ -194,33 +177,18 @@ Signal(va_alist) if (*fmt == '\7') putchar(*fmt++); fmtship(format, sizeof(format), fmt, ship); -#ifdef __STDC__ (void) vw_printw(scroll_w, format, ap); -#else - (void) vwprintw(scroll_w, format, ap); -#endif va_end(ap); Scroll(); } /*VARARGS2*/ void -#ifdef __STDC__ Msg(char *fmt, ...) -#else -Msg(va_alist) - va_dcl -#endif { va_list ap; -#ifndef __STDC__ - char *fmt; - va_start(ap); - fmt = va_arg(ap, const char *); -#else va_start(ap, fmt); -#endif if (!done_curses) { va_end(ap); @@ -228,11 +196,7 @@ Msg(va_alist) } if (*fmt == '\7') putchar(*fmt++); -#ifdef __STDC__ (void) vw_printw(scroll_w, fmt, ap); -#else - (void) vwprintw(scroll_w, fmt, ap); -#endif va_end(ap); Scroll(); } diff --git a/games/sail/sync.c b/games/sail/sync.c index 97f9e6ef71a..e0832531838 100644 --- a/games/sail/sync.c +++ b/games/sail/sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sync.c,v 1.2 1999/01/18 06:20:54 pjanzen Exp $ */ +/* $OpenBSD: sync.c,v 1.3 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: sync.c,v 1.9 1998/08/30 09:19:40 veego Exp $ */ /* @@ -39,17 +39,13 @@ #if 0 static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: sync.c,v 1.2 1999/01/18 06:20:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: sync.c,v 1.3 2002/02/19 19:39:36 millert Exp $"; #endif #endif /* not lint */ #include <fcntl.h> #include <errno.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <stdlib.h> #include <unistd.h> #include <sys/file.h> @@ -100,28 +96,13 @@ fmtship(buf, len, fmt, ship) /*VARARGS3*/ void -#ifdef __STDC__ makesignal(struct ship *from, const char *fmt, struct ship *ship, ...) -#else -makesignal(va_alias) - va_dcl -#endif { char message[BUFSIZ]; char format[BUFSIZ]; va_list ap; -#ifndef __STDC__ - struct ship *from; - const char *fmt; - struct ship *ship; - va_start(ap); - from = va_arg(ap, struct ship *); - fmt = va_arg(ap, const char *); - ship = va_arg(ap, struct ship *); -#else va_start(ap, ship); -#endif fmtship(format, sizeof(format), fmt, ship); (void) vsprintf(message, format, ap); va_end(ap); @@ -129,25 +110,12 @@ makesignal(va_alias) } void -#ifdef __STDC__ makemsg(struct ship *from, const char *fmt, ...) -#else -makemsg(va_alias) - va_dcl -#endif { char message[BUFSIZ]; va_list ap; -#ifndef __STDC__ - struct ship *from; - const char *fmt; - va_start(ap); - from = va_arg(ap, struct ship *); - fmt = va_arg(ap, const char *); -#else va_start(ap, fmt); -#endif (void) vsprintf(message, fmt, ap); va_end(ap); Writestr(W_SIGNAL, from, message); diff --git a/include/assert.h b/include/assert.h index b5951f6d344..17d2dbf92cd 100644 --- a/include/assert.h +++ b/include/assert.h @@ -1,4 +1,4 @@ -/* $OpenBSD: assert.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: assert.h,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $ */ /*- @@ -54,11 +54,7 @@ #define _assert(e) ((void)0) #else #define _assert(e) assert(e) -#ifdef __STDC__ #define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e)) -#else /* PCC */ -#define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, "e")) -#endif #endif #include <sys/cdefs.h> diff --git a/include/signal.h b/include/signal.h index 84d20e6280c..193a546b981 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.6 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $ */ /*- @@ -64,7 +64,7 @@ int sigpending(sigset_t *); int sigprocmask(int, const sigset_t *, sigset_t *); int sigsuspend(const sigset_t *); -#if defined(__GNUC__) && defined(__STDC__) +#if defined(__GNUC__) extern __inline int sigaddset(sigset_t *set, int signo) { extern int errno; diff --git a/include/stdio.h b/include/stdio.h index d6f64a65ad8..7918650e097 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.21 2002/02/17 19:42:21 millert Exp $ */ +/* $OpenBSD: stdio.h,v 1.22 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -366,7 +366,7 @@ __END_DECLS * define function versions in the C library. */ #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++)) -#if defined(__GNUC__) && defined(__STDC__) +#if defined(__GNUC__) static __inline int __sputc(int _c, FILE *_p) { if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n')) return (*_p->_p++ = _c); diff --git a/lib/libc/arch/i386/SYS.h b/lib/libc/arch/i386/SYS.h index a4d0fe9d6aa..90f6beab34d 100644 --- a/lib/libc/arch/i386/SYS.h +++ b/lib/libc/arch/i386/SYS.h @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.9 2001/09/20 20:52:09 millert Exp $ + * $OpenBSD: SYS.h,v 1.10 2002/02/19 19:39:36 millert Exp $ */ #include <machine/asm.h> @@ -51,11 +51,7 @@ #ifdef _THREAD_SAFE /* Use _thread_sys_{syscall} when compiled with -D_THREAD_SAFE */ -#ifdef __STDC__ #define SYSENTRY(x) ENTRY(_thread_sys_ ## x) -#else /* ! __STDC__ */ -#define SYSENTRY(x) ENTRY(_thread_sys_/**/x) -#endif /* ! __STDC__ */ #else /* ! _THREAD_SAFE */ /* Use {syscall} when compiling without -D_THREAD_SAFE */ #define SYSENTRY(x) ENTRY(x) @@ -65,28 +61,15 @@ /* Use both _thread_sys_{syscall} and [weak] {syscall}. */ -#ifdef __STDC__ #define SYSENTRY(x) \ ENTRY(_thread_sys_ ## x) \ .weak _C_LABEL(x); \ _C_LABEL(x) = _C_LABEL(_thread_sys_ ## x) -#else /* ! __STDC__ */ -#define SYSENTRY(x) \ - ENTRY(_thread_sys_/**/x) \ - .weak _C_LABEL(x); \ - _C_LABEL(x) = _C_LABEL(_thread_sys_/**/x) -#endif /* ! __STDC__ */ #endif /* WEAK_ALIASES */ -#ifdef __STDC__ #define __DO_SYSCALL(x) \ movl $(SYS_ ## x),%eax; \ int $0x80 -#else /* ! __STDC__ */ -#define __DO_SYSCALL(x) \ - movl $(SYS_/**/x),%eax; \ - int $0x80 -#endif /* ! __STDC__ */ /* perform a syscall */ #define _SYSCALL_NOERROR(x,y) \ diff --git a/lib/libc/arch/m68k/SYS.h b/lib/libc/arch/m68k/SYS.h index 2ed3760422c..bba1c3f53e0 100644 --- a/lib/libc/arch/m68k/SYS.h +++ b/lib/libc/arch/m68k/SYS.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.7 2001/09/21 14:23:05 millert Exp $ + * $OpenBSD: SYS.h,v 1.8 2002/02/19 19:39:36 millert Exp $ */ #include <sys/syscall.h> @@ -42,19 +42,11 @@ #define _IMMEDIATE_ # -#ifdef __STDC__ -# define __ENTRY(p,x) ENTRY(p##x) -# define __DO_SYSCALL(x) \ +#define __ENTRY(p,x) ENTRY(p##x) +#define __DO_SYSCALL(x) \ movl _IMMEDIATE_ SYS_##x, d0; \ trap _IMMEDIATE_ 0 -# define __LABEL2(p,x) _C_LABEL(p##x) -#else -# define __ENTRY(p,x) ENTRY(p/**/x) -# define __DO_SYSCALL(x) \ - movl _IMMEDIATE_ SYS_/**/x, d0; \ - trap _IMMEDIATE_ 0 -# define __LABEL2(p,x) _C_LABEL(p/**/x) -#endif +#define __LABEL2(p,x) _C_LABEL(p##x) /* perform a syscall */ diff --git a/lib/libc/arch/m88k/SYS.h b/lib/libc/arch/m88k/SYS.h index 7dbbe09d978..e49ff210324 100644 --- a/lib/libc/arch/m88k/SYS.h +++ b/lib/libc/arch/m88k/SYS.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: SYS.h,v 1.3 2001/09/20 20:52:09 millert Exp $*/ +/* * $OpenBSD: SYS.h,v 1.4 2002/02/19 19:39:36 millert Exp $*/ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -41,8 +41,6 @@ #include <sys/syscall.h> #include <machine/asm.h> -#ifdef __STDC__ - #define _SYSCALL(x,y) align 8; \ ENTRY(x); \ ld r10,r31,32; \ @@ -60,26 +58,6 @@ or r13,r0, SYS_ ## y; \ tb0 0,r0,128; or r0,r0,r0;jmp r1 -#else /* !__STDC__ */ - -#define _SYSCALL(x,y) align 8; \ - ENTRY(x); \ - ld r10,r31,32; \ - ld r11,r31,36; \ - ld r12,r31,40; \ - or r13,r0, SYS_/**/y; \ - tb0 0, r0, 128; \ - br cerror -#define SYSCALL(x) _SYSCALL(x,x) -#define RSYSCALL(x) SYSCALL(x); \ - jmp r1 -#define PSEUDO(x,y) _SYSCALL(x,y); \ - jmp r1 -#define PSEUDO_NOERROR(x,y) ENTRY(x); \ - or r13,r0, SYS_/**/y; \ - tb0 0,r0,128; or r0,r0,r0; jmp r1 -#endif /* !__STDC__ */ - #define ASMSTR .asciz .globl cerror diff --git a/lib/libc/arch/m88k/gen/modf.c b/lib/libc/arch/m88k/gen/modf.c index f896fe392ed..74bcf56ef78 100644 --- a/lib/libc/arch/m88k/gen/modf.c +++ b/lib/libc/arch/m88k/gen/modf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $ */ +/* $OpenBSD: modf.c,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /* @(#)s_modf.c 5.1 93/09/24 */ /* * ==================================================== @@ -12,7 +12,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: modf.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* @@ -253,18 +253,10 @@ extern float __kernel_tanf(float,float,int); extern int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #endif /* _MATH_PRIVATE_H_ */ -#ifdef __STDC__ static const double one = 1.0; -#else -static double one = 1.0; -#endif -#ifdef __STDC__ - double modf(double x, double *iptr) -#else - double modf(x, iptr) - double x,*iptr; -#endif +double +modf(double x, double *iptr) { int32_t i0,i1,j0; u_int32_t i; diff --git a/lib/libc/arch/mips/SYS.h b/lib/libc/arch/mips/SYS.h index 89ff3f8e1b0..5a5fb83dc4a 100644 --- a/lib/libc/arch/mips/SYS.h +++ b/lib/libc/arch/mips/SYS.h @@ -33,29 +33,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.7 2001/09/20 20:52:09 millert Exp $ + * $OpenBSD: SYS.h,v 1.8 2002/02/19 19:39:36 millert Exp $ */ #include <sys/syscall.h> #include <machine/asm.h> -#ifdef __STDC__ -# define __ENTRY(p,x) ENTRY(p ## x) -# define __DO_SYSCALL(x) \ +#define __ENTRY(p,x) ENTRY(p ## x) +#define __DO_SYSCALL(x) \ li v0,SYS_ ## x; \ syscall -# define __LEAF2(p,x) LEAF(p ## x) -# define __END2(p,x) END(p ## x) -# define __CLABEL2(p,x) _C_LABEL(p ## x) -#else -# define __ENTRY(p,x) ENTRY(p/**/x) -# define __DO_SYSCALL(x) \ - li v0,SYS_/**/x; \ - syscall -# define __LEAF2(p,x) LEAF(p/**/x) -# define __END2(p,x) END(p/**/x) -# define __CLABEL2(p,x) _C_LABEL(p/**/x) -#endif +#define __LEAF2(p,x) LEAF(p ## x) +#define __END2(p,x) END(p ## x) +#define __CLABEL2(p,x) _C_LABEL(p ## x) #define __PSEUDO_NOERROR(p,x,y) \ __LEAF2(p,x); \ diff --git a/lib/libc/arch/mvme88k/SYS.h b/lib/libc/arch/mvme88k/SYS.h index 29f81db8f31..74fc735d5f5 100644 --- a/lib/libc/arch/mvme88k/SYS.h +++ b/lib/libc/arch/mvme88k/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.3 2001/09/20 20:52:10 millert Exp $ */ +/* $OpenBSD: SYS.h,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -41,8 +41,6 @@ #include <sys/syscall.h> #include <machine/asm.h> -#ifdef __STDC__ - #define _SYSCALL(x,y) align 8; \ ENTRY(x); \ ld r10,r31,32; \ @@ -60,26 +58,6 @@ or r13,r0, SYS_ ## y; \ tb0 0,r0,128; or r0,r0,r0;jmp r1 -#else /* !__STDC__ */ - -#define _SYSCALL(x,y) align 8; \ - ENTRY(x); \ - ld r10,r31,32; \ - ld r11,r31,36; \ - ld r12,r31,40; \ - or r13,r0, SYS_/**/y; \ - tb0 0, r0, 128; \ - br cerror -#define SYSCALL(x) _SYSCALL(x,x) -#define RSYSCALL(x) SYSCALL(x); \ - jmp r1 -#define PSEUDO(x,y) _SYSCALL(x,y); \ - jmp r1 -#define PSEUDO_NOERROR(x,y) ENTRY(x); \ - or r13,r0, SYS_/**/y; \ - tb0 0,r0,128; or r0,r0,r0; jmp r1 -#endif /* !__STDC__ */ - #define ASMSTR .asciz .globl cerror diff --git a/lib/libc/arch/powerpc/SYS.h b/lib/libc/arch/powerpc/SYS.h index d51ae24b978..fafee734273 100644 --- a/lib/libc/arch/powerpc/SYS.h +++ b/lib/libc/arch/powerpc/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.10 2001/09/20 21:13:27 drahn Exp $ */ +/* $OpenBSD: SYS.h,v 1.11 2002/02/19 19:39:36 millert Exp $ */ /*- * Copyright (c) 1994 * Andrew Cagney. All rights reserved. @@ -44,19 +44,12 @@ #include "machine/asm.h" -#ifdef __STDC__ #define _CONCAT(x,y) x##y #define PSEUDO_PREFIX(p,x,y) .extern cerror ; \ ENTRY(p##x) \ li 0, SYS_##y ; \ /* sc */ -#else /* !__STDC__ */ -#define _CONCAT(x,y) x/**/y -#define PSEUDO_PREFIX(p,x,y) .extern cerror ; \ - ENTRY(p/**/x) \ - li 0, SYS_/**/y ; \ - /* sc */ -#endif /* !__STDC__ */ + #define PSEUDO_SUFFIX cmpwi 0, 0 ; \ beqlr+ ; \ b PIC_PLT(_ASM_LABEL(cerror)) diff --git a/lib/libc/arch/powerpc/gen/modf.c b/lib/libc/arch/powerpc/gen/modf.c index 73cf1bc85b8..f968ee9856b 100644 --- a/lib/libc/arch/powerpc/gen/modf.c +++ b/lib/libc/arch/powerpc/gen/modf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $ */ +/* $OpenBSD: modf.c,v 1.6 2002/02/19 19:39:36 millert Exp $ */ /* @(#)s_modf.c 5.1 93/09/24 */ /* * ==================================================== @@ -12,7 +12,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: modf.c,v 1.6 2002/02/19 19:39:36 millert Exp $"; #endif /* @@ -253,18 +253,10 @@ extern float __kernel_tanf(float,float,int); extern int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #endif /* _MATH_PRIVATE_H_ */ -#ifdef __STDC__ static const double one = 1.0; -#else -static double one = 1.0; -#endif -#ifdef __STDC__ - double modf(double x, double *iptr) -#else - double modf(x, iptr) - double x,*iptr; -#endif +double +modf(double x, double *iptr) { int32_t i0,i1,j0; u_int32_t i; diff --git a/lib/libc/arch/sparc/SYS.h b/lib/libc/arch/sparc/SYS.h index cfaefa3805c..8970b18317e 100644 --- a/lib/libc/arch/sparc/SYS.h +++ b/lib/libc/arch/sparc/SYS.h @@ -34,20 +34,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.9 2001/09/20 20:52:10 millert Exp $ + * $OpenBSD: SYS.h,v 1.10 2002/02/19 19:39:36 millert Exp $ */ #include <machine/asm.h> #include <sys/syscall.h> #include <machine/trap.h> -#ifdef __STDC__ #define _CAT(x,y) x##y #define __ENTRY(p,x) ENTRY(p##x) -#else -#define _CAT(x,y) x/**/y -#define __ENTRY(p,x) ENTRY(p/**/x) -#endif /* * ERROR branches to cerror. This is done with a macro so that I can diff --git a/lib/libc/arch/sparc64/SYS.h b/lib/libc/arch/sparc64/SYS.h index 467194f0e47..a89eb59398a 100644 --- a/lib/libc/arch/sparc64/SYS.h +++ b/lib/libc/arch/sparc64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.6 2002/01/03 01:11:10 art Exp $ */ +/* $OpenBSD: SYS.h,v 1.7 2002/02/19 19:39:36 millert Exp $ */ /*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -45,11 +45,7 @@ #include <sys/syscall.h> #include <machine/trap.h> -#ifdef __STDC__ #define _CAT(x,y) x##y -#else -#define _CAT(x,y) x/**/y -#endif #define __ENTRY(p,x) ENTRY(_CAT(p,x)) ; .weak x; x = _CAT(p,x) diff --git a/lib/libc/arch/vax/SYS.h b/lib/libc/arch/vax/SYS.h index ace50176650..170e23eb712 100644 --- a/lib/libc/arch/vax/SYS.h +++ b/lib/libc/arch/vax/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.6 2001/09/20 20:52:10 millert Exp $ */ +/* $OpenBSD: SYS.h,v 1.7 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: SYS.h,v 1.4 1997/05/02 18:15:32 kleink Exp $ */ /* @@ -37,15 +37,9 @@ #include <machine/asm.h> #include <sys/syscall.h> -#ifdef __STDC__ #define _CAT(x,y) x##y #define __ENTRY(p,x) ENTRY(p##x,0) #define __DO_SYSCALL(x) chmk $ SYS_ ## x -#else -#define _CAT(x,y) x/**/y -#define __ENTRY(p,x) ENTRY(p/**/x,0) -#define __DO_SYSCALL(x) chmk $ SYS_/**/x -#endif #define __SYSCALL(p,x,y) \ err: jmp cerror; \ diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c index e99660ea370..4a536fce7d0 100644 --- a/lib/libc/compat-43/creat.c +++ b/lib/libc/compat-43/creat.c @@ -32,19 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: creat.c,v 1.3 1997/07/25 20:29:57 mickey Exp $"; +static char *rcsid = "$OpenBSD: creat.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <fcntl.h> int -#ifdef __STDC__ creat(const char *path, mode_t mode) -#else -creat(path, mode) - char *path; - mode_t mode; -#endif { return(open(path, O_WRONLY|O_CREAT|O_TRUNC, mode)); } diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c index 17feea9d0f1..31a1fab8431 100644 --- a/lib/libc/compat-43/gethostid.c +++ b/lib/libc/compat-43/gethostid.c @@ -32,19 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: gethostid.c,v 1.3 1997/07/25 20:29:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: gethostid.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <sys/sysctl.h> -#ifdef __STDC__ long gethostid(void) -#else -long -gethostid() -#endif { int mib[2]; size_t size; diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c index 2be8dcc6f5d..ce10d9c78e9 100644 --- a/lib/libc/compat-43/killpg.c +++ b/lib/libc/compat-43/killpg.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: killpg.c,v 1.3 1997/07/25 20:29:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: killpg.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -43,13 +43,7 @@ static char *rcsid = "$OpenBSD: killpg.c,v 1.3 1997/07/25 20:29:58 mickey Exp $" * Backwards-compatible killpg(). */ int -#ifdef __STDC__ killpg(pid_t pgid, int sig) -#else -killpg(pgid, sig) - pid_t pgid; - int sig; -#endif { if (pgid == 1) { errno = ESRCH; diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c index cb1d6a71d80..7592e56ea4b 100644 --- a/lib/libc/compat-43/setpgrp.c +++ b/lib/libc/compat-43/setpgrp.c @@ -32,19 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setpgrp.c,v 1.3 1997/07/25 20:29:59 mickey Exp $"; +static char *rcsid = "$OpenBSD: setpgrp.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <unistd.h> int -#ifdef __STDC__ setpgrp(pid_t pid, pid_t pgid) -#else -setpgrp(pid, pgid) - pid_t pid, pgid; -#endif { return(setpgid(pid, pgid)); } diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c index 20540d0affa..1ce12ce86ac 100644 --- a/lib/libc/compat-43/setrgid.c +++ b/lib/libc/compat-43/setrgid.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setrgid.c,v 1.7 2002/02/16 21:27:21 millert Exp $"; +static char *rcsid = "$OpenBSD: setrgid.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -43,12 +43,7 @@ __warn_references(setrgid, "warning: this program uses setrgid(), which is depre extern int __setregid(gid_t, gid_t); int -#ifdef __STDC__ setrgid(gid_t rgid) -#else -setrgid(rgid) - gid_t rgid; -#endif { return (__setregid(rgid, (gid_t)-1)); } diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c index b4b85cf7267..78d7372e791 100644 --- a/lib/libc/compat-43/setruid.c +++ b/lib/libc/compat-43/setruid.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setruid.c,v 1.7 2002/02/16 21:27:21 millert Exp $"; +static char *rcsid = "$OpenBSD: setruid.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -43,12 +43,7 @@ __warn_references(setruid, "warning: this program uses setruid(), which is depre extern int __setreuid(uid_t, uid_t); int -#ifdef __STDC__ setruid(uid_t ruid) -#else -setruid(ruid) - uid_t ruid; -#endif { return (__setreuid(ruid, (uid_t)-1)); } diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c index f3ea849f006..dec0093dd8c 100644 --- a/lib/libc/crypt/bcrypt.c +++ b/lib/libc/crypt/bcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ +/* $OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -97,16 +97,8 @@ const static u_int8_t index_64[128] = }; #define CHAR64(c) ( (c) > 127 ? 255 : index_64[(c)]) -#ifdef __STDC__ static void decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data) -#else -static void -decode_base64(buffer, len, data) - u_int8_t *buffer; - u_int16_t len; - u_int8_t *data; -#endif { u_int8_t *bp = buffer; u_int8_t *p = data; @@ -140,17 +132,8 @@ decode_base64(buffer, len, data) } } -#ifdef __STDC__ static void encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr) -#else -static void -encode_salt(salt, csalt, clen, logr) - char *salt; - u_int8_t *csalt; - u_int16_t clen; - u_int8_t logr; -#endif { salt[0] = '$'; salt[1] = BCRYPT_VERSION; @@ -166,14 +149,8 @@ encode_salt(salt, csalt, clen, logr) seems sensible. */ -#ifdef __STDC__ char * bcrypt_gensalt(u_int8_t log_rounds) -#else -char * -bcrypt_gensalt(log_rounds) - u_int8_t log_rounds; -#endif { u_int8_t csalt[BCRYPT_MAXSALT]; u_int16_t i; @@ -296,16 +273,8 @@ bcrypt(key, salt) return encrypted; } -#ifdef __STDC__ static void encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len) -#else -static void -encode_base64(buffer, data, len) - u_int8_t *buffer; - u_int8_t *data; - u_int16_t len; -#endif { u_int8_t *bp = buffer; u_int8_t *p = data; diff --git a/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c index 695fc00a6af..8be04a6463a 100644 --- a/lib/libc/crypt/blowfish.c +++ b/lib/libc/crypt/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.15 2001/01/04 21:45:30 todd Exp $ */ +/* $OpenBSD: blowfish.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -402,16 +402,8 @@ Blowfish_initstate(c) } -#ifdef __STDC__ u_int32_t Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current) -#else -u_int32_t -Blowfish_stream2word(data, databytes, current) - const u_int8_t *data; - u_int16_t databytes; - u_int16_t *current; -#endif { u_int8_t i; u_int16_t j; @@ -430,16 +422,8 @@ Blowfish_stream2word(data, databytes, current) return temp; } -#if __STDC__ void Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expand0state(c, key, keybytes) - blf_ctx *c; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -476,19 +460,9 @@ Blowfish_expand0state(c, key, keybytes) } -#if __STDC__ void Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expandstate(c, data, databytes, key, keybytes) - blf_ctx *c; - const u_int8_t *data; - u_int16_t databytes; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -529,16 +503,8 @@ Blowfish_expandstate(c, data, databytes, key, keybytes) } -#if __STDC__ void blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len) -#else -void -blf_key(c, k, len) - blf_ctx *c; - const u_int8_t *k; - u_int16_t len; -#endif { /* Initialize S-boxes and subkeys with Pi */ Blowfish_initstate(c); @@ -547,16 +513,8 @@ blf_key(c, k, len) Blowfish_expand0state(c, k, len); } -#if __STDC__ void blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_enc(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -568,16 +526,8 @@ blf_enc(c, data, blocks) } } -#if __STDC__ void blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_dec(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -589,16 +539,8 @@ blf_dec(c, data, blocks) } } -#if __STDC__ void blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_encrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i; @@ -619,16 +561,8 @@ blf_ecb_encrypt(c, data, len) } } -#if __STDC__ void blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_decrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i; @@ -649,17 +583,8 @@ blf_ecb_decrypt(c, data, len) } } -#if __STDC__ void blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_encrypt(c, iv, data, len) - blf_ctx *c; - u_int8_t *iv; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i, j; @@ -683,17 +608,8 @@ blf_cbc_encrypt(c, iv, data, len) } } -#if __STDC__ void blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_decrypt(c, iva, data, len) - blf_ctx *c; - u_int8_t *iva; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int8_t *iv; 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); } diff --git a/lib/libc/net/htons.c b/lib/libc/net/htons.c index 47cf25952db..ded70712ea0 100644 --- a/lib/libc/net/htons.c +++ b/lib/libc/net/htons.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: htons.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; +static char *rcsid = "$OpenBSD: htons.c,v 1.7 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -13,12 +13,7 @@ static char *rcsid = "$OpenBSD: htons.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; #undef htons u_int16_t -#ifdef __STDC__ htons(u_int16_t x) -#else -htons(x) - u_int16_t x; -#endif { #if BYTE_ORDER == LITTLE_ENDIAN u_char *s = (u_char *) &x; diff --git a/lib/libc/net/ntohs.c b/lib/libc/net/ntohs.c index cf6414d4a63..4c3ab33f31c 100644 --- a/lib/libc/net/ntohs.c +++ b/lib/libc/net/ntohs.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: ntohs.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; +static char *rcsid = "$OpenBSD: ntohs.c,v 1.7 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -13,12 +13,7 @@ static char *rcsid = "$OpenBSD: ntohs.c,v 1.6 1997/07/25 20:30:07 mickey Exp $"; #undef ntohs u_int16_t -#ifdef __STDC__ ntohs(u_int16_t x) -#else -ntohs(x) - u_int16_t x; -#endif { #if BYTE_ORDER == LITTLE_ENDIAN u_char *s = (u_char *) &x; diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c index 948923cf37d..25e196b2cfb 100644 --- a/lib/libc/net/res_comp.c +++ b/lib/libc/net/res_comp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $ */ +/* $OpenBSD: res_comp.c,v 1.10 2002/02/19 19:39:36 millert Exp $ */ /* * ++Copyright++ 1985, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: res_comp.c,v 1.10 2002/02/19 19:39:36 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -489,13 +489,7 @@ _getlong(msgp) } void -#if defined(__STDC__) || defined(__cplusplus) -__putshort(register u_int16_t s, register u_char *msgp) /* must match proto */ -#else -__putshort(s, msgp) - register u_int16_t s; - register u_char *msgp; -#endif +__putshort(register u_int16_t s, register u_char *msgp) { PUTSHORT(s, msgp); } diff --git a/lib/libc/net/res_random.c b/lib/libc/net/res_random.c index 6a6a142e96b..7a7d0bd6777 100644 --- a/lib/libc/net/res_random.c +++ b/lib/libc/net/res_random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_random.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */ +/* $OpenBSD: res_random.c,v 1.11 2002/02/19 19:39:36 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -100,14 +100,8 @@ static void res_initid(void); * of 0 - (mod-1) */ -#ifdef __STDC__ static u_int16_t pmod(u_int16_t gen, u_int16_t exp, u_int16_t mod) -#else -static u_int16_t -pmod(gen, exp, mod) - u_int16_t gen, exp, mod; -#endif { u_int16_t s, t, u; diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c index f08e6c96f42..5aad5df40f2 100644 --- a/lib/libc/stdio/asprintf.c +++ b/lib/libc/stdio/asprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asprintf.c,v 1.7 2001/09/05 22:32:33 deraadt Exp $ */ +/* $OpenBSD: asprintf.c,v 1.8 2002/02/19 19:39:36 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,38 +28,23 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: asprintf.c,v 1.7 2001/09/05 22:32:33 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: asprintf.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <stdlib.h> #include <errno.h> -#if __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#if __STDC__ asprintf(char **str, char const *fmt, ...) -#else -asprintf(str, fmt, va_alist) - char **str; - const char *fmt; - va_dcl -#endif { int ret; va_list ap; FILE f; unsigned char *_base; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif f._file = -1; f._flags = __SWR | __SSTR | __SALC; f._bf._base = f._p = (unsigned char *)malloc(128); diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 2d7a793c3c4..e2a8b53f3e3 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -35,34 +35,19 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fprintf.c,v 1.3 1997/07/25 20:30:09 mickey Exp $"; +static char rcsid[] = "$OpenBSD: fprintf.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#ifdef __STDC__ fprintf(FILE *fp, const char *fmt, ...) -#else -fprintf(fp, fmt, va_alist) - FILE *fp; - char *fmt; - va_dcl -#endif { int ret; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vfprintf(fp, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c index 009dbe8202e..dcd1a9050f5 100644 --- a/lib/libc/stdio/fscanf.c +++ b/lib/libc/stdio/fscanf.c @@ -35,34 +35,19 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fscanf.c,v 1.4 2001/07/09 06:57:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: fscanf.c,v 1.5 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#ifdef __STDC__ -fscanf(FILE *fp, char const *fmt, ...) { - int ret; - va_list ap; - - va_start(ap, fmt); -#else -fscanf(fp, fmt, va_alist) - FILE *fp; - char *fmt; - va_dcl +fscanf(FILE *fp, char const *fmt, ...) { int ret; va_list ap; - va_start(ap); -#endif + va_start(ap, fmt); ret = __svfscanf(fp, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c index 6b9eb87d895..c2fcb5461cd 100644 --- a/lib/libc/stdio/funopen.c +++ b/lib/libc/stdio/funopen.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: funopen.c,v 1.3 1997/07/25 20:30:09 mickey Exp $"; +static char rcsid[] = "$OpenBSD: funopen.c,v 1.4 2002/02/19 19:39:36 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -46,11 +46,7 @@ FILE * funopen(cookie, readfn, writefn, seekfn, closefn) const void *cookie; int (*readfn)(), (*writefn)(); -#ifdef __STDC__ fpos_t (*seekfn)(void *cookie, fpos_t off, int whence); -#else - fpos_t (*seekfn)(); -#endif int (*closefn)(); { register FILE *fp; diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h index bd7bcde8e9c..013f4abc69f 100644 --- a/lib/libc/stdio/fvwrite.h +++ b/lib/libc/stdio/fvwrite.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fvwrite.h,v 1.3 1997/07/25 20:30:10 mickey Exp $ */ +/* $OpenBSD: fvwrite.h,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -49,8 +49,4 @@ struct __suio { int uio_resid; }; -#if defined(__STDC__) || defined(c_plusplus) extern int __sfvwrite(FILE *, struct __suio *); -#else -extern int __sfvwrite(); -#endif diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index bdae6aec7ce..bfdacd6a970 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -35,33 +35,19 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: printf.c,v 1.3 1997/07/25 20:30:10 mickey Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.4 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#ifdef __STDC__ printf(char const *fmt, ...) -#else -printf(fmt, va_alist) - char *fmt; - va_dcl -#endif { int ret; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vfprintf(stdout, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c index 0897f817979..0efe9150da9 100644 --- a/lib/libc/stdio/scanf.c +++ b/lib/libc/stdio/scanf.c @@ -35,33 +35,19 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: scanf.c,v 1.4 2001/07/09 06:57:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: scanf.c,v 1.5 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#ifdef __STDC__ scanf(char const *fmt, ...) -#else -scanf(fmt, va_alist) - char *fmt; - va_dcl -#endif { int ret; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = __svfscanf(stdin, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index 5bd97f0bead..d8d6ccb74d4 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -35,27 +35,15 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: snprintf.c,v 1.6 1998/01/12 06:20:56 millert Exp $"; +static char rcsid[] = "$OpenBSD: snprintf.c,v 1.7 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <limits.h> #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif int -#ifdef __STDC__ snprintf(char *str, size_t n, char const *fmt, ...) -#else -snprintf(str, n, fmt, va_alist) - char *str; - size_t n; - char *fmt; - va_dcl -#endif { int ret; va_list ap; @@ -64,11 +52,7 @@ snprintf(str, n, fmt, va_alist) /* While snprintf(3) specifies size_t stdio uses an int internally */ if (n > INT_MAX) n = INT_MAX; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif f._file = -1; f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index 994192f04bc..c2d757af4c8 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -35,27 +35,16 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sprintf.c,v 1.4 1998/01/12 06:14:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: sprintf.c,v 1.5 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <limits.h> #include "local.h" int -#ifdef __STDC__ sprintf(char *str, char const *fmt, ...) -#else -sprintf(str, fmt, va_alist) - char *str; - char *fmt; - va_dcl -#endif { int ret; va_list ap; @@ -65,11 +54,7 @@ sprintf(str, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vfprintf(&f, fmt, ap); va_end(ap); *f._p = '\0'; diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c index f5bee8f9b70..7a9606e3abb 100644 --- a/lib/libc/stdio/sscanf.c +++ b/lib/libc/stdio/sscanf.c @@ -35,16 +35,12 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sscanf.c,v 1.4 2001/07/09 06:57:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sscanf.c,v 1.5 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <string.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "local.h" /* ARGSUSED */ @@ -59,14 +55,7 @@ eofread(cookie, buf, len) } int -#ifdef __STDC__ sscanf(const char *str, char const *fmt, ...) -#else -sscanf(str, fmt, va_alist) - const char *str; - char *fmt; - va_dcl -#endif { int ret; va_list ap; @@ -78,11 +67,7 @@ sscanf(str, fmt, va_alist) f._read = eofread; f._ub._base = NULL; f._lb._base = NULL; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = __svfscanf(&f, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 326a6e92746..24a9355942b 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: vfprintf.c,v 1.16 2002/02/17 19:42:24 millert Exp $"; +static char *rcsid = "$OpenBSD: vfprintf.c,v 1.17 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -50,12 +50,7 @@ static char *rcsid = "$OpenBSD: vfprintf.c,v 1.16 2002/02/17 19:42:24 millert Ex #include <stdlib.h> #include <string.h> #include <errno.h> - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "local.h" #include "fvwrite.h" diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index cd533cae684..942b37a9d3b 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -35,17 +35,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.7 2001/07/09 06:57:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.8 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "local.h" #ifdef FLOATING_POINT diff --git a/lib/libc/stdlib/multibyte.c b/lib/libc/stdlib/multibyte.c index 12e70c4a2c7..6f08bbe3425 100644 --- a/lib/libc/stdlib/multibyte.c +++ b/lib/libc/stdlib/multibyte.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: multibyte.c,v 1.2 1996/08/19 08:33:39 tholo Exp $"; +static char *rcsid = "$OpenBSD: multibyte.c,v 1.3 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> @@ -73,13 +73,7 @@ mbtowc(pwc, s, n) /*ARGSUSED*/ int -#ifdef __STDC__ wctomb(char *s, wchar_t wchar) -#else -wctomb(s, wchar) - char *s; - wchar_t wchar; -#endif { if (s == NULL) return 0; diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c index 44cc369b16f..ce7ce9fe562 100644 --- a/lib/libc/stdlib/strtod.c +++ b/lib/libc/stdlib/strtod.c @@ -90,7 +90,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strtod.c,v 1.14 2001/07/09 06:57:45 deraadt Exp $"; +static char *rcsid = "$OpenBSD: strtod.c,v 1.15 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ @@ -153,7 +153,6 @@ extern void *MALLOC(size_t); #include "errno.h" #ifdef Bad_float_h -#undef __STDC__ #ifdef IEEE_BIG_ENDIAN #define IEEE_ARITHMETIC #endif @@ -1429,7 +1428,7 @@ strtod if (e1 > DBL_MAX_10_EXP) { ovfl: errno = ERANGE; -#ifdef __STDC__ +#ifndef Bad_float_h value(rv) = HUGE_VAL; #else /* Can't trust HUGE_VAL */ diff --git a/lib/libc/sys/Lint_syscall.c b/lib/libc/sys/Lint_syscall.c index d1afedad86c..367a7aac179 100644 --- a/lib/libc/sys/Lint_syscall.c +++ b/lib/libc/sys/Lint_syscall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: Lint_syscall.c,v 1.1 1998/02/08 22:45:14 tholo Exp $ */ +/* $OpenBSD: Lint_syscall.c,v 1.2 2002/02/19 19:39:37 millert Exp $ */ /* $NetBSD: Lint_syscall.c,v 1.1 1997/11/06 00:53:22 cgd Exp $ */ /* @@ -7,21 +7,11 @@ */ #include <unistd.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif /*ARGSUSED*/ int -#ifdef __STDC__ syscall(int arg1, ...) -#else -syscall(arg1, va_alist) - int arg1; - va_dcl -#endif { return (0); } diff --git a/lib/libc/sys/semctl.c b/lib/libc/sys/semctl.c index 7a933897d66..64bf75114ab 100644 --- a/lib/libc/sys/semctl.c +++ b/lib/libc/sys/semctl.c @@ -30,36 +30,22 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: semctl.c,v 1.5 1998/06/10 08:46:22 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: semctl.c,v 1.6 2002/02/19 19:39:37 millert Exp $"; #endif /* SYSLIBC_SCCS and not lint */ #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 = NULL; -#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/termios/tcsetpgrp.c b/lib/libc/termios/tcsetpgrp.c index 91d65fa84d7..33508a6c1fb 100644 --- a/lib/libc/termios/tcsetpgrp.c +++ b/lib/libc/termios/tcsetpgrp.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.3 1997/07/25 20:30:15 mickey Exp $"; +static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.4 2002/02/19 19:39:37 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -40,13 +40,7 @@ static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.3 1997/07/25 20:30:15 mickey Ex #include <termios.h> int -#ifdef __STDC__ tcsetpgrp(int fd, pid_t pgrp) -#else -tcsetpgrp(fd, pgrp) - int fd; - pid_t pgrp; -#endif { int s; diff --git a/lib/libcom_err/com_err.h b/lib/libcom_err/com_err.h index 577a6dee6e5..277bf705c6f 100644 --- a/lib/libcom_err/com_err.h +++ b/lib/libcom_err/com_err.h @@ -43,10 +43,7 @@ #ifndef __COM_ERR_H__ #define __COM_ERR_H__ -#ifdef __STDC__ #include <stdarg.h> -#endif - /* * For compatibility with MIT's com_err the com_right.h include diff --git a/lib/libedit/el.c b/lib/libedit/el.c index c786df21ff1..452d0dc3d0e 100644 --- a/lib/libedit/el.c +++ b/lib/libedit/el.c @@ -1,4 +1,4 @@ -/* $OpenBSD: el.c,v 1.8 2001/04/13 20:35:19 millert Exp $ */ +/* $OpenBSD: el.c,v 1.9 2002/02/19 19:39:37 millert Exp $ */ /* $NetBSD: el.c,v 1.6 1997/04/24 18:54:16 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #else -static char rcsid[] = "$OpenBSD: el.c,v 1.8 2001/04/13 20:35:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: el.c,v 1.9 2002/02/19 19:39:37 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -54,11 +54,7 @@ static char rcsid[] = "$OpenBSD: el.c,v 1.8 2001/04/13 20:35:19 millert Exp $"; #include <sys/param.h> #include <string.h> #include <stdlib.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include <unistd.h> #include "el.h" @@ -159,26 +155,13 @@ el_reset(el) * set the editline parameters */ public int -#ifdef __STDC__ el_set(EditLine *el, int op, ...) -#else -el_set(va_alist) - va_dcl -#endif { va_list va; int rv; -#ifdef __STDC__ + va_start(va, op); -#else - EditLine *el; - int op; - va_start(va); - el = va_arg(va, EditLine *); - op = va_arg(va, int); -#endif - switch (op) { case EL_PROMPT: rv = prompt_set(el, va_arg(va, el_pfunc_t)); diff --git a/lib/libedit/history.c b/lib/libedit/history.c index d266b82c077..d6b9e745662 100644 --- a/lib/libedit/history.c +++ b/lib/libedit/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $ */ +/* $OpenBSD: history.c,v 1.7 2002/02/19 19:39:37 millert Exp $ */ /* $NetBSD: history.c,v 1.5 1997/04/11 17:52:46 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $"; +static char rcsid[] = "$OpenBSD: history.c,v 1.7 2002/02/19 19:39:37 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -52,11 +52,7 @@ static char rcsid[] = "$OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp #include <string.h> #include <stdlib.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif static const char hist_cookie[] = "_HiStOrY_V1_\n"; @@ -575,27 +571,14 @@ history_next_string(h, str) * User interface to history functions. */ const HistEvent * -#ifdef __STDC__ history(History *h, int fun, ...) -#else -history(va_alist) - va_dcl -#endif { va_list va; const HistEvent *ev = NULL; const char *str; static HistEvent sev = { 0, "" }; -#ifdef __STDC__ va_start(va, fun); -#else - History *h; - int fun; - va_start(va); - h = va_arg(va, History *); - fun = va_arg(va, int); -#endif switch (fun) { case H_ADD: diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h index 975dec2d7ba..b3a9e01fe1f 100644 --- a/lib/libedit/sys.h +++ b/lib/libedit/sys.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sys.h,v 1.5 2002/02/16 21:27:26 millert Exp $ */ +/* $OpenBSD: sys.h,v 1.6 2002/02/19 19:39:37 millert Exp $ */ /* $NetBSD: sys.h,v 1.3 1997/01/11 06:48:12 lukem Exp $ */ /*- @@ -62,20 +62,12 @@ #ifndef _PTR_T # define _PTR_T -# ifdef __STDC__ typedef void* ptr_t; -# else -typedef char* ptr_t; -# endif #endif #ifndef _IOCTL_T # define _IOCTL_T -# ifdef __STDC__ typedef void* ioctl_t; -# else -typedef char* ioctl_t; -# endif #endif #include <stdio.h> diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index a1b256bcf5e..6b04ad436cd 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $ */ +/* $OpenBSD: kvm.c,v 1.29 2002/02/19 19:39:37 millert Exp $ */ /* $NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; #else -static char *rcsid = "$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $"; +static char *rcsid = "$OpenBSD: kvm.c,v 1.29 2002/02/19 19:39:37 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -69,6 +69,7 @@ static char *rcsid = "$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $"; #include <string.h> #include <unistd.h> #include <kvm.h> +#include <stdarg.h> #include "kvm_private.h" @@ -85,28 +86,13 @@ kvm_geterr(kd) return (kd->errbuf); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - /* * Wrapper around pread. */ ssize_t -#ifdef __STDC__ _kvm_pread(kvm_t *kd, int fd, void *buf, size_t nbytes, off_t offset) -#else -_kvm_pread(kd, fd, buf, nbytes, offset) - kvm_t *kd; - int fd; - void *buf; - size_t nbytes; - off_t offset; -#endif { -ssize_t rval; + ssize_t rval; errno = 0; rval = pread(fd, buf, nbytes, offset); @@ -120,18 +106,9 @@ ssize_t rval; * Wrapper around pwrite. */ ssize_t -#ifdef __STDC__ _kvm_pwrite(kvm_t *kd, int fd, void *buf, size_t nbytes, off_t offset) -#else -_kvm_pwrite(kd, fd, buf, nbytes, offset) - kvm_t *kd; - int fd; - void *buf; - size_t nbytes; - off_t offset; -#endif { -ssize_t rval; + ssize_t rval; errno = 0; rval = pwrite(fd, buf, nbytes, offset); @@ -148,22 +125,11 @@ ssize_t rval; * generate tons of error messages when trying to access bogus pointers). */ void -#ifdef __STDC__ _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_err(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); @@ -176,23 +142,12 @@ _kvm_err(kd, program, fmt, va_alist) } void -#ifdef __STDC__ _kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_syserr(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; register int n; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); diff --git a/lib/libm/noieee_src/mathimpl.h b/lib/libm/noieee_src/mathimpl.h index ac4dc6a438c..6eebb5e3f7b 100644 --- a/lib/libm/noieee_src/mathimpl.h +++ b/lib/libm/noieee_src/mathimpl.h @@ -39,12 +39,8 @@ #if defined(__vax__)||defined(tahoe) -/* Deal with different ways to concatenate in cpp */ -# ifdef __STDC__ -# define cat3(a,b,c) a ## b ## c -# else -# define cat3(a,b,c) a/**/b/**/c -# endif +/* Deal with concatenation in cpp */ +# define cat3(a,b,c) a ## b ## c /* Deal with vax/tahoe byte order issues */ # ifdef __vax__ diff --git a/lib/libm/src/e_acos.c b/lib/libm/src/e_acos.c index 78bdae9f83e..a5301808768 100644 --- a/lib/libm/src/e_acos.c +++ b/lib/libm/src/e_acos.c @@ -41,11 +41,7 @@ static char rcsid[] = "$NetBSD: e_acos.c,v 1.9 1995/05/12 04:57:13 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one= 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pi = 3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */ pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ @@ -61,12 +57,8 @@ qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ -#ifdef __STDC__ - double __ieee754_acos(double x) -#else - double __ieee754_acos(x) - double x; -#endif +double +__ieee754_acos(double x) { double z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/libm/src/e_acosf.c b/lib/libm/src/e_acosf.c index 0d85c4210dc..5407842186c 100644 --- a/lib/libm/src/e_acosf.c +++ b/lib/libm/src/e_acosf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: e_acosf.c,v 1.5 1995/05/12 04:57:16 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0000000000e+00, /* 0x3F800000 */ pi = 3.1415925026e+00, /* 0x40490fda */ pio2_hi = 1.5707962513e+00, /* 0x3fc90fda */ @@ -40,12 +36,8 @@ qS2 = 2.0209457874e+00, /* 0x4001572d */ qS3 = -6.8828397989e-01, /* 0xbf303361 */ qS4 = 7.7038154006e-02; /* 0x3d9dc62e */ -#ifdef __STDC__ - float __ieee754_acosf(float x) -#else - float __ieee754_acosf(x) - float x; -#endif +float +__ieee754_acosf(float x) { float z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/libm/src/e_acosh.c b/lib/libm/src/e_acosh.c index 8383519df20..fbfb65e09d0 100644 --- a/lib/libm/src/e_acosh.c +++ b/lib/libm/src/e_acosh.c @@ -31,20 +31,12 @@ static char rcsid[] = "$NetBSD: e_acosh.c,v 1.9 1995/05/12 04:57:18 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.0, ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ -#ifdef __STDC__ - double __ieee754_acosh(double x) -#else - double __ieee754_acosh(x) - double x; -#endif +double +__ieee754_acosh(double x) { double t; int32_t hx; diff --git a/lib/libm/src/e_acoshf.c b/lib/libm/src/e_acoshf.c index ef37a50bc72..6e3b1e96870 100644 --- a/lib/libm/src/e_acoshf.c +++ b/lib/libm/src/e_acoshf.c @@ -20,20 +20,12 @@ static char rcsid[] = "$NetBSD: e_acoshf.c,v 1.5 1995/05/12 04:57:20 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0, ln2 = 6.9314718246e-01; /* 0x3f317218 */ -#ifdef __STDC__ - float __ieee754_acoshf(float x) -#else - float __ieee754_acoshf(x) - float x; -#endif +float +__ieee754_acoshf(float x) { float t; int32_t hx; diff --git a/lib/libm/src/e_asin.c b/lib/libm/src/e_asin.c index b62a1c9914f..fb908843196 100644 --- a/lib/libm/src/e_asin.c +++ b/lib/libm/src/e_asin.c @@ -48,11 +48,7 @@ static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ huge = 1.000e+300, pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ @@ -70,12 +66,8 @@ qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ -#ifdef __STDC__ - double __ieee754_asin(double x) -#else - double __ieee754_asin(x) - double x; -#endif +double +__ieee754_asin(double x) { double t,w,p,q,c,r,s; int32_t hx,ix; diff --git a/lib/libm/src/e_asinf.c b/lib/libm/src/e_asinf.c index 21157d84e1c..f4e780847ed 100644 --- a/lib/libm/src/e_asinf.c +++ b/lib/libm/src/e_asinf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: e_asinf.c,v 1.5 1995/05/12 04:57:25 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0000000000e+00, /* 0x3F800000 */ huge = 1.000e+30, pio2_hi = 1.5707962513e+00, /* 0x3fc90fda */ @@ -42,12 +38,8 @@ qS2 = 2.0209457874e+00, /* 0x4001572d */ qS3 = -6.8828397989e-01, /* 0xbf303361 */ qS4 = 7.7038154006e-02; /* 0x3d9dc62e */ -#ifdef __STDC__ - float __ieee754_asinf(float x) -#else - float __ieee754_asinf(x) - float x; -#endif +float +__ieee754_asinf(float x) { float t,w,p,q,c,r,s; int32_t hx,ix; diff --git a/lib/libm/src/e_atan2.c b/lib/libm/src/e_atan2.c index 920cfaf286c..dbe95359dd8 100644 --- a/lib/libm/src/e_atan2.c +++ b/lib/libm/src/e_atan2.c @@ -44,11 +44,7 @@ static char rcsid[] = "$NetBSD: e_atan2.c,v 1.8 1995/05/10 20:44:51 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif tiny = 1.0e-300, zero = 0.0, pi_o_4 = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */ @@ -56,12 +52,8 @@ pi_o_2 = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */ pi = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */ pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ -#ifdef __STDC__ - double __ieee754_atan2(double y, double x) -#else - double __ieee754_atan2(y,x) - double y,x; -#endif +double +__ieee754_atan2(double y, double x) { double z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/libm/src/e_atan2f.c b/lib/libm/src/e_atan2f.c index c1f8d224b88..ead3b133972 100644 --- a/lib/libm/src/e_atan2f.c +++ b/lib/libm/src/e_atan2f.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: e_atan2f.c,v 1.4 1995/05/10 20:44:53 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif tiny = 1.0e-30, zero = 0.0, pi_o_4 = 7.8539818525e-01, /* 0x3f490fdb */ @@ -32,12 +28,8 @@ pi_o_2 = 1.5707963705e+00, /* 0x3fc90fdb */ pi = 3.1415925026e+00, /* 0x40490fda */ pi_lo = 1.5099578832e-07; /* 0x34222168 */ -#ifdef __STDC__ - float __ieee754_atan2f(float y, float x) -#else - float __ieee754_atan2f(y,x) - float y,x; -#endif +float +__ieee754_atan2f(float y, float x) { float z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/libm/src/e_atanh.c b/lib/libm/src/e_atanh.c index 559e8f15838..fd9d952b61f 100644 --- a/lib/libm/src/e_atanh.c +++ b/lib/libm/src/e_atanh.c @@ -35,24 +35,11 @@ static char rcsid[] = "$NetBSD: e_atanh.c,v 1.8 1995/05/10 20:44:55 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0, huge = 1e300; -#else -static double one = 1.0, huge = 1e300; -#endif - -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_atanh(double x) -#else - double __ieee754_atanh(x) - double x; -#endif +double +__ieee754_atanh(double x) { double t; int32_t hx,ix; diff --git a/lib/libm/src/e_atanhf.c b/lib/libm/src/e_atanhf.c index 197dc55353b..8d912239224 100644 --- a/lib/libm/src/e_atanhf.c +++ b/lib/libm/src/e_atanhf.c @@ -20,24 +20,11 @@ static char rcsid[] = "$NetBSD: e_atanhf.c,v 1.4 1995/05/10 20:44:56 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one = 1.0, huge = 1e30; -#else -static float one = 1.0, huge = 1e30; -#endif - -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float __ieee754_atanhf(float x) -#else - float __ieee754_atanhf(x) - float x; -#endif +float +__ieee754_atanhf(float x) { float t; int32_t hx,ix; diff --git a/lib/libm/src/e_cosh.c b/lib/libm/src/e_cosh.c index 3f9ed63b4a5..1d4aef70e3b 100644 --- a/lib/libm/src/e_cosh.c +++ b/lib/libm/src/e_cosh.c @@ -38,18 +38,10 @@ static char rcsid[] = "$NetBSD: e_cosh.c,v 1.7 1995/05/10 20:44:58 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0, half=0.5, huge = 1.0e300; -#else -static double one = 1.0, half=0.5, huge = 1.0e300; -#endif -#ifdef __STDC__ - double __ieee754_cosh(double x) -#else - double __ieee754_cosh(x) - double x; -#endif +double +__ieee754_cosh(double x) { double t,w; int32_t ix; diff --git a/lib/libm/src/e_coshf.c b/lib/libm/src/e_coshf.c index 8298b7fa007..ae52f14d7a3 100644 --- a/lib/libm/src/e_coshf.c +++ b/lib/libm/src/e_coshf.c @@ -20,19 +20,11 @@ static char rcsid[] = "$NetBSD: e_coshf.c,v 1.5 1995/05/10 20:45:01 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const volatile float huge = 1.0e30; static const float one = 1.0, half=0.5; -#else -static float one = 1.0, half=0.5, huge = 1.0e30; -#endif -#ifdef __STDC__ - float __ieee754_coshf(float x) -#else - float __ieee754_coshf(x) - float x; -#endif +float +__ieee754_coshf(float x) { float t,w; int32_t ix; diff --git a/lib/libm/src/e_exp.c b/lib/libm/src/e_exp.c index 9eba853c8f7..f9be5ac458b 100644 --- a/lib/libm/src/e_exp.c +++ b/lib/libm/src/e_exp.c @@ -80,11 +80,7 @@ static char rcsid[] = "$NetBSD: e_exp.c,v 1.8 1995/05/10 20:45:03 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.0, halF[2] = {0.5,-0.5,}, huge = 1.0e+300, @@ -103,12 +99,8 @@ P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ -#ifdef __STDC__ - double __ieee754_exp(double x) /* default IEEE double exp */ -#else - double __ieee754_exp(x) /* default IEEE double exp */ - double x; -#endif +double +__ieee754_exp(double x) /* default IEEE double exp */ { double y,hi,lo,c,t; int32_t k,xsb; diff --git a/lib/libm/src/e_expf.c b/lib/libm/src/e_expf.c index 80af17918f3..2457f286bb9 100644 --- a/lib/libm/src/e_expf.c +++ b/lib/libm/src/e_expf.c @@ -22,11 +22,7 @@ static char rcsid[] = "$NetBSD: e_expf.c,v 1.5 1995/05/10 20:45:05 jtc Exp $"; static const volatile float huge = 1.0e+30; -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0, halF[2] = {0.5,-0.5,}, twom100 = 7.8886090522e-31, /* 2**-100=0x0d800000 */ @@ -43,12 +39,8 @@ P3 = 6.6137559770e-05, /* 0x388ab355 */ P4 = -1.6533901999e-06, /* 0xb5ddea0e */ P5 = 4.1381369442e-08; /* 0x3331bb4c */ -#ifdef __STDC__ - float __ieee754_expf(float x) /* default IEEE double exp */ -#else - float __ieee754_expf(x) /* default IEEE double exp */ - float x; -#endif +float +__ieee754_expf(float x) /* default IEEE double exp */ { float y,hi,lo,c,t; int32_t k,xsb; diff --git a/lib/libm/src/e_fmod.c b/lib/libm/src/e_fmod.c index 2ce613574a0..377dee8e569 100644 --- a/lib/libm/src/e_fmod.c +++ b/lib/libm/src/e_fmod.c @@ -23,18 +23,10 @@ static char rcsid[] = "$NetBSD: e_fmod.c,v 1.8 1995/05/10 20:45:07 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0, Zero[] = {0.0, -0.0,}; -#else -static double one = 1.0, Zero[] = {0.0, -0.0,}; -#endif -#ifdef __STDC__ - double __ieee754_fmod(double x, double y) -#else - double __ieee754_fmod(x,y) - double x,y ; -#endif +double +__ieee754_fmod(double x, double y) { int32_t n,hx,hy,hz,ix,iy,sx,i; u_int32_t lx,ly,lz; diff --git a/lib/libm/src/e_fmodf.c b/lib/libm/src/e_fmodf.c index 47b312392c7..5313a0efdf9 100644 --- a/lib/libm/src/e_fmodf.c +++ b/lib/libm/src/e_fmodf.c @@ -26,18 +26,10 @@ static char rcsid[] = "$NetBSD: e_fmodf.c,v 1.4 1995/05/10 20:45:10 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one = 1.0, Zero[] = {0.0, -0.0,}; -#else -static float one = 1.0, Zero[] = {0.0, -0.0,}; -#endif -#ifdef __STDC__ - float __ieee754_fmodf(float x, float y) -#else - float __ieee754_fmodf(x,y) - float x,y ; -#endif +float +__ieee754_fmodf(float x, float y) { int32_t n,hx,hy,hz,ix,iy,sx,i; diff --git a/lib/libm/src/e_hypot.c b/lib/libm/src/e_hypot.c index 24c8ae452f9..1116def0d91 100644 --- a/lib/libm/src/e_hypot.c +++ b/lib/libm/src/e_hypot.c @@ -49,12 +49,8 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double __ieee754_hypot(double x, double y) -#else - double __ieee754_hypot(x,y) - double x, y; -#endif +double +__ieee754_hypot(double x, double y) { double a=x,b=y,t1,t2,y1,y2,w; int32_t j,k,ha,hb; diff --git a/lib/libm/src/e_hypotf.c b/lib/libm/src/e_hypotf.c index 434cf94e8d7..6657493da23 100644 --- a/lib/libm/src/e_hypotf.c +++ b/lib/libm/src/e_hypotf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: e_hypotf.c,v 1.5 1995/05/12 04:57:30 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float __ieee754_hypotf(float x, float y) -#else - float __ieee754_hypot(x,y) - float x, y; -#endif +float +__ieee754_hypotf(float x, float y) { float a=x,b=y,t1,t2,y1,y2,w; int32_t j,k,ha,hb; diff --git a/lib/libm/src/e_j0.c b/lib/libm/src/e_j0.c index 56930c688b2..ace9def2a59 100644 --- a/lib/libm/src/e_j0.c +++ b/lib/libm/src/e_j0.c @@ -62,17 +62,9 @@ static char rcsid[] = "$NetBSD: e_j0.c,v 1.8 1995/05/10 20:45:23 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static double pzero(double), qzero(double); -#else -static double pzero(), qzero(); -#endif -#ifdef __STDC__ static const double -#else -static double -#endif huge = 1e300, one = 1.0, invsqrtpi= 5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */ @@ -87,18 +79,10 @@ S02 = 1.16926784663337450260e-04, /* 0x3F1EA6D2, 0xDD57DBF4 */ S03 = 5.13546550207318111446e-07, /* 0x3EA13B54, 0xCE84D5A9 */ S04 = 1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */ -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_j0(double x) -#else - double __ieee754_j0(x) - double x; -#endif +double +__ieee754_j0(double x) { double z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -145,11 +129,7 @@ static double zero = 0.0; } } -#ifdef __STDC__ static const double -#else -static double -#endif u00 = -7.38042951086872317523e-02, /* 0xBFB2E4D6, 0x99CBD01F */ u01 = 1.76666452509181115538e-01, /* 0x3FC69D01, 0x9DE9E3FC */ u02 = -1.38185671945596898896e-02, /* 0xBF8C4CE8, 0xB16CFA97 */ @@ -162,12 +142,8 @@ v02 = 7.60068627350353253702e-05, /* 0x3F13ECBB, 0xF578C6C1 */ v03 = 2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */ v04 = 4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */ -#ifdef __STDC__ - double __ieee754_y0(double x) -#else - double __ieee754_y0(x) - double x; -#endif +double +__ieee754_y0(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -228,11 +204,7 @@ v04 = 4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */ * and * | pzero(x)-1-R/S | <= 2 ** ( -60.26) */ -#ifdef __STDC__ static const double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ -7.03124999999900357484e-02, /* 0xBFB1FFFF, 0xFFFFFD32 */ -8.08167041275349795626e+00, /* 0xC02029D0, 0xB44FA779 */ @@ -240,11 +212,7 @@ static double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -2.48521641009428822144e+03, /* 0xC0A36A6E, 0xCD4DCAFC */ -5.25304380490729545272e+03, /* 0xC0B4850B, 0x36CC643D */ }; -#ifdef __STDC__ static const double pS8[5] = { -#else -static double pS8[5] = { -#endif 1.16534364619668181717e+02, /* 0x405D2233, 0x07A96751 */ 3.83374475364121826715e+03, /* 0x40ADF37D, 0x50596938 */ 4.05978572648472545552e+04, /* 0x40E3D2BB, 0x6EB6B05F */ @@ -252,11 +220,7 @@ static double pS8[5] = { 4.76277284146730962675e+04, /* 0x40E74177, 0x4F2C49DC */ }; -#ifdef __STDC__ static const double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif -1.14125464691894502584e-11, /* 0xBDA918B1, 0x47E495CC */ -7.03124940873599280078e-02, /* 0xBFB1FFFF, 0xE69AFBC6 */ -4.15961064470587782438e+00, /* 0xC010A370, 0xF90C6BBF */ @@ -264,11 +228,7 @@ static double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -3.31231299649172967747e+02, /* 0xC074B3B3, 0x6742CC63 */ -3.46433388365604912451e+02, /* 0xC075A6EF, 0x28A38BD7 */ }; -#ifdef __STDC__ static const double pS5[5] = { -#else -static double pS5[5] = { -#endif 6.07539382692300335975e+01, /* 0x404E6081, 0x0C98C5DE */ 1.05125230595704579173e+03, /* 0x40906D02, 0x5C7E2864 */ 5.97897094333855784498e+03, /* 0x40B75AF8, 0x8FBE1D60 */ @@ -276,11 +236,7 @@ static double pS5[5] = { 2.40605815922939109441e+03, /* 0x40A2CC1D, 0xC70BE864 */ }; -#ifdef __STDC__ static const double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#else -static double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif -2.54704601771951915620e-09, /* 0xBE25E103, 0x6FE1AA86 */ -7.03119616381481654654e-02, /* 0xBFB1FFF6, 0xF7C0E24B */ -2.40903221549529611423e+00, /* 0xC00345B2, 0xAEA48074 */ @@ -288,11 +244,7 @@ static double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -5.80791704701737572236e+01, /* 0xC04D0A22, 0x420A1A45 */ -3.14479470594888503854e+01, /* 0xC03F72AC, 0xA892D80F */ }; -#ifdef __STDC__ static const double pS3[5] = { -#else -static double pS3[5] = { -#endif 3.58560338055209726349e+01, /* 0x4041ED92, 0x84077DD3 */ 3.61513983050303863820e+02, /* 0x40769839, 0x464A7C0E */ 1.19360783792111533330e+03, /* 0x4092A66E, 0x6D1061D6 */ @@ -300,11 +252,7 @@ static double pS3[5] = { 1.73580930813335754692e+02, /* 0x4065B296, 0xFC379081 */ }; -#ifdef __STDC__ static const double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif -8.87534333032526411254e-08, /* 0xBE77D316, 0xE927026D */ -7.03030995483624743247e-02, /* 0xBFB1FF62, 0x495E1E42 */ -1.45073846780952986357e+00, /* 0xBFF73639, 0x8A24A843 */ @@ -312,11 +260,7 @@ static double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -1.11931668860356747786e+01, /* 0xC02662E6, 0xC5246303 */ -3.23364579351335335033e+00, /* 0xC009DE81, 0xAF8FE70F */ }; -#ifdef __STDC__ static const double pS2[5] = { -#else -static double pS2[5] = { -#endif 2.22202997532088808441e+01, /* 0x40363865, 0x908B5959 */ 1.36206794218215208048e+02, /* 0x4061069E, 0x0EE8878F */ 2.70470278658083486789e+02, /* 0x4070E786, 0x42EA079B */ @@ -324,18 +268,10 @@ static double pS2[5] = { 1.46576176948256193810e+01, /* 0x402D50B3, 0x44391809 */ }; -#ifdef __STDC__ - static double pzero(double x) -#else - static double pzero(x) - double x; -#endif +static +double pzero(double x) { -#ifdef __STDC__ const double *p,*q; -#else - double *p,*q; -#endif double z,r,s; int32_t ix; GET_HIGH_WORD(ix,x); @@ -360,11 +296,7 @@ static double pS2[5] = { * and * | qzero(x)/s +1.25-R/S | <= 2 ** ( -61.22) */ -#ifdef __STDC__ static const double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ 7.32421874999935051953e-02, /* 0x3FB2BFFF, 0xFFFFFE2C */ 1.17682064682252693899e+01, /* 0x40278952, 0x5BB334D6 */ @@ -372,11 +304,7 @@ static double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ 8.85919720756468632317e+03, /* 0x40C14D99, 0x3E18F46D */ 3.70146267776887834771e+04, /* 0x40E212D4, 0x0E901566 */ }; -#ifdef __STDC__ static const double qS8[6] = { -#else -static double qS8[6] = { -#endif 1.63776026895689824414e+02, /* 0x406478D5, 0x365B39BC */ 8.09834494656449805916e+03, /* 0x40BFA258, 0x4E6B0563 */ 1.42538291419120476348e+05, /* 0x41016652, 0x54D38C3F */ @@ -385,11 +313,7 @@ static double qS8[6] = { -3.43899293537866615225e+05, /* 0xC114FD6D, 0x2C9530C5 */ }; -#ifdef __STDC__ static const double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif 1.84085963594515531381e-11, /* 0x3DB43D8F, 0x29CC8CD9 */ 7.32421766612684765896e-02, /* 0x3FB2BFFF, 0xD172B04C */ 5.83563508962056953777e+00, /* 0x401757B0, 0xB9953DD3 */ @@ -397,11 +321,7 @@ static double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ 1.02724376596164097464e+03, /* 0x40900CF9, 0x9DC8C481 */ 1.98997785864605384631e+03, /* 0x409F17E9, 0x53C6E3A6 */ }; -#ifdef __STDC__ static const double qS5[6] = { -#else -static double qS5[6] = { -#endif 8.27766102236537761883e+01, /* 0x4054B1B3, 0xFB5E1543 */ 2.07781416421392987104e+03, /* 0x40A03BA0, 0xDA21C0CE */ 1.88472887785718085070e+04, /* 0x40D267D2, 0x7B591E6D */ @@ -410,11 +330,7 @@ static double qS5[6] = { -5.35434275601944773371e+03, /* 0xC0B4EA57, 0xBEDBC609 */ }; -#ifdef __STDC__ static const double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#else -static double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif 4.37741014089738620906e-09, /* 0x3E32CD03, 0x6ADECB82 */ 7.32411180042911447163e-02, /* 0x3FB2BFEE, 0x0E8D0842 */ 3.34423137516170720929e+00, /* 0x400AC0FC, 0x61149CF5 */ @@ -422,11 +338,7 @@ static double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ 1.70808091340565596283e+02, /* 0x406559DB, 0xE25EFD1F */ 1.66733948696651168575e+02, /* 0x4064D77C, 0x81FA21E0 */ }; -#ifdef __STDC__ static const double qS3[6] = { -#else -static double qS3[6] = { -#endif 4.87588729724587182091e+01, /* 0x40486122, 0xBFE343A6 */ 7.09689221056606015736e+02, /* 0x40862D83, 0x86544EB3 */ 3.70414822620111362994e+03, /* 0x40ACF04B, 0xE44DFC63 */ @@ -435,11 +347,7 @@ static double qS3[6] = { -1.49247451836156386662e+02, /* 0xC062A7EB, 0x201CF40F */ }; -#ifdef __STDC__ static const double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif 1.50444444886983272379e-07, /* 0x3E84313B, 0x54F76BDB */ 7.32234265963079278272e-02, /* 0x3FB2BEC5, 0x3E883E34 */ 1.99819174093815998816e+00, /* 0x3FFFF897, 0xE727779C */ @@ -447,11 +355,7 @@ static double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ 3.16662317504781540833e+01, /* 0x403FAA8E, 0x29FBDC4A */ 1.62527075710929267416e+01, /* 0x403040B1, 0x71814BB4 */ }; -#ifdef __STDC__ static const double qS2[6] = { -#else -static double qS2[6] = { -#endif 3.03655848355219184498e+01, /* 0x403E5D96, 0xF7C07AED */ 2.69348118608049844624e+02, /* 0x4070D591, 0xE4D14B40 */ 8.44783757595320139444e+02, /* 0x408A6645, 0x22B3BF22 */ @@ -460,18 +364,10 @@ static double qS2[6] = { -5.31095493882666946917e+00, /* 0xC0153E6A, 0xF8B32931 */ }; -#ifdef __STDC__ - static double qzero(double x) -#else - static double qzero(x) - double x; -#endif +static +double qzero(double x) { -#ifdef __STDC__ const double *p,*q; -#else - double *p,*q; -#endif double s,r,z; int32_t ix; GET_HIGH_WORD(ix,x); diff --git a/lib/libm/src/e_j0f.c b/lib/libm/src/e_j0f.c index 1067832de57..ee100cdac86 100644 --- a/lib/libm/src/e_j0f.c +++ b/lib/libm/src/e_j0f.c @@ -20,17 +20,9 @@ static char rcsid[] = "$NetBSD: e_j0f.c,v 1.4 1995/05/10 20:45:25 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static float pzerof(float), qzerof(float); -#else -static float pzerof(), qzerof(); -#endif -#ifdef __STDC__ static const float -#else -static float -#endif huge = 1e30, one = 1.0, invsqrtpi= 5.6418961287e-01, /* 0x3f106ebb */ @@ -45,18 +37,10 @@ S02 = 1.1692678527e-04, /* 0x38f53697 */ S03 = 5.1354652442e-07, /* 0x3509daa6 */ S04 = 1.1661400734e-09; /* 0x30a045e8 */ -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float __ieee754_j0f(float x) -#else - float __ieee754_j0f(x) - float x; -#endif +float +__ieee754_j0f(float x) { float z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -103,11 +87,7 @@ static float zero = 0.0; } } -#ifdef __STDC__ static const float -#else -static float -#endif u00 = -7.3804296553e-02, /* 0xbd9726b5 */ u01 = 1.7666645348e-01, /* 0x3e34e80d */ u02 = -1.3818567619e-02, /* 0xbc626746 */ @@ -120,12 +100,8 @@ v02 = 7.6006865129e-05, /* 0x389f65e0 */ v03 = 2.5915085189e-07, /* 0x348b216c */ v04 = 4.4111031494e-10; /* 0x2ff280c2 */ -#ifdef __STDC__ - float __ieee754_y0f(float x) -#else - float __ieee754_y0f(x) - float x; -#endif +float +__ieee754_y0f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -186,11 +162,7 @@ v04 = 4.4111031494e-10; /* 0x2ff280c2 */ * and * | pzero(x)-1-R/S | <= 2 ** ( -60.26) */ -#ifdef __STDC__ static const float pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static float pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.0000000000e+00, /* 0x00000000 */ -7.0312500000e-02, /* 0xbd900000 */ -8.0816707611e+00, /* 0xc1014e86 */ @@ -198,22 +170,14 @@ static float pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -2.4852163086e+03, /* 0xc51b5376 */ -5.2530439453e+03, /* 0xc5a4285a */ }; -#ifdef __STDC__ static const float pS8[5] = { -#else -static float pS8[5] = { -#endif 1.1653436279e+02, /* 0x42e91198 */ 3.8337448730e+03, /* 0x456f9beb */ 4.0597855469e+04, /* 0x471e95db */ 1.1675296875e+05, /* 0x47e4087c */ 4.7627726562e+04, /* 0x473a0bba */ }; -#ifdef __STDC__ static const float pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static float pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif -1.1412546255e-11, /* 0xad48c58a */ -7.0312492549e-02, /* 0xbd8fffff */ -4.1596107483e+00, /* 0xc0851b88 */ @@ -221,11 +185,7 @@ static float pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -3.3123129272e+02, /* 0xc3a59d9b */ -3.4643338013e+02, /* 0xc3ad3779 */ }; -#ifdef __STDC__ static const float pS5[5] = { -#else -static float pS5[5] = { -#endif 6.0753936768e+01, /* 0x42730408 */ 1.0512523193e+03, /* 0x44836813 */ 5.9789707031e+03, /* 0x45bad7c4 */ @@ -233,11 +193,7 @@ static float pS5[5] = { 2.4060581055e+03, /* 0x451660ee */ }; -#ifdef __STDC__ static const float pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#else -static float pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif -2.5470459075e-09, /* 0xb12f081b */ -7.0311963558e-02, /* 0xbd8fffb8 */ -2.4090321064e+00, /* 0xc01a2d95 */ @@ -245,11 +201,7 @@ static float pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -5.8079170227e+01, /* 0xc2685112 */ -3.1447946548e+01, /* 0xc1fb9565 */ }; -#ifdef __STDC__ static const float pS3[5] = { -#else -static float pS3[5] = { -#endif 3.5856033325e+01, /* 0x420f6c94 */ 3.6151397705e+02, /* 0x43b4c1ca */ 1.1936077881e+03, /* 0x44953373 */ @@ -257,11 +209,7 @@ static float pS3[5] = { 1.7358093262e+02, /* 0x432d94b8 */ }; -#ifdef __STDC__ static const float pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static float pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif -8.8753431271e-08, /* 0xb3be98b7 */ -7.0303097367e-02, /* 0xbd8ffb12 */ -1.4507384300e+00, /* 0xbfb9b1cc */ @@ -269,11 +217,7 @@ static float pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -1.1193166733e+01, /* 0xc1331736 */ -3.2336456776e+00, /* 0xc04ef40d */ }; -#ifdef __STDC__ static const float pS2[5] = { -#else -static float pS2[5] = { -#endif 2.2220300674e+01, /* 0x41b1c32d */ 1.3620678711e+02, /* 0x430834f0 */ 2.7047027588e+02, /* 0x43873c32 */ @@ -281,18 +225,10 @@ static float pS2[5] = { 1.4657617569e+01, /* 0x416a859a */ }; -#ifdef __STDC__ - static float pzerof(float x) -#else - static float pzerof(x) - float x; -#endif +static float +pzerof(float x) { -#ifdef __STDC__ const float *p,*q; -#else - float *p,*q; -#endif float z,r,s; int32_t ix; GET_FLOAT_WORD(ix,x); @@ -317,11 +253,7 @@ static float pS2[5] = { * and * | qzero(x)/s +1.25-R/S | <= 2 ** ( -61.22) */ -#ifdef __STDC__ static const float qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static float qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.0000000000e+00, /* 0x00000000 */ 7.3242187500e-02, /* 0x3d960000 */ 1.1768206596e+01, /* 0x413c4a93 */ @@ -329,11 +261,7 @@ static float qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ 8.8591972656e+03, /* 0x460a6cca */ 3.7014625000e+04, /* 0x471096a0 */ }; -#ifdef __STDC__ static const float qS8[6] = { -#else -static float qS8[6] = { -#endif 1.6377603149e+02, /* 0x4323c6aa */ 8.0983447266e+03, /* 0x45fd12c2 */ 1.4253829688e+05, /* 0x480b3293 */ @@ -342,11 +270,7 @@ static float qS8[6] = { -3.4389928125e+05, /* 0xc8a7eb69 */ }; -#ifdef __STDC__ static const float qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static float qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif 1.8408595828e-11, /* 0x2da1ec79 */ 7.3242180049e-02, /* 0x3d95ffff */ 5.8356351852e+00, /* 0x40babd86 */ @@ -354,11 +278,7 @@ static float qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ 1.0272437744e+03, /* 0x448067cd */ 1.9899779053e+03, /* 0x44f8bf4b */ }; -#ifdef __STDC__ static const float qS5[6] = { -#else -static float qS5[6] = { -#endif 8.2776611328e+01, /* 0x42a58da0 */ 2.0778142090e+03, /* 0x4501dd07 */ 1.8847289062e+04, /* 0x46933e94 */ @@ -367,11 +287,7 @@ static float qS5[6] = { -5.3543427734e+03, /* 0xc5a752be */ }; -#ifdef __STDC__ static const float qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#else -static float qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif 4.3774099900e-09, /* 0x3196681b */ 7.3241114616e-02, /* 0x3d95ff70 */ 3.3442313671e+00, /* 0x405607e3 */ @@ -379,11 +295,7 @@ static float qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ 1.7080809021e+02, /* 0x432acedf */ 1.6673394775e+02, /* 0x4326bbe4 */ }; -#ifdef __STDC__ static const float qS3[6] = { -#else -static float qS3[6] = { -#endif 4.8758872986e+01, /* 0x42430916 */ 7.0968920898e+02, /* 0x44316c1c */ 3.7041481934e+03, /* 0x4567825f */ @@ -392,11 +304,7 @@ static float qS3[6] = { -1.4924745178e+02, /* 0xc3153f59 */ }; -#ifdef __STDC__ static const float qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static float qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif 1.5044444979e-07, /* 0x342189db */ 7.3223426938e-02, /* 0x3d95f62a */ 1.9981917143e+00, /* 0x3fffc4bf */ @@ -404,11 +312,7 @@ static float qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ 3.1666231155e+01, /* 0x41fd5471 */ 1.6252708435e+01, /* 0x4182058c */ }; -#ifdef __STDC__ static const float qS2[6] = { -#else -static float qS2[6] = { -#endif 3.0365585327e+01, /* 0x41f2ecb8 */ 2.6934811401e+02, /* 0x4386ac8f */ 8.4478375244e+02, /* 0x44533229 */ @@ -417,18 +321,10 @@ static float qS2[6] = { -5.3109550476e+00, /* 0xc0a9f358 */ }; -#ifdef __STDC__ - static float qzerof(float x) -#else - static float qzerof(x) - float x; -#endif +static float +qzerof(float x) { -#ifdef __STDC__ const float *p,*q; -#else - float *p,*q; -#endif float s,r,z; int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/e_j1.c b/lib/libm/src/e_j1.c index 3e1a3f1f748..372767ad582 100644 --- a/lib/libm/src/e_j1.c +++ b/lib/libm/src/e_j1.c @@ -62,17 +62,9 @@ static char rcsid[] = "$NetBSD: e_j1.c,v 1.8 1995/05/10 20:45:27 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static double pone(double), qone(double); -#else -static double pone(), qone(); -#endif -#ifdef __STDC__ static const double -#else -static double -#endif huge = 1e300, one = 1.0, invsqrtpi= 5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */ @@ -88,18 +80,10 @@ s03 = 1.17718464042623683263e-06, /* 0x3EB3BFF8, 0x333F8498 */ s04 = 5.04636257076217042715e-09, /* 0x3E35AC88, 0xC97DFF2C */ s05 = 1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */ -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_j1(double x) -#else - double __ieee754_j1(x) - double x; -#endif +double +__ieee754_j1(double x) { double z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -140,22 +124,14 @@ static double zero = 0.0; return(x*0.5+r/s); } -#ifdef __STDC__ static const double U0[5] = { -#else -static double U0[5] = { -#endif -1.96057090646238940668e-01, /* 0xBFC91866, 0x143CBC8A */ 5.04438716639811282616e-02, /* 0x3FA9D3C7, 0x76292CD1 */ -1.91256895875763547298e-03, /* 0xBF5F55E5, 0x4844F50F */ 2.35252600561610495928e-05, /* 0x3EF8AB03, 0x8FA6B88E */ -9.19099158039878874504e-08, /* 0xBE78AC00, 0x569105B8 */ }; -#ifdef __STDC__ static const double V0[5] = { -#else -static double V0[5] = { -#endif 1.99167318236649903973e-02, /* 0x3F94650D, 0x3F4DA9F0 */ 2.02552581025135171496e-04, /* 0x3F2A8C89, 0x6C257764 */ 1.35608801097516229404e-06, /* 0x3EB6C05A, 0x894E8CA6 */ @@ -163,12 +139,8 @@ static double V0[5] = { 1.66559246207992079114e-11, /* 0x3DB25039, 0xDACA772A */ }; -#ifdef __STDC__ - double __ieee754_y1(double x) -#else - double __ieee754_y1(x) - double x; -#endif +double +__ieee754_y1(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -226,11 +198,7 @@ static double V0[5] = { * | pone(x)-1-R/S | <= 2 ** ( -60.06) */ -#ifdef __STDC__ static const double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ 1.17187499999988647970e-01, /* 0x3FBDFFFF, 0xFFFFFCCE */ 1.32394806593073575129e+01, /* 0x402A7A9D, 0x357F7FCE */ @@ -238,11 +206,7 @@ static double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ 3.87474538913960532227e+03, /* 0x40AE457D, 0xA3A532CC */ 7.91447954031891731574e+03, /* 0x40BEEA7A, 0xC32782DD */ }; -#ifdef __STDC__ static const double ps8[5] = { -#else -static double ps8[5] = { -#endif 1.14207370375678408436e+02, /* 0x405C8D45, 0x8E656CAC */ 3.65093083420853463394e+03, /* 0x40AC85DC, 0x964D274F */ 3.69562060269033463555e+04, /* 0x40E20B86, 0x97C5BB7F */ @@ -250,11 +214,7 @@ static double ps8[5] = { 3.08042720627888811578e+04, /* 0x40DE1511, 0x697A0B2D */ }; -#ifdef __STDC__ static const double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif 1.31990519556243522749e-11, /* 0x3DAD0667, 0xDAE1CA7D */ 1.17187493190614097638e-01, /* 0x3FBDFFFF, 0xE2C10043 */ 6.80275127868432871736e+00, /* 0x401B3604, 0x6E6315E3 */ @@ -262,11 +222,7 @@ static double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ 5.17636139533199752805e+02, /* 0x40802D16, 0xD052D649 */ 5.28715201363337541807e+02, /* 0x408085B8, 0xBB7E0CB7 */ }; -#ifdef __STDC__ static const double ps5[5] = { -#else -static double ps5[5] = { -#endif 5.92805987221131331921e+01, /* 0x404DA3EA, 0xA8AF633D */ 9.91401418733614377743e+02, /* 0x408EFB36, 0x1B066701 */ 5.35326695291487976647e+03, /* 0x40B4E944, 0x5706B6FB */ @@ -274,11 +230,7 @@ static double ps5[5] = { 1.50404688810361062679e+03, /* 0x40978030, 0x036F5E51 */ }; -#ifdef __STDC__ static const double pr3[6] = { -#else -static double pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif 3.02503916137373618024e-09, /* 0x3E29FC21, 0xA7AD9EDD */ 1.17186865567253592491e-01, /* 0x3FBDFFF5, 0x5B21D17B */ 3.93297750033315640650e+00, /* 0x400F76BC, 0xE85EAD8A */ @@ -286,11 +238,7 @@ static double pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ 9.10550110750781271918e+01, /* 0x4056C385, 0x4D2C1837 */ 4.85590685197364919645e+01, /* 0x4048478F, 0x8EA83EE5 */ }; -#ifdef __STDC__ static const double ps3[5] = { -#else -static double ps3[5] = { -#endif 3.47913095001251519989e+01, /* 0x40416549, 0xA134069C */ 3.36762458747825746741e+02, /* 0x40750C33, 0x07F1A75F */ 1.04687139975775130551e+03, /* 0x40905B7C, 0x5037D523 */ @@ -298,11 +246,7 @@ static double ps3[5] = { 1.03787932439639277504e+02, /* 0x4059F26D, 0x7C2EED53 */ }; -#ifdef __STDC__ static const double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif 1.07710830106873743082e-07, /* 0x3E7CE9D4, 0xF65544F4 */ 1.17176219462683348094e-01, /* 0x3FBDFF42, 0xBE760D83 */ 2.36851496667608785174e+00, /* 0x4002F2B7, 0xF98FAEC0 */ @@ -310,11 +254,7 @@ static double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ 1.76939711271687727390e+01, /* 0x4031B1A8, 0x177F8EE2 */ 5.07352312588818499250e+00, /* 0x40144B49, 0xA574C1FE */ }; -#ifdef __STDC__ static const double ps2[5] = { -#else -static double ps2[5] = { -#endif 2.14364859363821409488e+01, /* 0x40356FBD, 0x8AD5ECDC */ 1.25290227168402751090e+02, /* 0x405F5293, 0x14F92CD5 */ 2.32276469057162813669e+02, /* 0x406D08D8, 0xD5A2DBD9 */ @@ -322,18 +262,10 @@ static double ps2[5] = { 8.36463893371618283368e+00, /* 0x4020BAB1, 0xF44E5192 */ }; -#ifdef __STDC__ - static double pone(double x) -#else - static double pone(x) - double x; -#endif +static double +pone(double x) { -#ifdef __STDC__ const double *p,*q; -#else - double *p,*q; -#endif double z,r,s; int32_t ix; GET_HIGH_WORD(ix,x); @@ -359,11 +291,7 @@ static double ps2[5] = { * | qone(x)/s -0.375-R/S | <= 2 ** ( -61.13) */ -#ifdef __STDC__ static const double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ -1.02539062499992714161e-01, /* 0xBFBA3FFF, 0xFFFFFDF3 */ -1.62717534544589987888e+01, /* 0xC0304591, 0xA26779F7 */ @@ -371,11 +299,7 @@ static double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -1.18498066702429587167e+04, /* 0xC0C724E7, 0x40F87415 */ -4.84385124285750353010e+04, /* 0xC0E7A6D0, 0x65D09C6A */ }; -#ifdef __STDC__ static const double qs8[6] = { -#else -static double qs8[6] = { -#endif 1.61395369700722909556e+02, /* 0x40642CA6, 0xDE5BCDE5 */ 7.82538599923348465381e+03, /* 0x40BE9162, 0xD0D88419 */ 1.33875336287249578163e+05, /* 0x4100579A, 0xB0B75E98 */ @@ -384,11 +308,7 @@ static double qs8[6] = { -2.94490264303834643215e+05, /* 0xC111F969, 0x0EA5AA18 */ }; -#ifdef __STDC__ static const double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif -2.08979931141764104297e-11, /* 0xBDB6FA43, 0x1AA1A098 */ -1.02539050241375426231e-01, /* 0xBFBA3FFF, 0xCB597FEF */ -8.05644828123936029840e+00, /* 0xC0201CE6, 0xCA03AD4B */ @@ -396,11 +316,7 @@ static double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -1.37319376065508163265e+03, /* 0xC09574C6, 0x6931734F */ -2.61244440453215656817e+03, /* 0xC0A468E3, 0x88FDA79D */ }; -#ifdef __STDC__ static const double qs5[6] = { -#else -static double qs5[6] = { -#endif 8.12765501384335777857e+01, /* 0x405451B2, 0xFF5A11B2 */ 1.99179873460485964642e+03, /* 0x409F1F31, 0xE77BF839 */ 1.74684851924908907677e+04, /* 0x40D10F1F, 0x0D64CE29 */ @@ -409,11 +325,7 @@ static double qs5[6] = { -4.71918354795128470869e+03, /* 0xC0B26F2E, 0xFCFFA004 */ }; -#ifdef __STDC__ static const double qr3[6] = { -#else -static double qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif -5.07831226461766561369e-09, /* 0xBE35CFA9, 0xD38FC84F */ -1.02537829820837089745e-01, /* 0xBFBA3FEB, 0x51AEED54 */ -4.61011581139473403113e+00, /* 0xC01270C2, 0x3302D9FF */ @@ -421,11 +333,7 @@ static double qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -2.28244540737631695038e+02, /* 0xC06C87D3, 0x4718D55F */ -2.19210128478909325622e+02, /* 0xC06B66B9, 0x5F5C1BF6 */ }; -#ifdef __STDC__ static const double qs3[6] = { -#else -static double qs3[6] = { -#endif 4.76651550323729509273e+01, /* 0x4047D523, 0xCCD367E4 */ 6.73865112676699709482e+02, /* 0x40850EEB, 0xC031EE3E */ 3.38015286679526343505e+03, /* 0x40AA684E, 0x448E7C9A */ @@ -434,11 +342,7 @@ static double qs3[6] = { -1.35201191444307340817e+02, /* 0xC060E670, 0x290A311F */ }; -#ifdef __STDC__ static const double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif -1.78381727510958865572e-07, /* 0xBE87F126, 0x44C626D2 */ -1.02517042607985553460e-01, /* 0xBFBA3E8E, 0x9148B010 */ -2.75220568278187460720e+00, /* 0xC0060484, 0x69BB4EDA */ @@ -446,11 +350,7 @@ static double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -4.23253133372830490089e+01, /* 0xC04529A3, 0xDE104AAA */ -2.13719211703704061733e+01, /* 0xC0355F36, 0x39CF6E52 */ }; -#ifdef __STDC__ static const double qs2[6] = { -#else -static double qs2[6] = { -#endif 2.95333629060523854548e+01, /* 0x403D888A, 0x78AE64FF */ 2.52981549982190529136e+02, /* 0x406F9F68, 0xDB821CBA */ 7.57502834868645436472e+02, /* 0x4087AC05, 0xCE49A0F7 */ @@ -459,18 +359,10 @@ static double qs2[6] = { -4.95949898822628210127e+00, /* 0xC013D686, 0xE71BE86B */ }; -#ifdef __STDC__ - static double qone(double x) -#else - static double qone(x) - double x; -#endif +static double +qone(double x) { -#ifdef __STDC__ const double *p,*q; -#else - double *p,*q; -#endif double s,r,z; int32_t ix; GET_HIGH_WORD(ix,x); diff --git a/lib/libm/src/e_j1f.c b/lib/libm/src/e_j1f.c index 10975aebb50..b11851d1523 100644 --- a/lib/libm/src/e_j1f.c +++ b/lib/libm/src/e_j1f.c @@ -20,17 +20,9 @@ static char rcsid[] = "$NetBSD: e_j1f.c,v 1.4 1995/05/10 20:45:31 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static float ponef(float), qonef(float); -#else -static float ponef(), qonef(); -#endif -#ifdef __STDC__ static const float -#else -static float -#endif huge = 1e30, one = 1.0, invsqrtpi= 5.6418961287e-01, /* 0x3f106ebb */ @@ -46,18 +38,10 @@ s03 = 1.1771846857e-06, /* 0x359dffc2 */ s04 = 5.0463624390e-09, /* 0x31ad6446 */ s05 = 1.2354227016e-11; /* 0x2d59567e */ -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float __ieee754_j1f(float x) -#else - float __ieee754_j1f(x) - float x; -#endif +float +__ieee754_j1f(float x) { float z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -98,22 +82,14 @@ static float zero = 0.0; return(x*(float)0.5+r/s); } -#ifdef __STDC__ static const float U0[5] = { -#else -static float U0[5] = { -#endif -1.9605709612e-01, /* 0xbe48c331 */ 5.0443872809e-02, /* 0x3d4e9e3c */ -1.9125689287e-03, /* 0xbafaaf2a */ 2.3525259166e-05, /* 0x37c5581c */ -9.1909917899e-08, /* 0xb3c56003 */ }; -#ifdef __STDC__ static const float V0[5] = { -#else -static float V0[5] = { -#endif 1.9916731864e-02, /* 0x3ca3286a */ 2.0255257550e-04, /* 0x3954644b */ 1.3560879779e-06, /* 0x35b602d4 */ @@ -121,12 +97,8 @@ static float V0[5] = { 1.6655924903e-11, /* 0x2d9281cf */ }; -#ifdef __STDC__ - float __ieee754_y1f(float x) -#else - float __ieee754_y1f(x) - float x; -#endif +float +__ieee754_y1f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -184,11 +156,7 @@ static float V0[5] = { * | pone(x)-1-R/S | <= 2 ** ( -60.06) */ -#ifdef __STDC__ static const float pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static float pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.0000000000e+00, /* 0x00000000 */ 1.1718750000e-01, /* 0x3df00000 */ 1.3239480972e+01, /* 0x4153d4ea */ @@ -196,11 +164,7 @@ static float pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ 3.8747453613e+03, /* 0x45722bed */ 7.9144794922e+03, /* 0x45f753d6 */ }; -#ifdef __STDC__ static const float ps8[5] = { -#else -static float ps8[5] = { -#endif 1.1420736694e+02, /* 0x42e46a2c */ 3.6509309082e+03, /* 0x45642ee5 */ 3.6956207031e+04, /* 0x47105c35 */ @@ -208,11 +172,7 @@ static float ps8[5] = { 3.0804271484e+04, /* 0x46f0a88b */ }; -#ifdef __STDC__ static const float pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static float pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif 1.3199052094e-11, /* 0x2d68333f */ 1.1718749255e-01, /* 0x3defffff */ 6.8027510643e+00, /* 0x40d9b023 */ @@ -220,11 +180,7 @@ static float pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ 5.1763616943e+02, /* 0x440168b7 */ 5.2871520996e+02, /* 0x44042dc6 */ }; -#ifdef __STDC__ static const float ps5[5] = { -#else -static float ps5[5] = { -#endif 5.9280597687e+01, /* 0x426d1f55 */ 9.9140142822e+02, /* 0x4477d9b1 */ 5.3532670898e+03, /* 0x45a74a23 */ @@ -232,11 +188,7 @@ static float ps5[5] = { 1.5040468750e+03, /* 0x44bc0180 */ }; -#ifdef __STDC__ static const float pr3[6] = { -#else -static float pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif 3.0250391081e-09, /* 0x314fe10d */ 1.1718686670e-01, /* 0x3defffab */ 3.9329774380e+00, /* 0x407bb5e7 */ @@ -244,11 +196,7 @@ static float pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ 9.1055007935e+01, /* 0x42b61c2a */ 4.8559066772e+01, /* 0x42423c7c */ }; -#ifdef __STDC__ static const float ps3[5] = { -#else -static float ps3[5] = { -#endif 3.4791309357e+01, /* 0x420b2a4d */ 3.3676245117e+02, /* 0x43a86198 */ 1.0468714600e+03, /* 0x4482dbe3 */ @@ -256,11 +204,7 @@ static float ps3[5] = { 1.0378793335e+02, /* 0x42cf936c */ }; -#ifdef __STDC__ static const float pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static float pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif 1.0771083225e-07, /* 0x33e74ea8 */ 1.1717621982e-01, /* 0x3deffa16 */ 2.3685150146e+00, /* 0x401795c0 */ @@ -268,11 +212,7 @@ static float pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ 1.7693971634e+01, /* 0x418d8d41 */ 5.0735230446e+00, /* 0x40a25a4d */ }; -#ifdef __STDC__ static const float ps2[5] = { -#else -static float ps2[5] = { -#endif 2.1436485291e+01, /* 0x41ab7dec */ 1.2529022980e+02, /* 0x42fa9499 */ 2.3227647400e+02, /* 0x436846c7 */ @@ -280,18 +220,10 @@ static float ps2[5] = { 8.3646392822e+00, /* 0x4105d590 */ }; -#ifdef __STDC__ - static float ponef(float x) -#else - static float ponef(x) - float x; -#endif +static float +ponef(float x) { -#ifdef __STDC__ const float *p,*q; -#else - float *p,*q; -#endif float z,r,s; int32_t ix; GET_FLOAT_WORD(ix,x); @@ -317,11 +249,7 @@ static float ps2[5] = { * | qone(x)/s -0.375-R/S | <= 2 ** ( -61.13) */ -#ifdef __STDC__ static const float qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#else -static float qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -#endif 0.0000000000e+00, /* 0x00000000 */ -1.0253906250e-01, /* 0xbdd20000 */ -1.6271753311e+01, /* 0xc1822c8d */ @@ -329,11 +257,7 @@ static float qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */ -1.1849806641e+04, /* 0xc639273a */ -4.8438511719e+04, /* 0xc73d3683 */ }; -#ifdef __STDC__ static const float qs8[6] = { -#else -static float qs8[6] = { -#endif 1.6139537048e+02, /* 0x43216537 */ 7.8253862305e+03, /* 0x45f48b17 */ 1.3387534375e+05, /* 0x4802bcd6 */ @@ -342,11 +266,7 @@ static float qs8[6] = { -2.9449025000e+05, /* 0xc88fcb48 */ }; -#ifdef __STDC__ static const float qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#else -static float qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -#endif -2.0897993405e-11, /* 0xadb7d219 */ -1.0253904760e-01, /* 0xbdd1fffe */ -8.0564479828e+00, /* 0xc100e736 */ @@ -354,11 +274,7 @@ static float qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */ -1.3731937256e+03, /* 0xc4aba633 */ -2.6124443359e+03, /* 0xc523471c */ }; -#ifdef __STDC__ static const float qs5[6] = { -#else -static float qs5[6] = { -#endif 8.1276550293e+01, /* 0x42a28d98 */ 1.9917987061e+03, /* 0x44f8f98f */ 1.7468484375e+04, /* 0x468878f8 */ @@ -367,11 +283,7 @@ static float qs5[6] = { -4.7191835938e+03, /* 0xc5937978 */ }; -#ifdef __STDC__ static const float qr3[6] = { -#else -static float qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -#endif -5.0783124372e-09, /* 0xb1ae7d4f */ -1.0253783315e-01, /* 0xbdd1ff5b */ -4.6101160049e+00, /* 0xc0938612 */ @@ -379,11 +291,7 @@ static float qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */ -2.2824453735e+02, /* 0xc3643e9a */ -2.1921012878e+02, /* 0xc35b35cb */ }; -#ifdef __STDC__ static const float qs3[6] = { -#else -static float qs3[6] = { -#endif 4.7665153503e+01, /* 0x423ea91e */ 6.7386511230e+02, /* 0x4428775e */ 3.3801528320e+03, /* 0x45534272 */ @@ -392,11 +300,7 @@ static float qs3[6] = { -1.3520118713e+02, /* 0xc3073381 */ }; -#ifdef __STDC__ static const float qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#else -static float qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -#endif -1.7838172539e-07, /* 0xb43f8932 */ -1.0251704603e-01, /* 0xbdd1f475 */ -2.7522056103e+00, /* 0xc0302423 */ @@ -404,11 +308,7 @@ static float qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */ -4.2325313568e+01, /* 0xc2294d1f */ -2.1371921539e+01, /* 0xc1aaf9b2 */ }; -#ifdef __STDC__ static const float qs2[6] = { -#else -static float qs2[6] = { -#endif 2.9533363342e+01, /* 0x41ec4454 */ 2.5298155212e+02, /* 0x437cfb47 */ 7.5750280762e+02, /* 0x443d602e */ @@ -417,18 +317,10 @@ static float qs2[6] = { -4.9594988823e+00, /* 0xc09eb437 */ }; -#ifdef __STDC__ - static float qonef(float x) -#else - static float qonef(x) - float x; -#endif +static float +qonef(float x) { -#ifdef __STDC__ const float *p,*q; -#else - float *p,*q; -#endif float s,r,z; int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/e_jn.c b/lib/libm/src/e_jn.c index 27a8a19695c..ada373aa6b4 100644 --- a/lib/libm/src/e_jn.c +++ b/lib/libm/src/e_jn.c @@ -43,27 +43,15 @@ static char rcsid[] = "$NetBSD: e_jn.c,v 1.9 1995/05/10 20:45:34 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif invsqrtpi= 5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */ two = 2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */ one = 1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */ -#ifdef __STDC__ static const double zero = 0.00000000000000000000e+00; -#else -static double zero = 0.00000000000000000000e+00; -#endif -#ifdef __STDC__ - double __ieee754_jn(int n, double x) -#else - double __ieee754_jn(n,x) - int n; double x; -#endif +double +__ieee754_jn(int n, double x) { int32_t i,hx,ix,lx, sgn; double a, b, temp, di; @@ -218,12 +206,8 @@ static double zero = 0.00000000000000000000e+00; if(sgn==1) return -b; else return b; } -#ifdef __STDC__ - double __ieee754_yn(int n, double x) -#else - double __ieee754_yn(n,x) - int n; double x; -#endif +double +__ieee754_yn(int n, double x) { int32_t i,hx,ix,lx; int32_t sign; diff --git a/lib/libm/src/e_jnf.c b/lib/libm/src/e_jnf.c index b9951f6b436..d3e849bd449 100644 --- a/lib/libm/src/e_jnf.c +++ b/lib/libm/src/e_jnf.c @@ -20,27 +20,15 @@ static char rcsid[] = "$NetBSD: e_jnf.c,v 1.5 1995/05/10 20:45:37 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif invsqrtpi= 5.6418961287e-01, /* 0x3f106ebb */ two = 2.0000000000e+00, /* 0x40000000 */ one = 1.0000000000e+00; /* 0x3F800000 */ -#ifdef __STDC__ static const float zero = 0.0000000000e+00; -#else -static float zero = 0.0000000000e+00; -#endif -#ifdef __STDC__ - float __ieee754_jnf(int n, float x) -#else - float __ieee754_jnf(n,x) - int n; float x; -#endif +float +__ieee754_jnf(int n, float x) { int32_t i,hx,ix, sgn; float a, b, temp, di; @@ -172,12 +160,8 @@ static float zero = 0.0000000000e+00; if(sgn==1) return -b; else return b; } -#ifdef __STDC__ - float __ieee754_ynf(int n, float x) -#else - float __ieee754_ynf(n,x) - int n; float x; -#endif +float +__ieee754_ynf(int n, float x) { int32_t i,hx,ix,ib; int32_t sign; diff --git a/lib/libm/src/e_lgamma_r.c b/lib/libm/src/e_lgamma_r.c index 4d9fe0fba50..1da673bc0c4 100644 --- a/lib/libm/src/e_lgamma_r.c +++ b/lib/libm/src/e_lgamma_r.c @@ -84,11 +84,7 @@ static char rcsid[] = "$NetBSD: e_lgamma_r.c,v 1.7 1995/05/10 20:45:42 jtc Exp $ #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif two52= 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ half= 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ @@ -156,18 +152,10 @@ w4 = -5.95187557450339963135e-04, /* 0xBF4380CB, 0x8C0FE741 */ w5 = 8.36339918996282139126e-04, /* 0x3F4B67BA, 0x4CDAD5D1 */ w6 = -1.63092934096575273989e-03; /* 0xBF5AB89D, 0x0B9E43E4 */ -#ifdef __STDC__ static const double zero= 0.00000000000000000000e+00; -#else -static double zero= 0.00000000000000000000e+00; -#endif -#ifdef __STDC__ - static double sin_pi(double x) -#else - static double sin_pi(x) - double x; -#endif +static double +sin_pi(double x) { double y,z; int n,ix; @@ -212,12 +200,8 @@ static double zero= 0.00000000000000000000e+00; } -#ifdef __STDC__ - double __ieee754_lgamma_r(double x, int *signgamp) -#else - double __ieee754_lgamma_r(x,signgamp) - double x; int *signgamp; -#endif +double +__ieee754_lgamma_r(double x, int *signgamp) { double t,y,z,nadj,p,p1,p2,p3,q,r,w; int i,hx,lx,ix; diff --git a/lib/libm/src/e_lgammaf_r.c b/lib/libm/src/e_lgammaf_r.c index 604e77b7bbe..4f67523ecf9 100644 --- a/lib/libm/src/e_lgammaf_r.c +++ b/lib/libm/src/e_lgammaf_r.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: e_lgammaf_r.c,v 1.3 1995/05/10 20:45:47 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif two23= 8.3886080000e+06, /* 0x4b000000 */ half= 5.0000000000e-01, /* 0x3f000000 */ one = 1.0000000000e+00, /* 0x3f800000 */ @@ -92,18 +88,10 @@ w4 = -5.9518753551e-04, /* 0xba1c065c */ w5 = 8.3633989561e-04, /* 0x3a5b3dd2 */ w6 = -1.6309292987e-03; /* 0xbad5c4e8 */ -#ifdef __STDC__ static const float zero= 0.0000000000e+00; -#else -static float zero= 0.0000000000e+00; -#endif -#ifdef __STDC__ - static float sin_pif(float x) -#else - static float sin_pif(x) - float x; -#endif +static float +sin_pif(float x) { float y,z; int n,ix; @@ -148,12 +136,8 @@ static float zero= 0.0000000000e+00; } -#ifdef __STDC__ - float __ieee754_lgammaf_r(float x, int *signgamp) -#else - float __ieee754_lgammaf_r(x,signgamp) - float x; int *signgamp; -#endif +float +__ieee754_lgammaf_r(float x, int *signgamp) { float t,y,z,nadj,p,p1,p2,p3,q,r,w; int i,hx,ix; diff --git a/lib/libm/src/e_log.c b/lib/libm/src/e_log.c index c27e0a9d643..efb74e6cea4 100644 --- a/lib/libm/src/e_log.c +++ b/lib/libm/src/e_log.c @@ -68,11 +68,7 @@ static char rcsid[] = "$NetBSD: e_log.c,v 1.8 1995/05/10 20:45:49 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ @@ -84,18 +80,10 @@ Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_log(double x) -#else - double __ieee754_log(x) - double x; -#endif +double +__ieee754_log(double x) { double hfsq,f,s,z,R,w,t1,t2,dk; int32_t k,hx,i,j; diff --git a/lib/libm/src/e_log10.c b/lib/libm/src/e_log10.c index 5d004ac4e2d..7b2e09969da 100644 --- a/lib/libm/src/e_log10.c +++ b/lib/libm/src/e_log10.c @@ -50,28 +50,16 @@ static char rcsid[] = "$NetBSD: e_log10.c,v 1.9 1995/05/10 20:45:51 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ ivln10 = 4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */ log10_2hi = 3.01029995663611771306e-01, /* 0x3FD34413, 0x509F6000 */ log10_2lo = 3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */ -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_log10(double x) -#else - double __ieee754_log10(x) - double x; -#endif +double +__ieee754_log10(double x) { double y,z; int32_t i,k,hx; diff --git a/lib/libm/src/e_log10f.c b/lib/libm/src/e_log10f.c index 2082a763bb5..b491f166e38 100644 --- a/lib/libm/src/e_log10f.c +++ b/lib/libm/src/e_log10f.c @@ -20,28 +20,16 @@ static char rcsid[] = "$NetBSD: e_log10f.c,v 1.5 1995/05/10 20:45:53 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif two25 = 3.3554432000e+07, /* 0x4c000000 */ ivln10 = 4.3429449201e-01, /* 0x3ede5bd9 */ log10_2hi = 3.0102920532e-01, /* 0x3e9a2080 */ log10_2lo = 7.9034151668e-07; /* 0x355427db */ -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float __ieee754_log10f(float x) -#else - float __ieee754_log10f(x) - float x; -#endif +float +__ieee754_log10f(float x) { float y,z; int32_t i,k,hx; diff --git a/lib/libm/src/e_logf.c b/lib/libm/src/e_logf.c index 1481fd01cb2..60d327a089f 100644 --- a/lib/libm/src/e_logf.c +++ b/lib/libm/src/e_logf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: e_logf.c,v 1.4 1995/05/10 20:45:54 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif ln2_hi = 6.9313812256e-01, /* 0x3f317180 */ ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */ two25 = 3.355443200e+07, /* 0x4c000000 */ @@ -36,18 +32,10 @@ Lg5 = 1.8183572590e-01, /* 3E3A3325 */ Lg6 = 1.5313838422e-01, /* 3E1CD04F */ Lg7 = 1.4798198640e-01; /* 3E178897 */ -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float __ieee754_logf(float x) -#else - float __ieee754_logf(x) - float x; -#endif +float +__ieee754_logf(float x) { float hfsq,f,s,z,R,w,t1,t2,dk; int32_t k,ix,i,j; diff --git a/lib/libm/src/e_pow.c b/lib/libm/src/e_pow.c index 4f6a44f2030..916b4c20be8 100644 --- a/lib/libm/src/e_pow.c +++ b/lib/libm/src/e_pow.c @@ -62,11 +62,7 @@ static char rcsid[] = "$NetBSD: e_pow.c,v 1.9 1995/05/12 04:57:32 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif bp[] = {1.0, 1.5,}, dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ @@ -99,12 +95,8 @@ ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ -#ifdef __STDC__ - double __ieee754_pow(double x, double y) -#else - double __ieee754_pow(x,y) - double x, y; -#endif +double +__ieee754_pow(double x, double y) { double z,ax,z_h,z_l,p_h,p_l; double y1,t1,t2,r,s,t,u,v,w; diff --git a/lib/libm/src/e_powf.c b/lib/libm/src/e_powf.c index 76f044ce762..40659832393 100644 --- a/lib/libm/src/e_powf.c +++ b/lib/libm/src/e_powf.c @@ -22,11 +22,7 @@ static char rcsid[] = "$NetBSD: e_powf.c,v 1.6 1995/05/12 04:57:35 jtc Exp $"; static const volatile float huge = 1.0e+30, tiny = 1.0e-30; -#ifdef __STDC__ static const float -#else -static float -#endif bp[] = {1.0, 1.5,}, dp_h[] = { 0.0, 5.84960938e-01,}, /* 0x3f15c000 */ dp_l[] = { 0.0, 1.56322085e-06,}, /* 0x35d1cfdc */ @@ -57,12 +53,8 @@ ivln2 = 1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */ ivln2_h = 1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/ ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/ -#ifdef __STDC__ - float __ieee754_powf(float x, float y) -#else - float __ieee754_powf(x,y) - float x, y; -#endif +float +__ieee754_powf(float x, float y) { float z,ax,z_h,z_l,p_h,p_l; float y1,t1,t2,r,s,t,u,v,w; diff --git a/lib/libm/src/e_rem_pio2.c b/lib/libm/src/e_rem_pio2.c index a8a8cdb2b21..4de859150c8 100644 --- a/lib/libm/src/e_rem_pio2.c +++ b/lib/libm/src/e_rem_pio2.c @@ -26,11 +26,7 @@ static char rcsid[] = "$NetBSD: e_rem_pio2.c,v 1.8 1995/05/10 20:46:02 jtc Exp $ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi */ -#ifdef __STDC__ static const int32_t two_over_pi[] = { -#else -static int32_t two_over_pi[] = { -#endif 0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, 0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A, 0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, @@ -44,11 +40,7 @@ static int32_t two_over_pi[] = { 0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, }; -#ifdef __STDC__ static const int32_t npio2_hw[] = { -#else -static int32_t npio2_hw[] = { -#endif 0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, 0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C, 0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A, @@ -67,11 +59,7 @@ static int32_t npio2_hw[] = { * pio2_3t: pi/2 - (pio2_1+pio2_2+pio2_3) */ -#ifdef __STDC__ static const double -#else -static double -#endif zero = 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ @@ -83,12 +71,8 @@ pio2_2t = 2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */ pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ -#ifdef __STDC__ - int32_t __ieee754_rem_pio2(double x, double *y) -#else - int32_t __ieee754_rem_pio2(x,y) - double x,y[]; -#endif +int32_t +__ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; double tx[3]; diff --git a/lib/libm/src/e_rem_pio2f.c b/lib/libm/src/e_rem_pio2f.c index e5d50a11b4e..398bdbd166f 100644 --- a/lib/libm/src/e_rem_pio2f.c +++ b/lib/libm/src/e_rem_pio2f.c @@ -29,11 +29,7 @@ static char rcsid[] = "$NetBSD: e_rem_pio2f.c,v 1.5 1995/05/10 20:46:03 jtc Exp /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi */ -#ifdef __STDC__ static const int32_t two_over_pi[] = { -#else -static int32_t two_over_pi[] = { -#endif 0xA2, 0xF9, 0x83, 0x6E, 0x4E, 0x44, 0x15, 0x29, 0xFC, 0x27, 0x57, 0xD1, 0xF5, 0x34, 0xDD, 0xC0, 0xDB, 0x62, 0x95, 0x99, 0x3C, 0x43, 0x90, 0x41, 0xFE, 0x51, 0x63, @@ -60,11 +56,7 @@ static int32_t two_over_pi[] = { /* This array is like the one in e_rem_pio2.c, but the numbers are single precision and the last 8 bits are forced to 0. */ -#ifdef __STDC__ static const int32_t npio2_hw[] = { -#else -static int32_t npio2_hw[] = { -#endif 0x3fc90f00, 0x40490f00, 0x4096cb00, 0x40c90f00, 0x40fb5300, 0x4116cb00, 0x412fed00, 0x41490f00, 0x41623100, 0x417b5300, 0x418a3a00, 0x4196cb00, 0x41a35c00, 0x41afed00, 0x41bc7e00, 0x41c90f00, 0x41d5a000, 0x41e23100, @@ -83,11 +75,7 @@ static int32_t npio2_hw[] = { * pio2_3t: pi/2 - (pio2_1+pio2_2+pio2_3) */ -#ifdef __STDC__ static const float -#else -static float -#endif zero = 0.0000000000e+00, /* 0x00000000 */ half = 5.0000000000e-01, /* 0x3f000000 */ two8 = 2.5600000000e+02, /* 0x43800000 */ @@ -99,12 +87,8 @@ pio2_2t = 6.0770999344e-11, /* 0x2e85a308 */ pio2_3 = 6.0770943833e-11, /* 0x2e85a300 */ pio2_3t = 6.1232342629e-17; /* 0x248d3132 */ -#ifdef __STDC__ - int32_t __ieee754_rem_pio2f(float x, float *y) -#else - int32_t __ieee754_rem_pio2f(x,y) - float x,y[]; -#endif +int32_t +__ieee754_rem_pio2f(float x, float *y) { float z,w,t,r,fn; float tx[3]; diff --git a/lib/libm/src/e_remainder.c b/lib/libm/src/e_remainder.c index 6418081182a..cd67c4410ff 100644 --- a/lib/libm/src/e_remainder.c +++ b/lib/libm/src/e_remainder.c @@ -26,19 +26,11 @@ static char rcsid[] = "$NetBSD: e_remainder.c,v 1.8 1995/05/10 20:46:05 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double __ieee754_remainder(double x, double p) -#else - double __ieee754_remainder(x,p) - double x,p; -#endif +double +__ieee754_remainder(double x, double p) { int32_t hx,hp; u_int32_t sx,lx,lp; diff --git a/lib/libm/src/e_remainderf.c b/lib/libm/src/e_remainderf.c index 90d0d366d40..36ec236732e 100644 --- a/lib/libm/src/e_remainderf.c +++ b/lib/libm/src/e_remainderf.c @@ -20,19 +20,10 @@ static char rcsid[] = "$NetBSD: e_remainderf.c,v 1.4 1995/05/10 20:46:08 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif - -#ifdef __STDC__ - float __ieee754_remainderf(float x, float p) -#else - float __ieee754_remainderf(x,p) - float x,p; -#endif +float +__ieee754_remainderf(float x, float p) { int32_t hx,hp; u_int32_t sx; diff --git a/lib/libm/src/e_scalb.c b/lib/libm/src/e_scalb.c index 7f66ec77374..e51f5447d60 100644 --- a/lib/libm/src/e_scalb.c +++ b/lib/libm/src/e_scalb.c @@ -24,24 +24,17 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $"; #include "math_private.h" #ifdef _SCALB_INT -#ifdef __STDC__ - double __ieee754_scalb(double x, int fn) -#else - double __ieee754_scalb(x,fn) - double x; int fn; -#endif -#else -#ifdef __STDC__ - double __ieee754_scalb(double x, double fn) -#else - double __ieee754_scalb(x,fn) - double x, fn; -#endif -#endif +double +__ieee754_scalb(double x, int fn) { -#ifdef _SCALB_INT - return scalbn(x,fn); + return scalbn(x, fn); +} + #else + +double +__ieee754_scalb(double x, double fn) +{ if (isnan(x)||isnan(fn)) return x*fn; if (!finite(fn)) { if(fn>0.0) return x*fn; @@ -51,5 +44,5 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $"; if ( fn > 65000.0) return scalbn(x, 65000); if (-fn > 65000.0) return scalbn(x,-65000); return scalbn(x,(int)fn); -#endif } +#endif diff --git a/lib/libm/src/e_scalbf.c b/lib/libm/src/e_scalbf.c index 056940dd97b..58587f5d98c 100644 --- a/lib/libm/src/e_scalbf.c +++ b/lib/libm/src/e_scalbf.c @@ -21,24 +21,17 @@ static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $"; #include "math_private.h" #ifdef _SCALB_INT -#ifdef __STDC__ - float __ieee754_scalbf(float x, int fn) -#else - float __ieee754_scalbf(x,fn) - float x; int fn; -#endif -#else -#ifdef __STDC__ - float __ieee754_scalbf(float x, float fn) -#else - float __ieee754_scalbf(x,fn) - float x, fn; -#endif -#endif +float +__ieee754_scalbf(float x, int fn) { -#ifdef _SCALB_INT return scalbnf(x,fn); +} + #else + +float +__ieee754_scalbf(float x, float fn) +{ if (isnanf(x)||isnanf(fn)) return x*fn; if (!finitef(fn)) { if(fn>(float)0.0) return x*fn; @@ -48,5 +41,5 @@ static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $"; if ( fn > (float)65000.0) return scalbnf(x, 65000); if (-fn > (float)65000.0) return scalbnf(x,-65000); return scalbnf(x,(int)fn); -#endif } +#endif diff --git a/lib/libm/src/e_sinh.c b/lib/libm/src/e_sinh.c index 2e5332c11e8..a4d00a0d66b 100644 --- a/lib/libm/src/e_sinh.c +++ b/lib/libm/src/e_sinh.c @@ -35,18 +35,10 @@ static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0, shuge = 1.0e307; -#else -static double one = 1.0, shuge = 1.0e307; -#endif -#ifdef __STDC__ - double __ieee754_sinh(double x) -#else - double __ieee754_sinh(x) - double x; -#endif +double +__ieee754_sinh(double x) { double t,w,h; int32_t ix,jx; diff --git a/lib/libm/src/e_sinhf.c b/lib/libm/src/e_sinhf.c index bac0edb74fe..a4b27c77ff4 100644 --- a/lib/libm/src/e_sinhf.c +++ b/lib/libm/src/e_sinhf.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: e_sinhf.c,v 1.4 1995/05/10 20:46:15 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one = 1.0, shuge = 1.0e37; -#else -static float one = 1.0, shuge = 1.0e37; -#endif -#ifdef __STDC__ - float __ieee754_sinhf(float x) -#else - float __ieee754_sinhf(x) - float x; -#endif +float +__ieee754_sinhf(float x) { float t,w,h; int32_t ix,jx; diff --git a/lib/libm/src/e_sqrt.c b/lib/libm/src/e_sqrt.c index 15fba001d38..4cf344e064a 100644 --- a/lib/libm/src/e_sqrt.c +++ b/lib/libm/src/e_sqrt.c @@ -87,18 +87,10 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0, tiny=1.0e-300; -#else -static double one = 1.0, tiny=1.0e-300; -#endif -#ifdef __STDC__ - double __ieee754_sqrt(double x) -#else - double __ieee754_sqrt(x) - double x; -#endif +double +__ieee754_sqrt(double x) { double z; int32_t sign = (int)0x80000000; diff --git a/lib/libm/src/e_sqrtf.c b/lib/libm/src/e_sqrtf.c index 7648ef4bca2..f886fecc583 100644 --- a/lib/libm/src/e_sqrtf.c +++ b/lib/libm/src/e_sqrtf.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: e_sqrtf.c,v 1.4 1995/05/10 20:46:19 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one = 1.0, tiny=1.0e-30; -#else -static float one = 1.0, tiny=1.0e-30; -#endif -#ifdef __STDC__ - float __ieee754_sqrtf(float x) -#else - float __ieee754_sqrtf(x) - float x; -#endif +float +__ieee754_sqrtf(float x) { float z; int32_t sign = (int)0x80000000; diff --git a/lib/libm/src/k_cos.c b/lib/libm/src/k_cos.c index d8740b3508c..5c7efc77122 100644 --- a/lib/libm/src/k_cos.c +++ b/lib/libm/src/k_cos.c @@ -52,11 +52,7 @@ static char rcsid[] = "$NetBSD: k_cos.c,v 1.8 1995/05/10 20:46:22 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ C1 = 4.16666666666666019037e-02, /* 0x3FA55555, 0x5555554C */ C2 = -1.38888888888741095749e-03, /* 0xBF56C16C, 0x16C15177 */ @@ -65,12 +61,8 @@ C4 = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */ C5 = 2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */ C6 = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */ -#ifdef __STDC__ - double __kernel_cos(double x, double y) -#else - double __kernel_cos(x, y) - double x,y; -#endif +double +__kernel_cos(double x, double y) { double a,hz,z,r,qx; int32_t ix; diff --git a/lib/libm/src/k_cosf.c b/lib/libm/src/k_cosf.c index b232cab11f5..89d16bb5cae 100644 --- a/lib/libm/src/k_cosf.c +++ b/lib/libm/src/k_cosf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: k_cosf.c,v 1.4 1995/05/10 20:46:23 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0000000000e+00, /* 0x3f800000 */ C1 = 4.1666667908e-02, /* 0x3d2aaaab */ C2 = -1.3888889225e-03, /* 0xbab60b61 */ @@ -33,12 +29,8 @@ C4 = -2.7557314297e-07, /* 0xb493f27c */ C5 = 2.0875723372e-09, /* 0x310f74f6 */ C6 = -1.1359647598e-11; /* 0xad47d74e */ -#ifdef __STDC__ - float __kernel_cosf(float x, float y) -#else - float __kernel_cosf(x, y) - float x,y; -#endif +float +__kernel_cosf(float x, float y) { float a,hz,z,r,qx; int32_t ix; diff --git a/lib/libm/src/k_rem_pio2.c b/lib/libm/src/k_rem_pio2.c index 7ff69a4c7c5..2684e9adbeb 100644 --- a/lib/libm/src/k_rem_pio2.c +++ b/lib/libm/src/k_rem_pio2.c @@ -133,17 +133,9 @@ static char rcsid[] = "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $ #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ -#else -static int init_jk[] = {2,3,4,6}; -#endif -#ifdef __STDC__ static const double PIo2[] = { -#else -static double PIo2[] = { -#endif 1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */ 7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */ 5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */ @@ -154,22 +146,15 @@ static double PIo2[] = { 2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */ }; -#ifdef __STDC__ static const double -#else -static double -#endif zero = 0.0, one = 1.0, two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */ -#ifdef __STDC__ - int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int32_t *ipio2) -#else - int __kernel_rem_pio2(x,y,e0,nx,prec,ipio2) - double x[], y[]; int e0,nx,prec; int32_t ipio2[]; -#endif +int +__kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, + const int32_t *ipio2) { int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih; double z,fw,f[20],fq[20],q[20]; diff --git a/lib/libm/src/k_rem_pio2f.c b/lib/libm/src/k_rem_pio2f.c index f65e4700784..43b45e5540e 100644 --- a/lib/libm/src/k_rem_pio2f.c +++ b/lib/libm/src/k_rem_pio2f.c @@ -23,17 +23,9 @@ static char rcsid[] = "$NetBSD: k_rem_pio2f.c,v 1.4 1995/05/10 20:46:28 jtc Exp /* In the float version, the input parameter x contains 8 bit integers, not 24 bit integers. 113 bit precision is not supported. */ -#ifdef __STDC__ static const int init_jk[] = {4,7,9}; /* initial value for jk */ -#else -static int init_jk[] = {4,7,9}; -#endif -#ifdef __STDC__ static const float PIo2[] = { -#else -static float PIo2[] = { -#endif 1.5703125000e+00, /* 0x3fc90000 */ 4.5776367188e-04, /* 0x39f00000 */ 2.5987625122e-05, /* 0x37da0000 */ @@ -47,22 +39,15 @@ static float PIo2[] = { 6.3331015649e-25, /* 0x17440000 */ }; -#ifdef __STDC__ static const float -#else -static float -#endif zero = 0.0, one = 1.0, two8 = 2.5600000000e+02, /* 0x43800000 */ twon8 = 3.9062500000e-03; /* 0x3b800000 */ -#ifdef __STDC__ - int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32_t *ipio2) -#else - int __kernel_rem_pio2f(x,y,e0,nx,prec,ipio2) - float x[], y[]; int e0,nx,prec; int32_t ipio2[]; -#endif +int +__kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, + const int32_t *ipio2) { int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih; float z,fw,f[20],fq[20],q[20]; diff --git a/lib/libm/src/k_sin.c b/lib/libm/src/k_sin.c index 86b95529bc3..d30ae8d0724 100644 --- a/lib/libm/src/k_sin.c +++ b/lib/libm/src/k_sin.c @@ -45,11 +45,7 @@ static char rcsid[] = "$NetBSD: k_sin.c,v 1.8 1995/05/10 20:46:31 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */ S2 = 8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */ @@ -58,12 +54,8 @@ S4 = 2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */ S5 = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */ S6 = 1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */ -#ifdef __STDC__ - double __kernel_sin(double x, double y, int iy) -#else - double __kernel_sin(x, y, iy) - double x,y; int iy; /* iy=0 if y is zero */ -#endif +double +__kernel_sin(double x, double y, int iy) { double z,r,v; int32_t ix; diff --git a/lib/libm/src/k_sinf.c b/lib/libm/src/k_sinf.c index 4fec15e830e..20af7fc9af7 100644 --- a/lib/libm/src/k_sinf.c +++ b/lib/libm/src/k_sinf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: k_sinf.c,v 1.4 1995/05/10 20:46:33 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif half = 5.0000000000e-01,/* 0x3f000000 */ S1 = -1.6666667163e-01, /* 0xbe2aaaab */ S2 = 8.3333337680e-03, /* 0x3c088889 */ @@ -33,12 +29,8 @@ S4 = 2.7557314297e-06, /* 0x3638ef1b */ S5 = -2.5050759689e-08, /* 0xb2d72f34 */ S6 = 1.5896910177e-10; /* 0x2f2ec9d3 */ -#ifdef __STDC__ - float __kernel_sinf(float x, float y, int iy) -#else - float __kernel_sinf(x, y, iy) - float x,y; int iy; /* iy=0 if y is zero */ -#endif +float +__kernel_sinf(float x, float y, int iy) { float z,r,v; int32_t ix; diff --git a/lib/libm/src/k_standard.c b/lib/libm/src/k_standard.c index 0515c5381f2..2ed40b44b87 100644 --- a/lib/libm/src/k_standard.c +++ b/lib/libm/src/k_standard.c @@ -26,11 +26,7 @@ static char rcsid[] = "$NetBSD: k_standard.c,v 1.6 1995/05/10 20:46:35 jtc Exp $ #define WRITE2(u,v) write(2, u, v) #endif /* !defined(_USE_WRITE) */ -#ifdef __STDC__ static const double zero = 0.0; /* used as const */ -#else -static double zero = 0.0; /* used as const */ -#endif /* * Standard conformance (non-IEEE) on exception cases. @@ -80,12 +76,8 @@ static double zero = 0.0; /* used as const */ */ -#ifdef __STDC__ - double __kernel_standard(double x, double y, int type) -#else - double __kernel_standard(x,y,type) - double x,y; int type; -#endif +double +__kernel_standard(double x, double y, int type) { struct exception exc; #ifndef HUGE_VAL /* this is the only routine that uses HUGE_VAL */ diff --git a/lib/libm/src/k_tan.c b/lib/libm/src/k_tan.c index aa9c67c9d0d..91146c2f767 100644 --- a/lib/libm/src/k_tan.c +++ b/lib/libm/src/k_tan.c @@ -50,11 +50,7 @@ static char rcsid[] = "$NetBSD: k_tan.c,v 1.8 1995/05/10 20:46:37 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo= 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ @@ -74,12 +70,8 @@ T[] = { 2.59073051863633712884e-05, /* 0x3EFB2A70, 0x74BF7AD4 */ }; -#ifdef __STDC__ - double __kernel_tan(double x, double y, int iy) -#else - double __kernel_tan(x, y, iy) - double x,y; int iy; -#endif +double +__kernel_tan(double x, double y, int iy) { double z,r,v,w,s; int32_t ix,hx; diff --git a/lib/libm/src/k_tanf.c b/lib/libm/src/k_tanf.c index eb1a670939b..f7ddddf273e 100644 --- a/lib/libm/src/k_tanf.c +++ b/lib/libm/src/k_tanf.c @@ -19,11 +19,8 @@ static char rcsid[] = "$NetBSD: k_tanf.c,v 1.4 1995/05/10 20:46:39 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ + static const float -#else -static float -#endif one = 1.0000000000e+00, /* 0x3f800000 */ pio4 = 7.8539812565e-01, /* 0x3f490fda */ pio4lo= 3.7748947079e-08, /* 0x33222168 */ @@ -43,12 +40,8 @@ T[] = { 2.5907305826e-05, /* 0x37d95384 */ }; -#ifdef __STDC__ - float __kernel_tanf(float x, float y, int iy) -#else - float __kernel_tanf(x, y, iy) - float x,y; int iy; -#endif +float +__kernel_tanf(float x, float y, int iy) { float z,r,v,w,s; int32_t ix,hx; diff --git a/lib/libm/src/s_asinh.c b/lib/libm/src/s_asinh.c index 6cad188caf3..da49239a015 100644 --- a/lib/libm/src/s_asinh.c +++ b/lib/libm/src/s_asinh.c @@ -28,21 +28,13 @@ static char rcsid[] = "$NetBSD: s_asinh.c,v 1.9 1995/05/12 04:57:37 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ ln2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ huge= 1.00000000000000000000e+300; -#ifdef __STDC__ - double asinh(double x) -#else - double asinh(x) - double x; -#endif +double +asinh(double x) { double t,w; int32_t hx,ix; diff --git a/lib/libm/src/s_asinhf.c b/lib/libm/src/s_asinhf.c index 185ed215974..50e60b4d29e 100644 --- a/lib/libm/src/s_asinhf.c +++ b/lib/libm/src/s_asinhf.c @@ -20,21 +20,13 @@ static char rcsid[] = "$NetBSD: s_asinhf.c,v 1.5 1995/05/12 04:57:39 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0000000000e+00, /* 0x3F800000 */ ln2 = 6.9314718246e-01, /* 0x3f317218 */ huge= 1.0000000000e+30; -#ifdef __STDC__ - float asinhf(float x) -#else - float asinhf(x) - float x; -#endif +float +asinhf(float x) { float t,w; int32_t hx,ix; diff --git a/lib/libm/src/s_atan.c b/lib/libm/src/s_atan.c index af4d4927a98..1a88d3225d3 100644 --- a/lib/libm/src/s_atan.c +++ b/lib/libm/src/s_atan.c @@ -37,33 +37,21 @@ static char rcsid[] = "$NetBSD: s_atan.c,v 1.8 1995/05/10 20:46:45 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double atanhi[] = { -#else -static double atanhi[] = { -#endif 4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */ 7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */ 9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */ 1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */ }; -#ifdef __STDC__ static const double atanlo[] = { -#else -static double atanlo[] = { -#endif 2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */ 3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */ 1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */ 6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */ }; -#ifdef __STDC__ static const double aT[] = { -#else -static double aT[] = { -#endif 3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */ -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */ 1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */ @@ -77,20 +65,12 @@ static double aT[] = { 1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */ }; -#ifdef __STDC__ - static const double -#else - static double -#endif +static const double one = 1.0, huge = 1.0e300; -#ifdef __STDC__ - double atan(double x) -#else - double atan(x) - double x; -#endif +double +atan(double x) { double w,s1,s2,z; int32_t ix,hx,id; diff --git a/lib/libm/src/s_atanf.c b/lib/libm/src/s_atanf.c index 8c62cb9058f..5cb5624690e 100644 --- a/lib/libm/src/s_atanf.c +++ b/lib/libm/src/s_atanf.c @@ -20,33 +20,21 @@ static char rcsid[] = "$NetBSD: s_atanf.c,v 1.4 1995/05/10 20:46:47 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float atanhi[] = { -#else -static float atanhi[] = { -#endif 4.6364760399e-01, /* atan(0.5)hi 0x3eed6338 */ 7.8539812565e-01, /* atan(1.0)hi 0x3f490fda */ 9.8279368877e-01, /* atan(1.5)hi 0x3f7b985e */ 1.5707962513e+00, /* atan(inf)hi 0x3fc90fda */ }; -#ifdef __STDC__ static const float atanlo[] = { -#else -static float atanlo[] = { -#endif 5.0121582440e-09, /* atan(0.5)lo 0x31ac3769 */ 3.7748947079e-08, /* atan(1.0)lo 0x33222168 */ 3.4473217170e-08, /* atan(1.5)lo 0x33140fb4 */ 7.5497894159e-08, /* atan(inf)lo 0x33a22168 */ }; -#ifdef __STDC__ static const float aT[] = { -#else -static float aT[] = { -#endif 3.3333334327e-01, /* 0x3eaaaaaa */ -2.0000000298e-01, /* 0xbe4ccccd */ 1.4285714924e-01, /* 0x3e124925 */ @@ -60,20 +48,12 @@ static float aT[] = { 1.6285819933e-02, /* 0x3c8569d7 */ }; -#ifdef __STDC__ - static const float -#else - static float -#endif +static const float one = 1.0, huge = 1.0e30; -#ifdef __STDC__ - float atanf(float x) -#else - float atanf(x) - float x; -#endif +float +atanf(float x) { float w,s1,s2,z; int32_t ix,hx,id; diff --git a/lib/libm/src/s_cbrt.c b/lib/libm/src/s_cbrt.c index ef8e2e20908..2ffd516d512 100644 --- a/lib/libm/src/s_cbrt.c +++ b/lib/libm/src/s_cbrt.c @@ -20,31 +20,19 @@ static char rcsid[] = "$NetBSD: s_cbrt.c,v 1.8 1995/05/10 20:46:49 jtc Exp $"; /* cbrt(x) * Return cube root of x */ -#ifdef __STDC__ static const u_int32_t -#else -static u_int32_t -#endif B1 = 715094163, /* B1 = (682-0.03306235651)*2**20 */ B2 = 696219795; /* B2 = (664-0.03306235651)*2**20 */ -#ifdef __STDC__ static const double -#else -static double -#endif C = 5.42857142857142815906e-01, /* 19/35 = 0x3FE15F15, 0xF15F15F1 */ D = -7.05306122448979611050e-01, /* -864/1225 = 0xBFE691DE, 0x2532C834 */ E = 1.41428571428571436819e+00, /* 99/70 = 0x3FF6A0EA, 0x0EA0EA0F */ F = 1.60714285714285720630e+00, /* 45/28 = 0x3FF9B6DB, 0x6DB6DB6E */ G = 3.57142857142857150787e-01; /* 5/14 = 0x3FD6DB6D, 0xB6DB6DB7 */ -#ifdef __STDC__ - double cbrt(double x) -#else - double cbrt(x) - double x; -#endif +double +cbrt(double x) { int32_t hx; double r,s,t=0.0,w; diff --git a/lib/libm/src/s_cbrtf.c b/lib/libm/src/s_cbrtf.c index c30d76e9132..84fd8e030e1 100644 --- a/lib/libm/src/s_cbrtf.c +++ b/lib/libm/src/s_cbrtf.c @@ -23,31 +23,19 @@ static char rcsid[] = "$NetBSD: s_cbrtf.c,v 1.4 1995/05/10 20:46:51 jtc Exp $"; /* cbrtf(x) * Return cube root of x */ -#ifdef __STDC__ static const unsigned -#else -static unsigned -#endif - B1 = 709958130, /* B1 = (84+2/3-0.03306235651)*2**23 */ - B2 = 642849266; /* B2 = (76+2/3-0.03306235651)*2**23 */ +B1 = 709958130, /* B1 = (84+2/3-0.03306235651)*2**23 */ +B2 = 642849266; /* B2 = (76+2/3-0.03306235651)*2**23 */ -#ifdef __STDC__ static const float -#else -static float -#endif C = 5.4285717010e-01, /* 19/35 = 0x3f0af8b0 */ D = -7.0530611277e-01, /* -864/1225 = 0xbf348ef1 */ E = 1.4142856598e+00, /* 99/70 = 0x3fb50750 */ F = 1.6071428061e+00, /* 45/28 = 0x3fcdb6db */ G = 3.5714286566e-01; /* 5/14 = 0x3eb6db6e */ -#ifdef __STDC__ - float cbrtf(float x) -#else - float cbrtf(x) - float x; -#endif +float +cbrtf(float x) { float r,s,t; int32_t hx; diff --git a/lib/libm/src/s_ceil.c b/lib/libm/src/s_ceil.c index 08fd4075512..07a7bd8069b 100644 --- a/lib/libm/src/s_ceil.c +++ b/lib/libm/src/s_ceil.c @@ -26,18 +26,10 @@ static char rcsid[] = "$NetBSD: s_ceil.c,v 1.8 1995/05/10 20:46:53 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double huge = 1.0e300; -#else -static double huge = 1.0e300; -#endif -#ifdef __STDC__ - double ceil(double x) -#else - double ceil(x) - double x; -#endif +double +ceil(double x) { int32_t i0,i1,j0; u_int32_t i,j; diff --git a/lib/libm/src/s_ceilf.c b/lib/libm/src/s_ceilf.c index 8b6b69c2fed..d956347a4af 100644 --- a/lib/libm/src/s_ceilf.c +++ b/lib/libm/src/s_ceilf.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: s_ceilf.c,v 1.4 1995/05/10 20:46:55 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float huge = 1.0e30; -#else -static float huge = 1.0e30; -#endif -#ifdef __STDC__ - float ceilf(float x) -#else - float ceilf(x) - float x; -#endif +float +ceilf(float x) { int32_t i0,j0; u_int32_t i; diff --git a/lib/libm/src/s_copysign.c b/lib/libm/src/s_copysign.c index 99637d38c4f..ac060dc4977 100644 --- a/lib/libm/src/s_copysign.c +++ b/lib/libm/src/s_copysign.c @@ -23,12 +23,8 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $ #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double copysign(double x, double y) -#else - double copysign(x,y) - double x,y; -#endif +double +copysign(double x, double y) { u_int32_t hx,hy; GET_HIGH_WORD(hx,x); diff --git a/lib/libm/src/s_copysignf.c b/lib/libm/src/s_copysignf.c index 68feb56a006..a26ded4fc10 100644 --- a/lib/libm/src/s_copysignf.c +++ b/lib/libm/src/s_copysignf.c @@ -26,12 +26,8 @@ static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float copysignf(float x, float y) -#else - float copysignf(x,y) - float x,y; -#endif +float +copysignf(float x, float y) { u_int32_t ix,iy; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_cos.c b/lib/libm/src/s_cos.c index dc0c383347e..54bf0e07d39 100644 --- a/lib/libm/src/s_cos.c +++ b/lib/libm/src/s_cos.c @@ -48,12 +48,8 @@ static char rcsid[] = "$NetBSD: s_cos.c,v 1.7 1995/05/10 20:47:02 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double cos(double x) -#else - double cos(x) - double x; -#endif +double +cos(double x) { double y[2],z=0.0; int32_t n, ix; diff --git a/lib/libm/src/s_cosf.c b/lib/libm/src/s_cosf.c index 0b4c0696b42..ea283e74728 100644 --- a/lib/libm/src/s_cosf.c +++ b/lib/libm/src/s_cosf.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one=1.0; -#else -static float one=1.0; -#endif -#ifdef __STDC__ - float cosf(float x) -#else - float cosf(x) - float x; -#endif +float +cosf(float x) { float y[2],z=0.0; int32_t n,ix; diff --git a/lib/libm/src/s_erf.c b/lib/libm/src/s_erf.c index e0bf2a115a7..844e2f5565a 100644 --- a/lib/libm/src/s_erf.c +++ b/lib/libm/src/s_erf.c @@ -112,11 +112,7 @@ static char rcsid[] = "$NetBSD: s_erf.c,v 1.8 1995/05/10 20:47:05 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif tiny = 1e-300, half= 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ @@ -191,12 +187,8 @@ sb5 = 2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */ sb6 = 4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */ sb7 = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */ -#ifdef __STDC__ - double erf(double x) -#else - double erf(x) - double x; -#endif +double +erf(double x) { int32_t hx,ix,i; double R,S,P,Q,s,y,z,r; @@ -247,12 +239,8 @@ sb7 = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */ if(hx>=0) return one-r/x; else return r/x-one; } -#ifdef __STDC__ - double erfc(double x) -#else - double erfc(x) - double x; -#endif +double +erfc(double x) { int32_t hx,ix; double R,S,P,Q,s,y,z,r; diff --git a/lib/libm/src/s_erff.c b/lib/libm/src/s_erff.c index a7d44b4533b..faff192c21e 100644 --- a/lib/libm/src/s_erff.c +++ b/lib/libm/src/s_erff.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: s_erff.c,v 1.4 1995/05/10 20:47:07 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif tiny = 1e-30, half= 5.0000000000e-01, /* 0x3F000000 */ one = 1.0000000000e+00, /* 0x3F800000 */ @@ -99,12 +95,8 @@ sb5 = 2.5530502930e+03, /* 0x451f90ce */ sb6 = 4.7452853394e+02, /* 0x43ed43a7 */ sb7 = -2.2440952301e+01; /* 0xc1b38712 */ -#ifdef __STDC__ - float erff(float x) -#else - float erff(x) - float x; -#endif +float +erff(float x) { int32_t hx,ix,i; float R,S,P,Q,s,y,z,r; @@ -156,12 +148,8 @@ sb7 = -2.2440952301e+01; /* 0xc1b38712 */ if(hx>=0) return one-r/x; else return r/x-one; } -#ifdef __STDC__ - float erfcf(float x) -#else - float erfcf(x) - float x; -#endif +float +erfcf(float x) { int32_t hx,ix; float R,S,P,Q,s,y,z,r; diff --git a/lib/libm/src/s_expm1.c b/lib/libm/src/s_expm1.c index f54fa91f418..b209d4a9e2c 100644 --- a/lib/libm/src/s_expm1.c +++ b/lib/libm/src/s_expm1.c @@ -112,11 +112,7 @@ static char rcsid[] = "$NetBSD: s_expm1.c,v 1.8 1995/05/10 20:47:09 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif one = 1.0, huge = 1.0e+300, tiny = 1.0e-300, @@ -131,12 +127,8 @@ Q3 = -7.93650757867487942473e-05, /* BF14CE19 9EAADBB7 */ Q4 = 4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */ Q5 = -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */ -#ifdef __STDC__ - double expm1(double x) -#else - double expm1(x) - double x; -#endif +double +expm1(double x) { double y,hi,lo,c,t,e,hxs,hfx,r1; int32_t k,xsb; diff --git a/lib/libm/src/s_expm1f.c b/lib/libm/src/s_expm1f.c index ad7cb0c17df..d4a8bb9c42d 100644 --- a/lib/libm/src/s_expm1f.c +++ b/lib/libm/src/s_expm1f.c @@ -22,11 +22,7 @@ static char rcsid[] = "$NetBSD: s_expm1f.c,v 1.5 1995/05/10 20:47:11 jtc Exp $"; static const volatile float huge = 1.0e+30, tiny = 1.0e-30; -#ifdef __STDC__ static const float -#else -static float -#endif one = 1.0, o_threshold = 8.8721679688e+01,/* 0x42b17180 */ ln2_hi = 6.9313812256e-01,/* 0x3f317180 */ @@ -39,12 +35,8 @@ Q3 = -7.9365076090e-05, /* 0xb8a670cd */ Q4 = 4.0082177293e-06, /* 0x36867e54 */ Q5 = -2.0109921195e-07; /* 0xb457edbb */ -#ifdef __STDC__ - float expm1f(float x) -#else - float expm1f(x) - float x; -#endif +float +expm1f(float x) { float y,hi,lo,c,t,e,hxs,hfx,r1; int32_t k,xsb; diff --git a/lib/libm/src/s_fabs.c b/lib/libm/src/s_fabs.c index 351aea14387..c5332e60d2c 100644 --- a/lib/libm/src/s_fabs.c +++ b/lib/libm/src/s_fabs.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double fabs(double x) -#else - double fabs(x) - double x; -#endif +double +fabs(double x) { u_int32_t high; GET_HIGH_WORD(high,x); diff --git a/lib/libm/src/s_fabsf.c b/lib/libm/src/s_fabsf.c index ab544dae0b1..0c1f4397da7 100644 --- a/lib/libm/src/s_fabsf.c +++ b/lib/libm/src/s_fabsf.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: s_fabsf.c,v 1.4 1995/05/10 20:47:15 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float fabsf(float x) -#else - float fabsf(x) - float x; -#endif +float +fabsf(float x) { u_int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_finite.c b/lib/libm/src/s_finite.c index 91711db556f..c0c53b62c1c 100644 --- a/lib/libm/src/s_finite.c +++ b/lib/libm/src/s_finite.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int finite(double x) -#else - int finite(x) - double x; -#endif +int +finite(double x) { int32_t hx; GET_HIGH_WORD(hx,x); diff --git a/lib/libm/src/s_finitef.c b/lib/libm/src/s_finitef.c index 844af3e99eb..8bdeacfef86 100644 --- a/lib/libm/src/s_finitef.c +++ b/lib/libm/src/s_finitef.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: s_finitef.c,v 1.4 1995/05/10 20:47:18 jtc Exp $" #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int finitef(float x) -#else - int finitef(x) - float x; -#endif +int +finitef(float x) { int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_floor.c b/lib/libm/src/s_floor.c index 5a36b2d6fab..fa76291ec77 100644 --- a/lib/libm/src/s_floor.c +++ b/lib/libm/src/s_floor.c @@ -26,18 +26,10 @@ static char rcsid[] = "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double huge = 1.0e300; -#else -static double huge = 1.0e300; -#endif -#ifdef __STDC__ - double floor(double x) -#else - double floor(x) - double x; -#endif +double +floor(double x) { int32_t i0,i1,j0; u_int32_t i,j; diff --git a/lib/libm/src/s_floorf.c b/lib/libm/src/s_floorf.c index 4dc51c31f3b..c1c99e0dc75 100644 --- a/lib/libm/src/s_floorf.c +++ b/lib/libm/src/s_floorf.c @@ -29,18 +29,10 @@ static char rcsid[] = "$NetBSD: s_floorf.c,v 1.4 1995/05/10 20:47:22 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float huge = 1.0e30; -#else -static float huge = 1.0e30; -#endif -#ifdef __STDC__ - float floorf(float x) -#else - float floorf(x) - float x; -#endif +float +floorf(float x) { int32_t i0,j0; u_int32_t i; diff --git a/lib/libm/src/s_frexp.c b/lib/libm/src/s_frexp.c index bfc9dba03c6..3034855d4b3 100644 --- a/lib/libm/src/s_frexp.c +++ b/lib/libm/src/s_frexp.c @@ -27,19 +27,11 @@ static char rcsid[] = "$NetBSD: s_frexp.c,v 1.9 1995/05/10 20:47:24 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif two54 = 1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */ -#ifdef __STDC__ - double frexp(double x, int *eptr) -#else - double frexp(x, eptr) - double x; int *eptr; -#endif +double +frexp(double x, int *eptr) { int32_t hx, ix, lx; EXTRACT_WORDS(hx,lx,x); diff --git a/lib/libm/src/s_frexpf.c b/lib/libm/src/s_frexpf.c index 3d92b68a736..a30a6871e59 100644 --- a/lib/libm/src/s_frexpf.c +++ b/lib/libm/src/s_frexpf.c @@ -20,19 +20,11 @@ static char rcsid[] = "$NetBSD: s_frexpf.c,v 1.5 1995/05/10 20:47:26 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif two25 = 3.3554432000e+07; /* 0x4c000000 */ -#ifdef __STDC__ - float frexpf(float x, int *eptr) -#else - float frexpf(x, eptr) - float x; int *eptr; -#endif +float +frexpf(float x, int *eptr) { int32_t hx,ix; GET_FLOAT_WORD(hx,x); diff --git a/lib/libm/src/s_ilogb.c b/lib/libm/src/s_ilogb.c index ee81570aaba..9c4ce207b0b 100644 --- a/lib/libm/src/s_ilogb.c +++ b/lib/libm/src/s_ilogb.c @@ -23,12 +23,8 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int ilogb(double x) -#else - int ilogb(x) - double x; -#endif +int +ilogb(double x) { int32_t hx,lx,ix; diff --git a/lib/libm/src/s_ilogbf.c b/lib/libm/src/s_ilogbf.c index 554eeb98c01..46603830031 100644 --- a/lib/libm/src/s_ilogbf.c +++ b/lib/libm/src/s_ilogbf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int ilogbf(float x) -#else - int ilogbf(x) - float x; -#endif +int +ilogbf(float x) { int32_t hx,ix; diff --git a/lib/libm/src/s_isinf.c b/lib/libm/src/s_isinf.c index 0814a3ff018..2b939c445d9 100644 --- a/lib/libm/src/s_isinf.c +++ b/lib/libm/src/s_isinf.c @@ -15,12 +15,8 @@ static char rcsid[] = "$NetBSD: s_isinf.c,v 1.3 1995/05/11 23:20:14 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int isinf(double x) -#else - int isinf(x) - double x; -#endif +int +isinf(double x) { int32_t hx,lx; EXTRACT_WORDS(hx,lx,x); diff --git a/lib/libm/src/s_isinff.c b/lib/libm/src/s_isinff.c index 4ff94269740..4200ad04392 100644 --- a/lib/libm/src/s_isinff.c +++ b/lib/libm/src/s_isinff.c @@ -15,12 +15,8 @@ static char rcsid[] = "$NetBSD: s_isinff.c,v 1.3 1995/05/11 23:20:21 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int isinff(float x) -#else - int isinff(x) - float x; -#endif +int +isinff(float x) { int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_isnan.c b/lib/libm/src/s_isnan.c index 5869121d16f..060b0dedc1f 100644 --- a/lib/libm/src/s_isnan.c +++ b/lib/libm/src/s_isnan.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: s_isnan.c,v 1.8 1995/05/10 20:47:36 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int isnan(double x) -#else - int isnan(x) - double x; -#endif +int +isnan(double x) { int32_t hx,lx; EXTRACT_WORDS(hx,lx,x); diff --git a/lib/libm/src/s_isnanf.c b/lib/libm/src/s_isnanf.c index 02e66887267..1083215bac0 100644 --- a/lib/libm/src/s_isnanf.c +++ b/lib/libm/src/s_isnanf.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: s_isnanf.c,v 1.4 1995/05/10 20:47:38 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int isnanf(float x) -#else - int isnanf(x) - float x; -#endif +int +isnanf(float x) { int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_ldexp.c b/lib/libm/src/s_ldexp.c index 085823aea61..aeef0ba9b62 100644 --- a/lib/libm/src/s_ldexp.c +++ b/lib/libm/src/s_ldexp.c @@ -18,12 +18,8 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $"; #include "math_private.h" #include <errno.h> -#ifdef __STDC__ - double ldexp(double value, int exp) -#else - double ldexp(value, exp) - double value; int exp; -#endif +double +ldexp(double value, int exp) { if(!finite(value)||value==0.0) return value; value = scalbn(value,exp); diff --git a/lib/libm/src/s_ldexpf.c b/lib/libm/src/s_ldexpf.c index 60a28e2a5b4..f992c0e7c84 100644 --- a/lib/libm/src/s_ldexpf.c +++ b/lib/libm/src/s_ldexpf.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $"; #include "math_private.h" #include <errno.h> -#ifdef __STDC__ - float ldexpf(float value, int exp) -#else - float ldexpf(value, exp) - float value; int exp; -#endif +float +ldexpf(float value, int exp) { if(!finitef(value)||value==(float)0.0) return value; value = scalbnf(value,exp); diff --git a/lib/libm/src/s_log1p.c b/lib/libm/src/s_log1p.c index 683026b54a9..5596a2dfe37 100644 --- a/lib/libm/src/s_log1p.c +++ b/lib/libm/src/s_log1p.c @@ -82,11 +82,7 @@ static char rcsid[] = "$NetBSD: s_log1p.c,v 1.8 1995/05/10 20:47:46 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ @@ -98,18 +94,10 @@ Lp5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ Lp6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ Lp7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ -#ifdef __STDC__ static const double zero = 0.0; -#else -static double zero = 0.0; -#endif -#ifdef __STDC__ - double log1p(double x) -#else - double log1p(x) - double x; -#endif +double +log1p(double x) { double hfsq,f,c,s,z,R,u; int32_t k,hx,hu,ax; diff --git a/lib/libm/src/s_log1pf.c b/lib/libm/src/s_log1pf.c index fab9b0ad0b5..39fa745ab9a 100644 --- a/lib/libm/src/s_log1pf.c +++ b/lib/libm/src/s_log1pf.c @@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: s_log1pf.c,v 1.4 1995/05/10 20:47:48 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif ln2_hi = 6.9313812256e-01, /* 0x3f317180 */ ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */ two25 = 3.355443200e+07, /* 0x4c000000 */ @@ -36,18 +32,10 @@ Lp5 = 1.8183572590e-01, /* 3E3A3325 */ Lp6 = 1.5313838422e-01, /* 3E1CD04F */ Lp7 = 1.4798198640e-01; /* 3E178897 */ -#ifdef __STDC__ static const float zero = 0.0; -#else -static float zero = 0.0; -#endif -#ifdef __STDC__ - float log1pf(float x) -#else - float log1pf(x) - float x; -#endif +float +log1pf(float x) { float hfsq,f,c,s,z,R,u; int32_t k,hx,hu,ax; diff --git a/lib/libm/src/s_logb.c b/lib/libm/src/s_logb.c index 02bb99f3c3c..f7d4f00a118 100644 --- a/lib/libm/src/s_logb.c +++ b/lib/libm/src/s_logb.c @@ -23,12 +23,8 @@ static char rcsid[] = "$NetBSD: s_logb.c,v 1.8 1995/05/10 20:47:50 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double logb(double x) -#else - double logb(x) - double x; -#endif +double +logb(double x) { int32_t lx,ix; EXTRACT_WORDS(ix,lx,x); diff --git a/lib/libm/src/s_logbf.c b/lib/libm/src/s_logbf.c index b6c5028ae72..4d54f1b16f4 100644 --- a/lib/libm/src/s_logbf.c +++ b/lib/libm/src/s_logbf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_logbf.c,v 1.4 1995/05/10 20:47:51 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float logbf(float x) -#else - float logbf(x) - float x; -#endif +float +logbf(float x) { int32_t ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_matherr.c b/lib/libm/src/s_matherr.c index 11a58af2ba3..9dfa8c7dd85 100644 --- a/lib/libm/src/s_matherr.c +++ b/lib/libm/src/s_matherr.c @@ -17,12 +17,8 @@ static char rcsid[] = "$NetBSD: s_matherr.c,v 1.6 1995/05/10 20:47:53 jtc Exp $" #include "math.h" #include "math_private.h" -#ifdef __STDC__ - int matherr(struct exception *x) -#else - int matherr(x) - struct exception *x; -#endif +int +matherr(struct exception *x) { int n=0; if(x->arg1!=x->arg1) return 0; diff --git a/lib/libm/src/s_modf.c b/lib/libm/src/s_modf.c index 9d71c01d15b..1d5523a8558 100644 --- a/lib/libm/src/s_modf.c +++ b/lib/libm/src/s_modf.c @@ -27,18 +27,10 @@ static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0; -#else -static double one = 1.0; -#endif -#ifdef __STDC__ - double modf(double x, double *iptr) -#else - double modf(x, iptr) - double x,*iptr; -#endif +double +modf(double x, double *iptr) { int32_t i0,i1,j0; u_int32_t i; diff --git a/lib/libm/src/s_modff.c b/lib/libm/src/s_modff.c index 1d8b1cbf00e..1da89b3e515 100644 --- a/lib/libm/src/s_modff.c +++ b/lib/libm/src/s_modff.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: s_modff.c,v 1.4 1995/05/10 20:47:56 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one = 1.0; -#else -static float one = 1.0; -#endif -#ifdef __STDC__ - float modff(float x, float *iptr) -#else - float modff(x, iptr) - float x,*iptr; -#endif +float +modff(float x, float *iptr) { int32_t i0,j0; u_int32_t i; diff --git a/lib/libm/src/s_nextafter.c b/lib/libm/src/s_nextafter.c index 2a9c6f490fa..f597858742c 100644 --- a/lib/libm/src/s_nextafter.c +++ b/lib/libm/src/s_nextafter.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double nextafter(double x, double y) -#else - double nextafter(x,y) - double x,y; -#endif +double +nextafter(double x, double y) { int32_t hx,hy,ix,iy; u_int32_t lx,ly; diff --git a/lib/libm/src/s_nextafterf.c b/lib/libm/src/s_nextafterf.c index dc7afe29ed9..7a9135afb0e 100644 --- a/lib/libm/src/s_nextafterf.c +++ b/lib/libm/src/s_nextafterf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float nextafterf(float x, float y) -#else - float nextafterf(x,y) - float x,y; -#endif +float +nextafterf(float x, float y) { int32_t hx,hy,ix,iy; diff --git a/lib/libm/src/s_rint.c b/lib/libm/src/s_rint.c index 880885759ea..cefa9f22ba4 100644 --- a/lib/libm/src/s_rint.c +++ b/lib/libm/src/s_rint.c @@ -27,22 +27,14 @@ static char rcsid[] = "$NetBSD: s_rint.c,v 1.8 1995/05/10 20:48:04 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif TWO52[2]={ 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ }; -#ifdef __STDC__ - double rint(double x) -#else - double rint(x) - double x; -#endif +double +rint(double x) { int32_t i0,j0,sx; u_int32_t i,i1; diff --git a/lib/libm/src/s_rintf.c b/lib/libm/src/s_rintf.c index 7d88d062bac..c04ce2dcf95 100644 --- a/lib/libm/src/s_rintf.c +++ b/lib/libm/src/s_rintf.c @@ -20,22 +20,14 @@ static char rcsid[] = "$NetBSD: s_rintf.c,v 1.4 1995/05/10 20:48:06 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif TWO23[2]={ 8.3886080000e+06, /* 0x4b000000 */ -8.3886080000e+06, /* 0xcb000000 */ }; -#ifdef __STDC__ - float rintf(float x) -#else - float rintf(x) - float x; -#endif +float +rintf(float x) { int32_t i0,j0,sx; u_int32_t i,i1; diff --git a/lib/libm/src/s_scalbn.c b/lib/libm/src/s_scalbn.c index 6534fd4cfd7..9444f51f0c0 100644 --- a/lib/libm/src/s_scalbn.c +++ b/lib/libm/src/s_scalbn.c @@ -24,22 +24,14 @@ static char rcsid[] = "$NetBSD: s_scalbn.c,v 1.8 1995/05/10 20:48:08 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */ huge = 1.0e+300, tiny = 1.0e-300; -#ifdef __STDC__ - double scalbn (double x, int n) -#else - double scalbn (x,n) - double x; int n; -#endif +double +scalbn (double x, int n) { int32_t k,hx,lx; EXTRACT_WORDS(hx,lx,x); diff --git a/lib/libm/src/s_scalbnf.c b/lib/libm/src/s_scalbnf.c index 35f4d6da5b7..9b64fcad782 100644 --- a/lib/libm/src/s_scalbnf.c +++ b/lib/libm/src/s_scalbnf.c @@ -20,22 +20,14 @@ static char rcsid[] = "$NetBSD: s_scalbnf.c,v 1.4 1995/05/10 20:48:10 jtc Exp $" #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif two25 = 3.355443200e+07, /* 0x4c000000 */ twom25 = 2.9802322388e-08, /* 0x33000000 */ huge = 1.0e+30, tiny = 1.0e-30; -#ifdef __STDC__ - float scalbnf (float x, int n) -#else - float scalbn (x,n) - float x; int n; -#endif +float +scalbnf (float x, int n) { int32_t k,ix; GET_FLOAT_WORD(ix,x); diff --git a/lib/libm/src/s_significand.c b/lib/libm/src/s_significand.c index d56e68d19b8..1751d59e72b 100644 --- a/lib/libm/src/s_significand.c +++ b/lib/libm/src/s_significand.c @@ -23,12 +23,8 @@ static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Ex #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double significand(double x) -#else - double significand(x) - double x; -#endif +double +significand(double x) { return __ieee754_scalb(x,(double) -ilogb(x)); } diff --git a/lib/libm/src/s_significandf.c b/lib/libm/src/s_significandf.c index 13eaf3ba58a..5a7c0965475 100644 --- a/lib/libm/src/s_significandf.c +++ b/lib/libm/src/s_significandf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_significandf.c,v 1.3 1995/05/10 20:48:13 jtc E #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float significandf(float x) -#else - float significandf(x) - float x; -#endif +float +significandf(float x) { return __ieee754_scalbf(x,(float) -ilogbf(x)); } diff --git a/lib/libm/src/s_sin.c b/lib/libm/src/s_sin.c index e732eae44a7..1366556e45a 100644 --- a/lib/libm/src/s_sin.c +++ b/lib/libm/src/s_sin.c @@ -48,12 +48,8 @@ static char rcsid[] = "$NetBSD: s_sin.c,v 1.7 1995/05/10 20:48:15 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double sin(double x) -#else - double sin(x) - double x; -#endif +double +sin(double x) { double y[2],z=0.0; int32_t n, ix; diff --git a/lib/libm/src/s_sinf.c b/lib/libm/src/s_sinf.c index c31625fc43c..8c956c15251 100644 --- a/lib/libm/src/s_sinf.c +++ b/lib/libm/src/s_sinf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_sinf.c,v 1.4 1995/05/10 20:48:16 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float sinf(float x) -#else - float sinf(x) - float x; -#endif +float +sinf(float x) { float y[2],z=0.0; int32_t n, ix; diff --git a/lib/libm/src/s_tan.c b/lib/libm/src/s_tan.c index 7c72bf234e5..2ad099dd535 100644 --- a/lib/libm/src/s_tan.c +++ b/lib/libm/src/s_tan.c @@ -47,12 +47,8 @@ static char rcsid[] = "$NetBSD: s_tan.c,v 1.7 1995/05/10 20:48:18 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double tan(double x) -#else - double tan(x) - double x; -#endif +double +tan(double x) { double y[2],z=0.0; int32_t n, ix; diff --git a/lib/libm/src/s_tanf.c b/lib/libm/src/s_tanf.c index 96bee9f1568..e2b9667f2e5 100644 --- a/lib/libm/src/s_tanf.c +++ b/lib/libm/src/s_tanf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: s_tanf.c,v 1.4 1995/05/10 20:48:20 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float tanf(float x) -#else - float tanf(x) - float x; -#endif +float +tanf(float x) { float y[2],z=0.0; int32_t n, ix; diff --git a/lib/libm/src/s_tanh.c b/lib/libm/src/s_tanh.c index 60e2acfe185..60d2f03d1be 100644 --- a/lib/libm/src/s_tanh.c +++ b/lib/libm/src/s_tanh.c @@ -41,18 +41,10 @@ static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one=1.0, two=2.0, tiny = 1.0e-300; -#else -static double one=1.0, two=2.0, tiny = 1.0e-300; -#endif -#ifdef __STDC__ - double tanh(double x) -#else - double tanh(x) - double x; -#endif +double +tanh(double x) { double t,z; int32_t jx,ix; diff --git a/lib/libm/src/s_tanhf.c b/lib/libm/src/s_tanhf.c index 66a9f83eaf8..fb6eb56c6c3 100644 --- a/lib/libm/src/s_tanhf.c +++ b/lib/libm/src/s_tanhf.c @@ -20,18 +20,10 @@ static char rcsid[] = "$NetBSD: s_tanhf.c,v 1.4 1995/05/10 20:48:24 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float one=1.0, two=2.0, tiny = 1.0e-30; -#else -static float one=1.0, two=2.0, tiny = 1.0e-30; -#endif -#ifdef __STDC__ - float tanhf(float x) -#else - float tanhf(x) - float x; -#endif +float +tanhf(float x) { float t,z; int32_t jx,ix; diff --git a/lib/libm/src/w_acos.c b/lib/libm/src/w_acos.c index c3fe8c191c9..142a6f9c076 100644 --- a/lib/libm/src/w_acos.c +++ b/lib/libm/src/w_acos.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_acos.c,v 1.6 1995/05/10 20:48:26 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double acos(double x) /* wrapper acos */ -#else - double acos(x) /* wrapper acos */ - double x; -#endif +double +acos(double x) /* wrapper acos */ { #ifdef _IEEE_LIBM return __ieee754_acos(x); diff --git a/lib/libm/src/w_acosf.c b/lib/libm/src/w_acosf.c index bb244031727..ee56e6df6e4 100644 --- a/lib/libm/src/w_acosf.c +++ b/lib/libm/src/w_acosf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_acosf.c,v 1.3 1995/05/10 20:48:29 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float acosf(float x) /* wrapper acosf */ -#else - float acosf(x) /* wrapper acosf */ - float x; -#endif +float +acosf(float x) /* wrapper acosf */ { #ifdef _IEEE_LIBM return __ieee754_acosf(x); diff --git a/lib/libm/src/w_acosh.c b/lib/libm/src/w_acosh.c index f05887972f3..545b77bd352 100644 --- a/lib/libm/src/w_acosh.c +++ b/lib/libm/src/w_acosh.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_acosh.c,v 1.6 1995/05/10 20:48:31 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double acosh(double x) /* wrapper acosh */ -#else - double acosh(x) /* wrapper acosh */ - double x; -#endif +double +acosh(double x) /* wrapper acosh */ { #ifdef _IEEE_LIBM return __ieee754_acosh(x); diff --git a/lib/libm/src/w_acoshf.c b/lib/libm/src/w_acoshf.c index 80d411f79c2..62e48b0f15b 100644 --- a/lib/libm/src/w_acoshf.c +++ b/lib/libm/src/w_acoshf.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: w_acoshf.c,v 1.3 1995/05/10 20:48:33 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float acoshf(float x) /* wrapper acoshf */ -#else - float acoshf(x) /* wrapper acoshf */ - float x; -#endif +float +acoshf(float x) /* wrapper acoshf */ { #ifdef _IEEE_LIBM return __ieee754_acoshf(x); diff --git a/lib/libm/src/w_asin.c b/lib/libm/src/w_asin.c index 04e9f78e021..f039e729f16 100644 --- a/lib/libm/src/w_asin.c +++ b/lib/libm/src/w_asin.c @@ -22,13 +22,8 @@ static char rcsid[] = "$NetBSD: w_asin.c,v 1.6 1995/05/10 20:48:35 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double asin(double x) /* wrapper asin */ -#else - double asin(x) /* wrapper asin */ - double x; -#endif +double +asin(double x) /* wrapper asin */ { #ifdef _IEEE_LIBM return __ieee754_asin(x); diff --git a/lib/libm/src/w_asinf.c b/lib/libm/src/w_asinf.c index 054ca3fb256..3d2c94d3c6c 100644 --- a/lib/libm/src/w_asinf.c +++ b/lib/libm/src/w_asinf.c @@ -21,17 +21,11 @@ static char rcsid[] = "$NetBSD: w_asinf.c,v 1.3 1995/05/10 20:48:37 jtc Exp $"; * wrapper asinf(x) */ - #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float asinf(float x) /* wrapper asinf */ -#else - float asinf(x) /* wrapper asinf */ - float x; -#endif +float +asinf(float x) /* wrapper asinf */ { #ifdef _IEEE_LIBM return __ieee754_asinf(x); diff --git a/lib/libm/src/w_atan2.c b/lib/libm/src/w_atan2.c index 9d0b51b6ba3..135836af5b2 100644 --- a/lib/libm/src/w_atan2.c +++ b/lib/libm/src/w_atan2.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_atan2.c,v 1.6 1995/05/10 20:48:39 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double atan2(double y, double x) /* wrapper atan2 */ -#else - double atan2(y,x) /* wrapper atan2 */ - double y,x; -#endif +double +atan2(double y, double x) /* wrapper atan2 */ { #ifdef _IEEE_LIBM return __ieee754_atan2(y,x); diff --git a/lib/libm/src/w_atan2f.c b/lib/libm/src/w_atan2f.c index dfca444b516..a1c9763b0ad 100644 --- a/lib/libm/src/w_atan2f.c +++ b/lib/libm/src/w_atan2f.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_atan2f.c,v 1.3 1995/05/10 20:48:42 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float atan2f(float y, float x) /* wrapper atan2f */ -#else - float atan2f(y,x) /* wrapper atan2 */ - float y,x; -#endif +float +atan2f(float y, float x) /* wrapper atan2f */ { #ifdef _IEEE_LIBM return __ieee754_atan2f(y,x); diff --git a/lib/libm/src/w_atanh.c b/lib/libm/src/w_atanh.c index e0716c2b3a3..29cd574c018 100644 --- a/lib/libm/src/w_atanh.c +++ b/lib/libm/src/w_atanh.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_atanh.c,v 1.6 1995/05/10 20:48:43 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double atanh(double x) /* wrapper atanh */ -#else - double atanh(x) /* wrapper atanh */ - double x; -#endif +double +atanh(double x) /* wrapper atanh */ { #ifdef _IEEE_LIBM return __ieee754_atanh(x); diff --git a/lib/libm/src/w_atanhf.c b/lib/libm/src/w_atanhf.c index 1aadce239e5..f33d64ebe62 100644 --- a/lib/libm/src/w_atanhf.c +++ b/lib/libm/src/w_atanhf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_atanhf.c,v 1.3 1995/05/10 20:48:45 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float atanhf(float x) /* wrapper atanhf */ -#else - float atanhf(x) /* wrapper atanhf */ - float x; -#endif +float +atanhf(float x) /* wrapper atanhf */ { #ifdef _IEEE_LIBM return __ieee754_atanhf(x); diff --git a/lib/libm/src/w_cosh.c b/lib/libm/src/w_cosh.c index 67d15a25a54..4eb375f6ec1 100644 --- a/lib/libm/src/w_cosh.c +++ b/lib/libm/src/w_cosh.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_cosh.c,v 1.6 1995/05/10 20:48:47 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double cosh(double x) /* wrapper cosh */ -#else - double cosh(x) /* wrapper cosh */ - double x; -#endif +double +cosh(double x) /* wrapper cosh */ { #ifdef _IEEE_LIBM return __ieee754_cosh(x); diff --git a/lib/libm/src/w_coshf.c b/lib/libm/src/w_coshf.c index 0a46e5e71f9..df7915d1e72 100644 --- a/lib/libm/src/w_coshf.c +++ b/lib/libm/src/w_coshf.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_coshf.c,v 1.3 1995/05/10 20:48:49 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float coshf(float x) /* wrapper coshf */ -#else - float coshf(x) /* wrapper coshf */ - float x; -#endif +float +coshf(float x) /* wrapper coshf */ { #ifdef _IEEE_LIBM return __ieee754_coshf(x); diff --git a/lib/libm/src/w_exp.c b/lib/libm/src/w_exp.c index 81a6bf702f7..655b438ca96 100644 --- a/lib/libm/src/w_exp.c +++ b/lib/libm/src/w_exp.c @@ -21,20 +21,12 @@ static char rcsid[] = "$NetBSD: w_exp.c,v 1.6 1995/05/10 20:48:51 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double -#else -static double -#endif o_threshold= 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ -#ifdef __STDC__ - double exp(double x) /* wrapper exp */ -#else - double exp(x) /* wrapper exp */ - double x; -#endif +double +exp(double x) /* wrapper exp */ { #ifdef _IEEE_LIBM return __ieee754_exp(x); diff --git a/lib/libm/src/w_expf.c b/lib/libm/src/w_expf.c index c2d22f1d56f..f11948b4e74 100644 --- a/lib/libm/src/w_expf.c +++ b/lib/libm/src/w_expf.c @@ -24,20 +24,12 @@ static char rcsid[] = "$NetBSD: w_expf.c,v 1.3 1995/05/10 20:48:53 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const float -#else -static float -#endif o_threshold= 8.8721679688e+01, /* 0x42b17180 */ u_threshold= -1.0397208405e+02; /* 0xc2cff1b5 */ -#ifdef __STDC__ - float expf(float x) /* wrapper expf */ -#else - float expf(x) /* wrapper expf */ - float x; -#endif +float +expf(float x) /* wrapper expf */ { #ifdef _IEEE_LIBM return __ieee754_expf(x); diff --git a/lib/libm/src/w_fmod.c b/lib/libm/src/w_fmod.c index 67bea8c587e..1f1504c13d5 100644 --- a/lib/libm/src/w_fmod.c +++ b/lib/libm/src/w_fmod.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: w_fmod.c,v 1.6 1995/05/10 20:48:55 jtc Exp $"; #include "math_private.h" -#ifdef __STDC__ - double fmod(double x, double y) /* wrapper fmod */ -#else - double fmod(x,y) /* wrapper fmod */ - double x,y; -#endif +double +fmod(double x, double y) /* wrapper fmod */ { #ifdef _IEEE_LIBM return __ieee754_fmod(x,y); diff --git a/lib/libm/src/w_fmodf.c b/lib/libm/src/w_fmodf.c index 088d3a640f3..c0deb804aba 100644 --- a/lib/libm/src/w_fmodf.c +++ b/lib/libm/src/w_fmodf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_fmodf.c,v 1.3 1995/05/10 20:48:57 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float fmodf(float x, float y) /* wrapper fmodf */ -#else - float fmodf(x,y) /* wrapper fmodf */ - float x,y; -#endif +float +fmodf(float x, float y) /* wrapper fmodf */ { #ifdef _IEEE_LIBM return __ieee754_fmodf(x,y); diff --git a/lib/libm/src/w_gamma.c b/lib/libm/src/w_gamma.c index 59fe8f64009..baa7c711248 100644 --- a/lib/libm/src/w_gamma.c +++ b/lib/libm/src/w_gamma.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $"; extern int signgam; -#ifdef __STDC__ - double gamma(double x) -#else - double gamma(x) - double x; -#endif +double +gamma(double x) { #ifdef _IEEE_LIBM return __ieee754_lgamma_r(x,&signgam); diff --git a/lib/libm/src/w_gamma_r.c b/lib/libm/src/w_gamma_r.c index b0ed3c1b411..8157923f203 100644 --- a/lib/libm/src/w_gamma_r.c +++ b/lib/libm/src/w_gamma_r.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.7 1995/11/20 22:06:45 jtc Exp $" #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double gamma_r(double x, int *signgamp) /* wrapper lgamma_r */ -#else - double gamma_r(x,signgamp) /* wrapper lgamma_r */ - double x; int *signgamp; -#endif +double +gamma_r(double x, int *signgamp) /* wrapper lgamma_r */ { #ifdef _IEEE_LIBM return __ieee754_lgamma_r(x,signgamp); diff --git a/lib/libm/src/w_gammaf.c b/lib/libm/src/w_gammaf.c index ecc2be2d615..cf668d2bf10 100644 --- a/lib/libm/src/w_gammaf.c +++ b/lib/libm/src/w_gammaf.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $"; extern int signgam; -#ifdef __STDC__ - float gammaf(float x) -#else - float gammaf(x) - float x; -#endif +float +gammaf(float x) { #ifdef _IEEE_LIBM return __ieee754_lgammaf_r(x,&signgam); diff --git a/lib/libm/src/w_gammaf_r.c b/lib/libm/src/w_gammaf_r.c index 2425447f4dc..16f4b43b17f 100644 --- a/lib/libm/src/w_gammaf_r.c +++ b/lib/libm/src/w_gammaf_r.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_gammaf_r.c,v 1.4 1995/11/20 22:06:50 jtc Exp $ #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float gammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */ -#else - float gammaf_r(x,signgamp) /* wrapper lgammaf_r */ - float x; int *signgamp; -#endif +float +gammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */ { #ifdef _IEEE_LIBM return __ieee754_lgammaf_r(x,signgamp); diff --git a/lib/libm/src/w_hypot.c b/lib/libm/src/w_hypot.c index 8ff7efaba8d..57bdf938dbe 100644 --- a/lib/libm/src/w_hypot.c +++ b/lib/libm/src/w_hypot.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_hypot.c,v 1.6 1995/05/10 20:49:07 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double hypot(double x, double y)/* wrapper hypot */ -#else - double hypot(x,y) /* wrapper hypot */ - double x,y; -#endif +double +hypot(double x, double y)/* wrapper hypot */ { #ifdef _IEEE_LIBM return __ieee754_hypot(x,y); diff --git a/lib/libm/src/w_hypotf.c b/lib/libm/src/w_hypotf.c index 29092b558a0..d0f83fc7115 100644 --- a/lib/libm/src/w_hypotf.c +++ b/lib/libm/src/w_hypotf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_hypotf.c,v 1.3 1995/05/10 20:49:09 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float hypotf(float x, float y) /* wrapper hypotf */ -#else - float hypotf(x,y) /* wrapper hypotf */ - float x,y; -#endif +float +hypotf(float x, float y) /* wrapper hypotf */ { #ifdef _IEEE_LIBM return __ieee754_hypotf(x,y); diff --git a/lib/libm/src/w_j0.c b/lib/libm/src/w_j0.c index 6899e02f724..6e617427920 100644 --- a/lib/libm/src/w_j0.c +++ b/lib/libm/src/w_j0.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double j0(double x) /* wrapper j0 */ -#else - double j0(x) /* wrapper j0 */ - double x; -#endif +double +j0(double x) /* wrapper j0 */ { #ifdef _IEEE_LIBM return __ieee754_j0(x); @@ -40,12 +36,8 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $"; #endif } -#ifdef __STDC__ - double y0(double x) /* wrapper y0 */ -#else - double y0(x) /* wrapper y0 */ - double x; -#endif +double +y0(double x) /* wrapper y0 */ { #ifdef _IEEE_LIBM return __ieee754_y0(x); diff --git a/lib/libm/src/w_j0f.c b/lib/libm/src/w_j0f.c index a28ef80d9b3..93ec42b366a 100644 --- a/lib/libm/src/w_j0f.c +++ b/lib/libm/src/w_j0f.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_j0f.c,v 1.3 1995/05/10 20:49:13 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float j0f(float x) /* wrapper j0f */ -#else - float j0f(x) /* wrapper j0f */ - float x; -#endif +float +j0f(float x) /* wrapper j0f */ { #ifdef _IEEE_LIBM return __ieee754_j0f(x); @@ -44,12 +40,8 @@ static char rcsid[] = "$NetBSD: w_j0f.c,v 1.3 1995/05/10 20:49:13 jtc Exp $"; #endif } -#ifdef __STDC__ - float y0f(float x) /* wrapper y0f */ -#else - float y0f(x) /* wrapper y0f */ - float x; -#endif +float +y0f(float x) /* wrapper y0f */ { #ifdef _IEEE_LIBM return __ieee754_y0f(x); diff --git a/lib/libm/src/w_j1.c b/lib/libm/src/w_j1.c index 4b90a4cb33d..23ca8befaf6 100644 --- a/lib/libm/src/w_j1.c +++ b/lib/libm/src/w_j1.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double j1(double x) /* wrapper j1 */ -#else - double j1(x) /* wrapper j1 */ - double x; -#endif +double +j1(double x) /* wrapper j1 */ { #ifdef _IEEE_LIBM return __ieee754_j1(x); @@ -41,12 +37,8 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $"; #endif } -#ifdef __STDC__ - double y1(double x) /* wrapper y1 */ -#else - double y1(x) /* wrapper y1 */ - double x; -#endif +double +y1(double x) /* wrapper y1 */ { #ifdef _IEEE_LIBM return __ieee754_y1(x); diff --git a/lib/libm/src/w_j1f.c b/lib/libm/src/w_j1f.c index d36bad12364..770c9ceab61 100644 --- a/lib/libm/src/w_j1f.c +++ b/lib/libm/src/w_j1f.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_j1f.c,v 1.3 1995/05/10 20:49:17 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float j1f(float x) /* wrapper j1f */ -#else - float j1f(x) /* wrapper j1f */ - float x; -#endif +float +j1f(float x) /* wrapper j1f */ { #ifdef _IEEE_LIBM return __ieee754_j1f(x); @@ -45,12 +41,8 @@ static char rcsid[] = "$NetBSD: w_j1f.c,v 1.3 1995/05/10 20:49:17 jtc Exp $"; #endif } -#ifdef __STDC__ - float y1f(float x) /* wrapper y1f */ -#else - float y1f(x) /* wrapper y1f */ - float x; -#endif +float +y1f(float x) /* wrapper y1f */ { #ifdef _IEEE_LIBM return __ieee754_y1f(x); diff --git a/lib/libm/src/w_jn.c b/lib/libm/src/w_jn.c index 20ba79beb1e..2ea879e0bf3 100644 --- a/lib/libm/src/w_jn.c +++ b/lib/libm/src/w_jn.c @@ -43,12 +43,8 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double jn(int n, double x) /* wrapper jn */ -#else - double jn(n,x) /* wrapper jn */ - double x; int n; -#endif +double +jn(int n, double x) /* wrapper jn */ { #ifdef _IEEE_LIBM return __ieee754_jn(n,x); @@ -63,12 +59,8 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $"; #endif } -#ifdef __STDC__ - double yn(int n, double x) /* wrapper yn */ -#else - double yn(n,x) /* wrapper yn */ - double x; int n; -#endif +double +yn(int n, double x) /* wrapper yn */ { #ifdef _IEEE_LIBM return __ieee754_yn(n,x); diff --git a/lib/libm/src/w_jnf.c b/lib/libm/src/w_jnf.c index 03d97eb6bb0..a45f3b878f5 100644 --- a/lib/libm/src/w_jnf.c +++ b/lib/libm/src/w_jnf.c @@ -20,12 +20,8 @@ static char rcsid[] = "$NetBSD: w_jnf.c,v 1.3 1995/05/10 20:49:21 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float jnf(int n, float x) /* wrapper jnf */ -#else - float jnf(n,x) /* wrapper jnf */ - float x; int n; -#endif +float +jnf(int n, float x) /* wrapper jnf */ { #ifdef _IEEE_LIBM return __ieee754_jnf(n,x); @@ -41,12 +37,8 @@ static char rcsid[] = "$NetBSD: w_jnf.c,v 1.3 1995/05/10 20:49:21 jtc Exp $"; #endif } -#ifdef __STDC__ - float ynf(int n, float x) /* wrapper ynf */ -#else - float ynf(n,x) /* wrapper ynf */ - float x; int n; -#endif +float +ynf(int n, float x) /* wrapper ynf */ { #ifdef _IEEE_LIBM return __ieee754_ynf(n,x); diff --git a/lib/libm/src/w_lgamma.c b/lib/libm/src/w_lgamma.c index 3a8d6de4843..055fdb774fa 100644 --- a/lib/libm/src/w_lgamma.c +++ b/lib/libm/src/w_lgamma.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $"; extern int signgam; -#ifdef __STDC__ - double lgamma(double x) -#else - double lgamma(x) - double x; -#endif +double +lgamma(double x) { #ifdef _IEEE_LIBM return __ieee754_lgamma_r(x,&signgam); diff --git a/lib/libm/src/w_lgamma_r.c b/lib/libm/src/w_lgamma_r.c index b73a6425bcf..5e9d69ce239 100644 --- a/lib/libm/src/w_lgamma_r.c +++ b/lib/libm/src/w_lgamma_r.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $ #include "math_private.h" -#ifdef __STDC__ - double lgamma_r(double x, int *signgamp) /* wrapper lgamma_r */ -#else - double lgamma_r(x,signgamp) /* wrapper lgamma_r */ - double x; int *signgamp; -#endif +double +lgamma_r(double x, int *signgamp) /* wrapper lgamma_r */ { #ifdef _IEEE_LIBM return __ieee754_lgamma_r(x,signgamp); diff --git a/lib/libm/src/w_lgammaf.c b/lib/libm/src/w_lgammaf.c index e9fbc720556..0ec7716761f 100644 --- a/lib/libm/src/w_lgammaf.c +++ b/lib/libm/src/w_lgammaf.c @@ -22,12 +22,8 @@ static char rcsid[] = "$NetBSD: w_lgammaf.c,v 1.3 1995/05/10 20:49:30 jtc Exp $" extern int signgam; -#ifdef __STDC__ - float lgammaf(float x) -#else - float lgammaf(x) - float x; -#endif +float +lgammaf(float x) { #ifdef _IEEE_LIBM return __ieee754_lgammaf_r(x,&signgam); diff --git a/lib/libm/src/w_lgammaf_r.c b/lib/libm/src/w_lgammaf_r.c index 2c254be679e..49973d3637d 100644 --- a/lib/libm/src/w_lgammaf_r.c +++ b/lib/libm/src/w_lgammaf_r.c @@ -25,12 +25,8 @@ static char rcsid[] = "$NetBSD: w_lgammaf_r.c,v 1.3 1995/05/10 20:49:32 jtc Exp #include "math_private.h" -#ifdef __STDC__ - float lgammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */ -#else - float lgammaf_r(x,signgamp) /* wrapper lgammaf_r */ - float x; int *signgamp; -#endif +float +lgammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */ { #ifdef _IEEE_LIBM return __ieee754_lgammaf_r(x,signgamp); diff --git a/lib/libm/src/w_log.c b/lib/libm/src/w_log.c index 507c18c6985..b4dcdef1f05 100644 --- a/lib/libm/src/w_log.c +++ b/lib/libm/src/w_log.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_log.c,v 1.6 1995/05/10 20:49:33 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double log(double x) /* wrapper log */ -#else - double log(x) /* wrapper log */ - double x; -#endif +double +log(double x) /* wrapper log */ { #ifdef _IEEE_LIBM return __ieee754_log(x); diff --git a/lib/libm/src/w_log10.c b/lib/libm/src/w_log10.c index 9986ad7b939..f0b4e7c1740 100644 --- a/lib/libm/src/w_log10.c +++ b/lib/libm/src/w_log10.c @@ -21,13 +21,8 @@ static char rcsid[] = "$NetBSD: w_log10.c,v 1.6 1995/05/10 20:49:35 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double log10(double x) /* wrapper log10 */ -#else - double log10(x) /* wrapper log10 */ - double x; -#endif +double +log10(double x) /* wrapper log10 */ { #ifdef _IEEE_LIBM return __ieee754_log10(x); diff --git a/lib/libm/src/w_log10f.c b/lib/libm/src/w_log10f.c index deaefdff851..4907438d820 100644 --- a/lib/libm/src/w_log10f.c +++ b/lib/libm/src/w_log10f.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_log10f.c,v 1.3 1995/05/10 20:49:37 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float log10f(float x) /* wrapper log10f */ -#else - float log10f(x) /* wrapper log10f */ - float x; -#endif +float +log10f(float x) /* wrapper log10f */ { #ifdef _IEEE_LIBM return __ieee754_log10f(x); diff --git a/lib/libm/src/w_logf.c b/lib/libm/src/w_logf.c index 351bf512240..5db12a6beaa 100644 --- a/lib/libm/src/w_logf.c +++ b/lib/libm/src/w_logf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_logf.c,v 1.3 1995/05/10 20:49:40 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float logf(float x) /* wrapper logf */ -#else - float logf(x) /* wrapper logf */ - float x; -#endif +float +logf(float x) /* wrapper logf */ { #ifdef _IEEE_LIBM return __ieee754_logf(x); diff --git a/lib/libm/src/w_pow.c b/lib/libm/src/w_pow.c index 6d87ee558f5..d1bf6374b9c 100644 --- a/lib/libm/src/w_pow.c +++ b/lib/libm/src/w_pow.c @@ -19,13 +19,8 @@ #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - double pow(double x, double y) /* wrapper pow */ -#else - double pow(x,y) /* wrapper pow */ - double x,y; -#endif +double +pow(double x, double y) /* wrapper pow */ { #ifdef _IEEE_LIBM return __ieee754_pow(x,y); diff --git a/lib/libm/src/w_powf.c b/lib/libm/src/w_powf.c index a4602e0a1b9..6d4772a3830 100644 --- a/lib/libm/src/w_powf.c +++ b/lib/libm/src/w_powf.c @@ -24,13 +24,8 @@ static char rcsid[] = "$NetBSD: w_powf.c,v 1.3 1995/05/10 20:49:41 jtc Exp $"; #include "math.h" #include "math_private.h" - -#ifdef __STDC__ - float powf(float x, float y) /* wrapper powf */ -#else - float powf(x,y) /* wrapper powf */ - float x,y; -#endif +float +powf(float x, float y) /* wrapper powf */ { #ifdef _IEEE_LIBM return __ieee754_powf(x,y); diff --git a/lib/libm/src/w_remainder.c b/lib/libm/src/w_remainder.c index 33b80d8a68e..50a41e77c4b 100644 --- a/lib/libm/src/w_remainder.c +++ b/lib/libm/src/w_remainder.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_remainder.c,v 1.6 1995/05/10 20:49:44 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double remainder(double x, double y) /* wrapper remainder */ -#else - double remainder(x,y) /* wrapper remainder */ - double x,y; -#endif +double +remainder(double x, double y) /* wrapper remainder */ { #ifdef _IEEE_LIBM return __ieee754_remainder(x,y); diff --git a/lib/libm/src/w_remainderf.c b/lib/libm/src/w_remainderf.c index c0758c6cd11..0339c546a94 100644 --- a/lib/libm/src/w_remainderf.c +++ b/lib/libm/src/w_remainderf.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_remainderf.c,v 1.3 1995/05/10 20:49:46 jtc Exp #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float remainderf(float x, float y) /* wrapper remainder */ -#else - float remainderf(x,y) /* wrapper remainder */ - float x,y; -#endif +float +remainderf(float x, float y) /* wrapper remainder */ { #ifdef _IEEE_LIBM return __ieee754_remainderf(x,y); diff --git a/lib/libm/src/w_scalb.c b/lib/libm/src/w_scalb.c index 50026bed9ff..d956ab75ee8 100644 --- a/lib/libm/src/w_scalb.c +++ b/lib/libm/src/w_scalb.c @@ -25,19 +25,11 @@ static char rcsid[] = "$NetBSD: w_scalb.c,v 1.6 1995/05/10 20:49:48 jtc Exp $"; #include <errno.h> -#ifdef __STDC__ +double #ifdef _SCALB_INT - double scalb(double x, int fn) /* wrapper scalb */ +scalb(double x, int fn) /* wrapper scalb */ #else - double scalb(double x, double fn) /* wrapper scalb */ -#endif -#else - double scalb(x,fn) /* wrapper scalb */ -#ifdef _SCALB_INT - double x; int fn; -#else - double x,fn; -#endif +scalb(double x, double fn) /* wrapper scalb */ #endif { #ifdef _IEEE_LIBM diff --git a/lib/libm/src/w_scalbf.c b/lib/libm/src/w_scalbf.c index c8170defb73..651296b82c6 100644 --- a/lib/libm/src/w_scalbf.c +++ b/lib/libm/src/w_scalbf.c @@ -28,19 +28,11 @@ static char rcsid[] = "$NetBSD: w_scalbf.c,v 1.3 1995/05/10 20:49:50 jtc Exp $"; #include <errno.h> -#ifdef __STDC__ +float #ifdef _SCALB_INT - float scalbf(float x, int fn) /* wrapper scalbf */ +scalbf(float x, int fn) /* wrapper scalbf */ #else - float scalbf(float x, float fn) /* wrapper scalbf */ -#endif -#else - float scalbf(x,fn) /* wrapper scalbf */ -#ifdef _SCALB_INT - float x; int fn; -#else - float x,fn; -#endif +scalbf(float x, float fn) /* wrapper scalbf */ #endif { #ifdef _IEEE_LIBM diff --git a/lib/libm/src/w_sinh.c b/lib/libm/src/w_sinh.c index 7abd682ebbf..c02a0ae0531 100644 --- a/lib/libm/src/w_sinh.c +++ b/lib/libm/src/w_sinh.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_sinh.c,v 1.6 1995/05/10 20:49:51 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double sinh(double x) /* wrapper sinh */ -#else - double sinh(x) /* wrapper sinh */ - double x; -#endif +double +sinh(double x) /* wrapper sinh */ { #ifdef _IEEE_LIBM return __ieee754_sinh(x); diff --git a/lib/libm/src/w_sinhf.c b/lib/libm/src/w_sinhf.c index 62466b5ccdf..58df8cd515a 100644 --- a/lib/libm/src/w_sinhf.c +++ b/lib/libm/src/w_sinhf.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_sinhf.c,v 1.3 1995/05/10 20:49:54 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float sinhf(float x) /* wrapper sinhf */ -#else - float sinhf(x) /* wrapper sinhf */ - float x; -#endif +float +sinhf(float x) /* wrapper sinhf */ { #ifdef _IEEE_LIBM return __ieee754_sinhf(x); diff --git a/lib/libm/src/w_sqrt.c b/lib/libm/src/w_sqrt.c index d77e5a10936..fec804b282c 100644 --- a/lib/libm/src/w_sqrt.c +++ b/lib/libm/src/w_sqrt.c @@ -21,12 +21,8 @@ static char rcsid[] = "$NetBSD: w_sqrt.c,v 1.6 1995/05/10 20:49:55 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - double sqrt(double x) /* wrapper sqrt */ -#else - double sqrt(x) /* wrapper sqrt */ - double x; -#endif +double +sqrt(double x) /* wrapper sqrt */ { #ifdef _IEEE_LIBM return __ieee754_sqrt(x); diff --git a/lib/libm/src/w_sqrtf.c b/lib/libm/src/w_sqrtf.c index 6c93616143f..fb21a63529c 100644 --- a/lib/libm/src/w_sqrtf.c +++ b/lib/libm/src/w_sqrtf.c @@ -24,12 +24,8 @@ static char rcsid[] = "$NetBSD: w_sqrtf.c,v 1.3 1995/05/10 20:49:59 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ - float sqrtf(float x) /* wrapper sqrtf */ -#else - float sqrt(x) /* wrapper sqrtf */ - float x; -#endif +float +sqrtf(float x) /* wrapper sqrtf */ { #ifdef _IEEE_LIBM return __ieee754_sqrtf(x); diff --git a/lib/libocurses/ctrace.c b/lib/libocurses/ctrace.c index 5f659454f95..5fa63c398ac 100644 --- a/lib/libocurses/ctrace.c +++ b/lib/libocurses/ctrace.c @@ -37,12 +37,7 @@ static char sccsid[] = "@(#)ctrace.c 8.2 (Berkeley) 10/5/93"; #ifdef DEBUG #include <stdio.h> - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifndef TFILE #define TFILE "__curses.out" @@ -51,20 +46,11 @@ static char sccsid[] = "@(#)ctrace.c 8.2 (Berkeley) 10/5/93"; static FILE *tracefp; /* Curses debugging file descriptor. */ void -#ifdef __STDC__ __CTRACE(const char *fmt, ...) -#else -__CTRACE(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif if (tracefp == NULL) tracefp = fopen(TFILE, "w"); if (tracefp == NULL) { diff --git a/lib/libocurses/printw.c b/lib/libocurses/printw.c index 2a397c1dffb..4b6b3e1c621 100644 --- a/lib/libocurses/printw.c +++ b/lib/libocurses/printw.c @@ -35,19 +35,12 @@ static char sccsid[] = "@(#)printw.c 8.3 (Berkeley) 5/4/94"; #endif /* not lint */ -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "curses.h" /* * printw and friends. - * - * These routines make nonportable assumptions about varargs if __STDC__ - * is not in effect. */ static int __winwrite(void *, const char *, int); @@ -57,22 +50,12 @@ static int __winwrite(void *, const char *, int); * Printf on the standard screen. */ int -#ifdef __STDC__ printw(const char *fmt, ...) -#else -printw(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwprintw(stdscr, fmt, ap); va_end(ap); return (ret); @@ -83,23 +66,12 @@ printw(fmt, va_alist) * Printf on the given window. */ int -#ifdef __STDC__ wprintw(WINDOW * win, const char *fmt, ...) -#else -wprintw(win, fmt, va_alist) - WINDOW *win; - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwprintw(win, fmt, ap); va_end(ap); return (ret); @@ -111,23 +83,12 @@ wprintw(win, fmt, va_alist) * arguments, they cannot be macros. Sigh.... */ int -#ifdef __STDC__ mvprintw(register int y, register int x, const char *fmt, ...) -#else -mvprintw(y, x, fmt, va_alist) - register int y, x; - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (move(y, x) != OK) return (ERR); ret = vwprintw(stdscr, fmt, ap); @@ -136,25 +97,13 @@ mvprintw(y, x, fmt, va_alist) } int -#ifdef __STDC__ mvwprintw(register WINDOW * win, register int y, register int x, const char *fmt, ...) -#else -mvwprintw(win, y, x, fmt, va_alist) - register WINDOW *win; - register int y, x; - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (wmove(win, y, x) != OK) return (ERR); diff --git a/lib/libocurses/scanw.c b/lib/libocurses/scanw.c index d8d79fd2355..423964c19f2 100644 --- a/lib/libocurses/scanw.c +++ b/lib/libocurses/scanw.c @@ -39,11 +39,7 @@ static char sccsid[] = "@(#)scanw.c 8.3 (Berkeley) 5/4/94"; * scanw and friends. */ -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "curses.h" @@ -52,22 +48,12 @@ static char sccsid[] = "@(#)scanw.c 8.3 (Berkeley) 5/4/94"; * Implement a scanf on the standard screen. */ int -#ifdef __STDC__ scanw(const char *fmt, ...) -#else -scanw(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwscanw(stdscr, fmt, ap); va_end(ap); return (ret); @@ -78,23 +64,12 @@ scanw(fmt, va_alist) * Implements a scanf on the given window. */ int -#ifdef __STDC__ wscanw(WINDOW *win, const char *fmt, ...) -#else -wscanw(win, fmt, va_alist) - WINDOW *win; - char *fmt; - va_dcl -#endif { va_list ap; int ret; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwscanw(win, fmt, ap); va_end(ap); return (ret); @@ -106,52 +81,29 @@ wscanw(win, fmt, va_alist) * arguments, they cannot be macros. Another sigh.... */ int -#ifdef __STDC__ mvscanw(register int y, register int x, const char *fmt,...) -#else -mvscanw(y, x, fmt, va_alist) - register int y, x; - char *fmt; - va_dcl -#endif { va_list ap; int ret; if (move(y, x) != OK) return (ERR); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwscanw(stdscr, fmt, ap); va_end(ap); return (ret); } int -#ifdef __STDC__ mvwscanw(register WINDOW * win, register int y, register int x, const char *fmt, ...) -#else -mvwscanw(win, y, x, fmt, va_alist) - register WINDOW *win; - register int y, x; - char *fmt; - va_dcl -#endif { va_list ap; int ret; if (move(y, x) != OK) return (ERR); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif ret = vwscanw(win, fmt, ap); va_end(ap); return (ret); diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c index c8244c70a99..84e3cfd8362 100644 --- a/lib/libpcap/gencode.c +++ b/lib/libpcap/gencode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencode.c,v 1.14 2001/12/17 22:29:47 dugsong Exp $ */ +/* $OpenBSD: gencode.c,v 1.15 2002/02/19 19:39:37 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 @@ -22,17 +22,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.c,v 1.14 2001/12/17 22:29:47 dugsong Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.c,v 1.15 2002/02/19 19:39:37 millert Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> @@ -43,11 +41,7 @@ struct rtentry; #include <stdlib.h> #include <memory.h> #include <setjmp.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "pcap-int.h" @@ -79,21 +73,11 @@ int pcap_fddipad; /* VARARGS */ __dead void -#ifdef __STDC__ bpf_error(const char *fmt, ...) -#else -bpf_error(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (bpf_pcap != NULL) (void)vsnprintf(pcap_geterr(bpf_pcap), PCAP_ERRBUF_SIZE, fmt, ap); diff --git a/lib/libpcap/gencode.h b/lib/libpcap/gencode.h index 563f85e325a..499727fe046 100644 --- a/lib/libpcap/gencode.h +++ b/lib/libpcap/gencode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gencode.h,v 1.8 2000/12/06 17:18:52 deraadt Exp $ */ +/* $OpenBSD: gencode.h,v 1.9 2002/02/19 19:39:37 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -20,7 +20,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.h,v 1.8 2000/12/06 17:18:52 deraadt Exp $ (LBL) + * @(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.h,v 1.9 2002/02/19 19:39:37 millert Exp $ (LBL) */ /* Address qualifiers. */ @@ -177,10 +177,8 @@ struct block *gen_multicast(int); struct block *gen_inbound(int); void bpf_optimize(struct block **); -#ifdef __STDC__ __dead void bpf_error(const char *, ...) __attribute__((volatile, __format__ (printf, 1, 2))); -#endif void finish_parse(struct block *); char *sdup(const char *); diff --git a/lib/libpcap/grammar.y b/lib/libpcap/grammar.y index b598d285d27..627ddf814bf 100644 --- a/lib/libpcap/grammar.y +++ b/lib/libpcap/grammar.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: grammar.y,v 1.8 2000/06/29 06:56:13 dugsong Exp $ */ +/* $OpenBSD: grammar.y,v 1.9 2002/02/19 19:39:37 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -24,17 +24,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/grammar.y,v 1.8 2000/06/29 06:56:13 dugsong Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/grammar.y,v 1.9 2002/02/19 19:39:37 millert Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> diff --git a/lib/libpcap/inet.c b/lib/libpcap/inet.c index 55a2fe40fa6..2d932ceb930 100644 --- a/lib/libpcap/inet.c +++ b/lib/libpcap/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.13 2000/04/26 21:25:53 jakob Exp $ */ +/* $OpenBSD: inet.c,v 1.14 2002/02/19 19:39:37 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996, 1997, 1998 @@ -35,7 +35,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/inet.c,v 1.13 2000/04/26 21:25:53 jakob Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/inet.c,v 1.14 2002/02/19 19:39:37 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -47,10 +47,8 @@ static const char rcsid[] = #endif #include <sys/time.h> /* concession to AIX */ -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/lib/libpcap/nametoaddr.c b/lib/libpcap/nametoaddr.c index 9fd62ca3e88..4f04fba0521 100644 --- a/lib/libpcap/nametoaddr.c +++ b/lib/libpcap/nametoaddr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nametoaddr.c,v 1.8 2000/04/26 21:25:53 jakob Exp $ */ +/* $OpenBSD: nametoaddr.c,v 1.9 2002/02/19 19:39:37 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/nametoaddr.c,v 1.8 2000/04/26 21:25:53 jakob Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/nametoaddr.c,v 1.9 2002/02/19 19:39:37 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -34,10 +34,8 @@ static const char rcsid[] = #include <sys/socket.h> #include <sys/time.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/lib/libwrap/diag.c b/lib/libwrap/diag.c index ed8d064ed56..4a1ea0db067 100644 --- a/lib/libwrap/diag.c +++ b/lib/libwrap/diag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diag.c,v 1.1 1997/02/26 03:06:50 downsj Exp $ */ +/* $OpenBSD: diag.c,v 1.2 2002/02/19 19:39:37 millert Exp $ */ /* * Routines to report various classes of problems. Each report is decorated @@ -15,7 +15,7 @@ #if 0 static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20"; #else -static char rcsid[] = "$OpenBSD: diag.c,v 1.1 1997/02/26 03:06:50 downsj Exp $"; +static char rcsid[] = "$OpenBSD: diag.c,v 1.2 2002/02/19 19:39:37 millert Exp $"; #endif #endif @@ -53,23 +53,23 @@ va_list ap; /* tcpd_warn - report problem of some sort and proceed */ -void VARARGS(tcpd_warn, char *, format) +void tcpd_warn(char *format, ...) { va_list ap; - VASTART(ap, char *, format); + va_start(ap, format); tcpd_diag(LOG_ERR, "warning", format, ap); - VAEND(ap); + va_end(ap); } /* tcpd_jump - report serious problem and jump */ -void VARARGS(tcpd_jump, char *, format) +void tcpd_jump(char *format, ...) { va_list ap; - VASTART(ap, char *, format); + va_start(ap, format); tcpd_diag(LOG_ERR, "error", format, ap); - VAEND(ap); + va_end(ap); longjmp(tcpd_buf, AC_ERROR); } diff --git a/lib/libwrap/tcpd.h b/lib/libwrap/tcpd.h index a49c71f44e1..fed8e6c888c 100644 --- a/lib/libwrap/tcpd.h +++ b/lib/libwrap/tcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpd.h,v 1.12 2002/02/16 21:27:29 millert Exp $ */ +/* $OpenBSD: tcpd.h,v 1.13 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1997, Jason Downs. All rights reserved. @@ -219,24 +219,4 @@ extern void process_options(char *, struct request_info *); extern int dry_run; /* verification flag */ __END_DECLS - -#ifdef _TCPD_PRIVATE - /* - * What follows is an attempt to unify varargs.h and stdarg.h. I'd rather - * have this than #ifdefs all over the code. - * - * The code using these must include the proper system header. - */ - -#ifdef __STDC__ -#define VARARGS(func,type,arg) func(type arg, ...) -#define VASTART(ap,type,name) va_start(ap,name) -#define VAEND(ap) va_end(ap) -#else -#define VARARGS(func,type,arg) func(va_alist) va_dcl -#define VASTART(ap,type,name) {type name; va_start(ap); name = va_arg(ap, type) -#define VAEND(ap) va_end(ap);} -#endif -#endif /* _TCPD_PRIVATE */ - #endif /* _TCPD_H_ */ diff --git a/lib/libwrap/update.c b/lib/libwrap/update.c index 6200324a60d..aac3807755f 100644 --- a/lib/libwrap/update.c +++ b/lib/libwrap/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.3 2001/11/07 18:49:21 deraadt Exp $ */ +/* $OpenBSD: update.c,v 1.4 2002/02/19 19:39:38 millert Exp $ */ /* * Routines for controlled update/initialization of request structures. @@ -19,7 +19,7 @@ #if 0 static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56"; #else -static char rcsid[] = "$OpenBSD: update.c,v 1.3 2001/11/07 18:49:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: update.c,v 1.4 2002/02/19 19:39:38 millert Exp $"; #endif #endif @@ -89,7 +89,7 @@ va_list ap; /* request_init - initialize request structure */ -struct request_info *VARARGS(request_init, struct request_info *, request) +struct request_info *request_init(struct request_info *request, ...) { static struct request_info default_info; struct request_info *r; @@ -100,7 +100,7 @@ struct request_info *VARARGS(request_init, struct request_info *, request) * members, to avoid pulling in the whole socket module when it is not * really needed. */ - VASTART(ap, struct request_info *, request); + va_start(ap, request); *request = default_info; request->fd = -1; strlcpy(request->daemon, unknown, sizeof(request->daemon)); @@ -108,19 +108,19 @@ struct request_info *VARARGS(request_init, struct request_info *, request) request->client->request = request; request->server->request = request; r = request_fill(request, ap); - VAEND(ap); + va_end(ap); return (r); } /* request_set - update request structure */ -struct request_info *VARARGS(request_set, struct request_info *, request) +struct request_info *request_set(struct request_info *request, ...) { struct request_info *r; va_list ap; - VASTART(ap, struct request_info *, request); + va_start(ap, request); r = request_fill(request, ap); - VAEND(ap); + va_end(ap); return (r); } diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index ebff51bd573..e2f5542112f 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $ */ +/* $OpenBSD: fingerd.c,v 1.26 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $"; +static char rcsid[] = "$OpenBSD: fingerd.c,v 1.26 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -59,6 +59,7 @@ static char rcsid[] = "$OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Ex #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdarg.h> #include "pathnames.h" void err(const char *, ...); @@ -230,27 +231,12 @@ main(argc, argv) exit(0); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ err(const char *fmt, ...) -#else -err(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vsyslog(LOG_ERR, fmt, ap); va_end(ap); exit(1); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9317e544a6a..6c0772b80a7 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $ */ +/* $OpenBSD: ftpd.c,v 1.121 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -73,7 +73,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftpd.c,v 1.121 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -118,6 +118,7 @@ static char rcsid[] = "$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp #include <util.h> #include <utmp.h> #include <bsd_auth.h> +#include <stdarg.h> #if defined(TCPWRAPPERS) #include <tcpd.h> @@ -126,12 +127,6 @@ static char rcsid[] = "$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp #include "pathnames.h" #include "extern.h" -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - static char version[] = "Version 6.5/OpenBSD"; extern off_t restart_point; @@ -1890,22 +1885,12 @@ fatal(s) } void -#ifdef __STDC__ reply(int n, const char *fmt, ...) -#else -reply(n, fmt, va_alist) - int n; - char *fmt; - va_dcl -#endif { char *buf, *p, *next; va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif if (vasprintf(&buf, fmt, ap) == -1 || buf == NULL) { printf("412 Local resource failure: malloc\r\n"); fflush(stdout); @@ -1924,32 +1909,18 @@ reply(n, fmt, va_alist) } void -#ifdef __STDC__ lreply(int n, const char *fmt, ...) -#else -lreply(n, fmt, va_alist) - int n; - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)printf("%d- ", n); (void)vprintf(fmt, ap); va_end(ap); (void)printf("\r\n"); (void)fflush(stdout); if (debug) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif syslog(LOG_DEBUG, "<--- %d- ", n); vsyslog(LOG_DEBUG, fmt, ap); va_end(ap); diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c index 11c8e03ff3b..54b2d775196 100644 --- a/libexec/ld.so/dl_printf.c +++ b/libexec/ld.so/dl_printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl_printf.c,v 1.4 2002/02/17 19:42:26 millert Exp $ */ +/* $OpenBSD: dl_printf.c,v 1.5 2002/02/19 19:39:38 millert Exp $ */ /*- * Copyright (c) 1993 @@ -60,11 +60,7 @@ #include <sys/cdefs.h> #include <sys/types.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "syscall.h" static void kprintn(void (*)(int), u_long, int); diff --git a/libexec/lfs_cleanerd/misc.c b/libexec/lfs_cleanerd/misc.c index 3c49ea4cef2..7ae3203e4b6 100644 --- a/libexec/lfs_cleanerd/misc.c +++ b/libexec/lfs_cleanerd/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.3 1997/07/25 19:41:17 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.4 2002/02/19 19:39:38 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 19:41:17 mickey Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -45,30 +45,16 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 19:41:17 mickey Exp $"; #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdarg.h> extern char *special; -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ err(const int fatal, const char *fmt, ...) -#else -err(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "%s: ", special); (void)vfprintf(stderr, fmt, ap); va_end(ap); diff --git a/libexec/mail.local/locking.c b/libexec/mail.local/locking.c index 0a5fe5d25ba..982b9b65577 100644 --- a/libexec/mail.local/locking.c +++ b/libexec/mail.local/locking.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locking.c,v 1.4 2002/02/17 23:16:09 millert Exp $ */ +/* $OpenBSD: locking.c,v 1.5 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1996-1998 Theo de Raadt <deraadt@theos.com> @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: locking.c,v 1.4 2002/02/17 23:16:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: locking.c,v 1.5 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -42,6 +42,7 @@ static char rcsid[] = "$OpenBSD: locking.c,v 1.4 2002/02/17 23:16:09 millert Exp #include <errno.h> #include <stdio.h> #include <string.h> +#include <stdarg.h> #include "pathnames.h" #include "mail.local.h" @@ -160,28 +161,12 @@ baditem(path) /* XXX if we fail to rename, another attempt will happen later */ } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ merr(int isfatal, const char *fmt, ...) -#else -merr(isfatal, fmt) - int isfatal; - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif vsyslog(LOG_ERR, fmt, ap); va_end(ap); if (isfatal) diff --git a/libexec/rpc.yppasswdd/yppasswd.h b/libexec/rpc.yppasswdd/yppasswd.h index 96e590dbfd6..cbf45db1775 100644 --- a/libexec/rpc.yppasswdd/yppasswd.h +++ b/libexec/rpc.yppasswdd/yppasswd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yppasswd.h,v 1.4 1997/08/19 07:00:51 niklas Exp $*/ +/* $OpenBSD: yppasswd.h,v 1.5 2002/02/19 19:39:38 millert Exp $*/ /* * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se> @@ -45,46 +45,22 @@ struct x_passwd { char *pw_shell; }; typedef struct x_passwd x_passwd; -#ifdef __cplusplus -extern "C" bool_t xdr_x_passwd(XDR *, x_passwd*); -#elif defined(__STDC__) -extern bool_t xdr_x_passwd(XDR *, x_passwd*); -#else /* Old Style C */ -bool_t xdr_x_passwd(); -#endif /* Old Style C */ - struct yppasswd { char *oldpass; x_passwd newpw; }; typedef struct yppasswd yppasswd; -#ifdef __cplusplus -extern "C" bool_t xdr_yppasswd(XDR *, yppasswd*); -#elif defined(__STDC__) -extern bool_t xdr_yppasswd(XDR *, yppasswd*); -#else /* Old Style C */ -bool_t xdr_yppasswd(); -#endif /* Old Style C */ - #define YPPASSWDPROG ((u_long)100009) #define YPPASSWDVERS ((u_long)1) - -#ifdef __cplusplus #define YPPASSWDPROC_UPDATE ((u_long)1) -extern "C" int * yppasswdproc_update_1(yppasswd *, CLIENT *); -extern "C" int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *, SVCXPRT *); -#elif defined(__STDC__) -#define YPPASSWDPROC_UPDATE ((u_long)1) -extern int * yppasswdproc_update_1(yppasswd *, CLIENT *); -extern int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *, SVCXPRT *); - -#else /* Old Style C */ -#define YPPASSWDPROC_UPDATE ((u_long)1) -extern int * yppasswdproc_update_1(); -extern int * yppasswdproc_update_1_svc(); -#endif /* Old Style C */ +__BEGIN_DECLS +bool_t xdr_x_passwd(XDR *, x_passwd*); +bool_t xdr_yppasswd(XDR *, yppasswd*); +int *yppasswdproc_update_1(yppasswd *, CLIENT *); +int *yppasswdproc_update_1_svc(yppasswd *, struct svc_req *, SVCXPRT *); +__END_DECLS #endif /* !_YPPASSWD_H_RPCGEN */ diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 300071025eb..ca3c50b01e7 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $ */ +/* $OpenBSD: rshd.c,v 1.42 2002/02/19 19:39:38 millert Exp $ */ /*- * Copyright (c) 1988, 1989, 1992, 1993, 1994 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */ -static char *rcsid = "$OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $"; +static char *rcsid = "$OpenBSD: rshd.c,v 1.42 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ /* @@ -75,6 +75,7 @@ static char *rcsid = "$OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $" #include <string.h> #include <syslog.h> #include <unistd.h> +#include <stdarg.h> #include <login_cap.h> #include <bsd_auth.h> @@ -761,29 +762,14 @@ fail: * connected to client, or older clients will hang waiting for that * connection first. */ -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; int len; char *bp, buf[BUFSIZ]; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif bp = buf; if (sent_null == 0) { *bp++ = 1; 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) { diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c index 53451c54384..a48e19c452b 100644 --- a/regress/lib/libc/db/dbtest.c +++ b/regress/lib/libc/db/dbtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dbtest.c,v 1.8 2002/02/18 21:40:46 millert Exp $ */ +/* $OpenBSD: dbtest.c,v 1.9 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94"; #else -static char rcsid[] = "$OpenBSD: dbtest.c,v 1.8 2002/02/18 21:40:46 millert Exp $"; +static char rcsid[] = "$OpenBSD: dbtest.c,v 1.9 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -58,6 +58,7 @@ static char rcsid[] = "$OpenBSD: dbtest.c,v 1.8 2002/02/18 21:40:46 millert Exp #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdarg.h> #include <unistd.h> #include <db.h> @@ -737,27 +738,12 @@ usage() exit(1); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ dberr(const char *fmt, ...) -#else -dberr(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __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/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index dc0e1a854c1..d6a28e32bb5 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumprmt.c,v 1.16 2002/02/16 21:27:33 millert Exp $ */ +/* $OpenBSD: dumprmt.c,v 1.17 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */ /*- @@ -67,11 +67,9 @@ static char rcsid[] = "$NetBSD: dumprmt.c,v 1.10 1996/03/15 22:39:26 scottr Exp #include <pwd.h> #include <signal.h> #include <stdio.h> -#ifdef __STDC__ #include <stdlib.h> #include <string.h> #include <unistd.h> -#endif #include "pathnames.h" #include "dump.h" diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index 8662b4a3265..a078fce5260 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $ */ +/* $OpenBSD: itime.c,v 1.8 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: itime.c,v 1.8 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -60,11 +60,9 @@ static char rcsid[] = "$OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $ #include <fcntl.h> #include <stdio.h> #include <time.h> -#ifdef __STDC__ #include <stdlib.h> #include <string.h> #include <unistd.h> -#endif #include "dump.h" diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 54c242dfa90..1324ea8f829 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $ */ +/* $OpenBSD: optr.c,v 1.21 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #else -static char rcsid[] = "$OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: optr.c,v 1.21 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -51,19 +51,12 @@ static char rcsid[] = "$OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $ #include <grp.h> #include <signal.h> #include <stdio.h> -#ifdef __STDC__ #include <stdlib.h> #include <string.h> #include <stdarg.h> -#endif #include <tzfile.h> -#ifdef __STDC__ #include <unistd.h> -#endif #include <utmp.h> -#ifndef __STDC__ -#include <varargs.h> -#endif #include "dump.h" #include "pathnames.h" @@ -234,13 +227,7 @@ timeest() } void -#ifdef __STDC__ msg(const char *fmt, ...) -#else -msg(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; @@ -248,51 +235,28 @@ msg(fmt, va_alist) #ifdef TDEBUG (void) fprintf(stderr, "pid=%d ", getpid()); #endif -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vfprintf(stderr, fmt, ap); va_end(ap); (void) fflush(stdout); (void) fflush(stderr); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vsnprintf(lastmsg, sizeof(lastmsg), fmt, ap); va_end(ap); } void -#ifdef __STDC__ msgtail(const char *fmt, ...) -#else -msgtail(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vfprintf(stderr, fmt, ap); va_end(ap); } void -#ifdef __STDC__ quit(const char *fmt, ...) -#else -quit(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; @@ -300,11 +264,7 @@ quit(fmt, va_alist) #ifdef TDEBUG (void) fprintf(stderr, "pid=%d ", getpid()); #endif -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vfprintf(stderr, fmt, ap); va_end(ap); (void) fflush(stdout); diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 762f39c010c..bc380b06c35 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.14 2002/02/17 19:42:27 millert Exp $ */ +/* $OpenBSD: tape.c,v 1.15 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #else -static char rcsid[] = "$OpenBSD: tape.c,v 1.14 2002/02/17 19:42:27 millert Exp $"; +static char rcsid[] = "$OpenBSD: tape.c,v 1.15 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -63,14 +63,10 @@ static char rcsid[] = "$OpenBSD: tape.c,v 1.14 2002/02/17 19:42:27 millert Exp $ #include <setjmp.h> #include <signal.h> #include <stdio.h> -#ifdef __STDC__ #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> -#else -int write(), read(); -#endif #include "dump.h" #include "pathnames.h" diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 7f6274d7231..4f662dc22de 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $ */ +/* $OpenBSD: traverse.c,v 1.9 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static char rcsid[] = "$OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: traverse.c,v 1.9 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -63,10 +63,8 @@ static char rcsid[] = "$OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Ex #include <errno.h> #include <fts.h> #include <stdio.h> -#ifdef __STDC__ #include <string.h> #include <unistd.h> -#endif #include "dump.h" diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index accf55a4672..8f99c527bd1 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsutil.c,v 1.5 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: fsutil.c,v 1.6 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */ /* @@ -40,11 +40,7 @@ static char rcsid[] = "$NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <errno.h> #include <fstab.h> #include <err.h> @@ -85,21 +81,11 @@ hotroot() /*VARARGS*/ void -#ifdef __STDC__ errexit(const char *fmt, ...) -#else -errexit(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vfprintf(stderr, fmt, ap); va_end(ap); exit(8); @@ -127,42 +113,22 @@ vmsg(fatal, fmt, ap) /*VARARGS*/ void -#ifdef __STDC__ pfatal(const char *fmt, ...) -#else -pfatal(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vmsg(1, fmt, ap); va_end(ap); } /*VARARGS*/ void -#ifdef __STDC__ pwarn(const char *fmt, ...) -#else -pwarn(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vmsg(0, fmt, ap); va_end(ap); } @@ -175,21 +141,11 @@ perror(s) } void -#ifdef __STDC__ panic(const char *fmt, ...) -#else -panic(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vmsg(1, fmt, ap); va_end(ap); exit(8); diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c index e623113d4d0..1482181da2e 100644 --- a/sbin/fsck_msdos/main.c +++ b/sbin/fsck_msdos/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $ */ +/* $OpenBSD: main.c,v 1.12 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: main.c,v 1.8 1996/10/17 20:29:53 cgd Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.12 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -44,11 +44,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $ #include <stdio.h> #include <unistd.h> #include <errno.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "ext.h" @@ -117,14 +113,7 @@ main(argc, argv) /*VARARGS*/ int -#ifdef __STDC__ ask(int def, const char *fmt, ...) -#else -ask(def, fmt, va_alist) - int def; - char *fmt; - va_dcl -#endif { va_list ap; @@ -139,11 +128,7 @@ ask(def, fmt, va_alist) return (def); } -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vsnprintf(prompt, sizeof(prompt), fmt, ap); va_end(ap); if (alwaysyes || rdonly) { diff --git a/sbin/init/init.c b/sbin/init/init.c index 9cabc9c0409..af77a83e972 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $ */ +/* $OpenBSD: init.c,v 1.25 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.25 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -60,6 +60,7 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $ #include <errno.h> #include <fcntl.h> #include <signal.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -69,12 +70,6 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $ #include <unistd.h> #include <util.h> -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - #ifdef SECURE #include <pwd.h> #endif @@ -289,25 +284,14 @@ main(argc, argv) * Associate a function with a signal handler. */ void -#ifdef __STDC__ handle(sig_t handler, ...) -#else -handle(va_alist) - va_dcl -#endif { int sig; struct sigaction sa; sigset_t mask_everything; va_list ap; -#ifndef __STDC__ - sig_t handler; - va_start(ap); - handler = va_arg(ap, sig_t); -#else va_start(ap, handler); -#endif memset(&sa, 0, sizeof sa); sa.sa_handler = handler; @@ -326,24 +310,12 @@ handle(va_alist) * Delete a set of signals from a mask. */ void -#ifdef __STDC__ delset(sigset_t *maskp, ...) -#else -delset(va_alist) - va_dcl -#endif { int sig; va_list ap; -#ifndef __STDC__ - sigset_t *maskp; - va_start(ap); - maskp = va_arg(ap, sigset_t *); -#else va_start(ap, maskp); -#endif - while ((sig = va_arg(ap, int))) sigdelset(maskp, sig); va_end(ap); @@ -355,23 +327,11 @@ delset(va_alist) * NB: should send a message to the session logger to avoid blocking. */ void -#ifdef __STDC__ stall(char *message, ...) -#else -stall(va_alist) - va_dcl -#endif { va_list ap; -#ifndef __STDC__ - char *message; - va_start(ap); - message = va_arg(ap, char *); -#else va_start(ap, message); -#endif - vsyslog(LOG_ALERT, message, ap); va_end(ap); closelog(); @@ -384,23 +344,11 @@ stall(va_alist) * NB: should send a message to the session logger to avoid blocking. */ void -#ifdef __STDC__ warning(char *message, ...) -#else -warning(va_alist) - va_dcl -#endif { va_list ap; -#ifndef __STDC__ - char *message; - va_start(ap); - message = va_arg(ap, char *); -#else va_start(ap, message); -#endif - vsyslog(LOG_ALERT, message, ap); va_end(ap); closelog(); @@ -411,23 +359,11 @@ warning(va_alist) * NB: should send a message to the session logger to avoid blocking. */ void -#ifdef __STDC__ emergency(char *message, ...) -#else -emergency(va_alist) - va_dcl -#endif { va_list ap; -#ifndef __STDC__ - char *message; - va_start(ap); - message = va_arg(ap, char *); -#else va_start(ap, message); -#endif - vsyslog(LOG_EMERG, message, ap); va_end(ap); closelog(); @@ -879,12 +815,7 @@ del_session(sp) * Look up a login session by pid. */ session_t * -#ifdef __STDC__ find_session(pid_t pid) -#else -find_session(pid) - pid_t pid; -#endif { DBT key; DBT data; @@ -1180,12 +1111,7 @@ start_getty(sp) * If an exiting login, start a new login running. */ void -#ifdef __STDC__ collect_child(pid_t pid) -#else -collect_child(pid) - pid_t pid; -#endif { session_t *sp, *sprev, *snext; diff --git a/sbin/isakmpd/log.c b/sbin/isakmpd/log.c index 7015b74c631..304bebd75a0 100644 --- a/sbin/isakmpd/log.c +++ b/sbin/isakmpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.26 2002/01/23 18:44:47 ho Exp $ */ +/* $OpenBSD: log.c,v 1.27 2002/02/19 19:39:38 millert Exp $ */ /* $EOM: log.c,v 1.30 2000/09/29 08:19:23 niklas Exp $ */ /* @@ -62,12 +62,7 @@ #include <stdlib.h> #include <string.h> #include <syslog.h> - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "isakmp_num.h" #include "log.h" @@ -202,15 +197,7 @@ _log_print (int error, int syslog_level, const char *fmt, va_list ap, #ifdef USE_DEBUG void -#ifdef __STDC__ log_debug (int cls, int level, const char *fmt, ...) -#else -log_debug (cls, level, fmt, va_alist) - int cls; - int level; - const char *fmt; - va_dcl -#endif { va_list ap; @@ -219,12 +206,7 @@ log_debug (cls, level, fmt, va_alist) */ if (cls >= 0 && (log_level[cls] == 0 || level > log_level[cls])) return; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (0, LOG_DEBUG, fmt, ap, cls, level); va_end (ap); } @@ -313,64 +295,31 @@ log_debug_toggle (void) #endif /* USE_DEBUG */ void -#ifdef __STDC__ log_print (const char *fmt, ...) -#else -log_print (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (0, LOG_NOTICE, fmt, ap, LOG_PRINT, 0); va_end (ap); } void -#ifdef __STDC__ log_error (const char *fmt, ...) -#else -log_error (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (1, LOG_ERR, fmt, ap, LOG_PRINT, 0); va_end (ap); } void -#ifdef __STDC__ log_fatal (const char *fmt, ...) -#else -log_fatal (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (1, LOG_CRIT, fmt, ap, LOG_PRINT, 0); va_end (ap); exit (1); diff --git a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c b/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c index d2ce5dfcea4..346f59a76d2 100644 --- a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c +++ b/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.1 2001/01/26 11:34:01 niklas Exp $ */ +/* $OpenBSD: blowfish.c,v 1.2 2002/02/19 19:39:38 millert Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -398,16 +398,8 @@ Blowfish_initstate(c) } -#ifdef __STDC__ u_int32_t Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current) -#else -u_int32_t -Blowfish_stream2word(data, databytes, current) - const u_int8_t *data; - u_int16_t databytes; - u_int16_t *current; -#endif { u_int8_t i; u_int16_t j; @@ -426,16 +418,8 @@ Blowfish_stream2word(data, databytes, current) return temp; } -#if __STDC__ void Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expand0state(c, key, keybytes) - blf_ctx *c; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -472,19 +456,9 @@ Blowfish_expand0state(c, key, keybytes) } -#if __STDC__ void Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expandstate(c, data, databytes, key, keybytes) - blf_ctx *c; - const u_int8_t *data; - u_int16_t databytes; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -525,16 +499,8 @@ Blowfish_expandstate(c, data, databytes, key, keybytes) } -#if __STDC__ void blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len) -#else -void -blf_key(c, k, len) - blf_ctx *c; - const u_int8_t *k; - u_int16_t len; -#endif { /* Initalize S-boxes and subkeys with Pi */ Blowfish_initstate(c); @@ -543,16 +509,8 @@ blf_key(c, k, len) Blowfish_expand0state(c, k, len); } -#if __STDC__ void blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_enc(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -564,16 +522,8 @@ blf_enc(c, data, blocks) } } -#if __STDC__ void blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_dec(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -585,16 +535,8 @@ blf_dec(c, data, blocks) } } -#if __STDC__ void blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_encrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i; @@ -615,16 +557,8 @@ blf_ecb_encrypt(c, data, len) } } -#if __STDC__ void blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_decrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i; @@ -645,17 +579,8 @@ blf_ecb_decrypt(c, data, len) } } -#if __STDC__ void blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_encrypt(c, iv, data, len) - blf_ctx *c; - u_int8_t *iv; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int32_t i, j; @@ -679,17 +604,8 @@ blf_cbc_encrypt(c, iv, data, len) } } -#if __STDC__ void blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_decrypt(c, iva, data, len) - blf_ctx *c; - u_int8_t *iva; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r; u_int8_t *iv; diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 1d09f7a82ef..0d50965a66f 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.31 2002/02/18 21:57:56 millert Exp $ */ +/* $OpenBSD: newfs.c,v 1.32 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.31 2002/02/18 21:57:56 millert Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.32 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -65,6 +65,7 @@ static char rcsid[] = "$OpenBSD: newfs.c,v 1.31 2002/02/18 21:57:56 millert Exp #include <errno.h> #include <fcntl.h> #include <paths.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -73,12 +74,6 @@ static char rcsid[] = "$OpenBSD: newfs.c,v 1.31 2002/02/18 21:57:56 millert Exp #include <util.h> #include <err.h> -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - #include "mntopts.h" #include "pathnames.h" @@ -698,21 +693,11 @@ rewritelabel(s, fd, lp) /*VARARGS*/ void -#ifdef __STDC__ fatal(const char *fmt, ...) -#else -fatal(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (fcntl(STDERR_FILENO, F_GETFL) < 0) { openlog(__progname, LOG_CONS, LOG_DAEMON); vsyslog(LOG_ERR, fmt, ap); diff --git a/sbin/newlfs/misc.c b/sbin/newlfs/misc.c index 1baff52135e..8df26603309 100644 --- a/sbin/newlfs/misc.c +++ b/sbin/newlfs/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.4 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: misc.c,v 1.5 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: misc.c,v 1.2 1995/03/18 14:58:51 cgd Exp $ */ /*- @@ -38,15 +38,16 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.5 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <sys/types.h> #include <sys/disklabel.h> -#include <stdlib.h> +#include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include "extern.h" u_int @@ -60,27 +61,12 @@ log2(num) return (i); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ fatal(const char *fmt, ...) -#else -fatal(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "%s: ", progname); (void)vfprintf(stderr, fmt, ap); va_end(ap); diff --git a/sbin/photurisd/log.c b/sbin/photurisd/log.c index 964bbbda4f2..06aebe15216 100644 --- a/sbin/photurisd/log.c +++ b/sbin/photurisd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.2 2001/08/18 20:50:02 deraadt Exp $ */ +/* $OpenBSD: log.c,v 1.3 2002/02/19 19:39:38 millert Exp $ */ /* $EOM: log.c,v 1.30 2000/09/29 08:19:23 niklas Exp $ */ /* @@ -40,11 +40,7 @@ #include <stdio.h> #include <string.h> #include <syslog.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "log.h" @@ -151,15 +147,7 @@ _log_print (int error, int syslog_level, const char *fmt, va_list ap, #ifdef USE_DEBUG void -#ifdef __STDC__ log_debug (int cls, int level, const char *fmt, ...) -#else -log_debug (cls, level, fmt, va_alist) - int cls; - int level; - const char *fmt; - va_dcl -#endif { va_list ap; @@ -168,12 +156,7 @@ log_debug (cls, level, fmt, va_alist) */ if (cls >= 0 && (log_level[cls] == 0 || level > log_level[cls])) return; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (0, LOG_DEBUG, fmt, ap, cls, level); va_end (ap); } @@ -243,64 +226,31 @@ log_debug_cmd (int cls, int level) #endif /* USE_DEBUG */ void -#ifdef __STDC__ log_print (const char *fmt, ...) -#else -log_print (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (0, LOG_NOTICE, fmt, ap, LOG_PRINT, 0); va_end (ap); } void -#ifdef __STDC__ log_error (const char *fmt, ...) -#else -log_error (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (1, LOG_ERR, fmt, ap, LOG_PRINT, 0); va_end (ap); } void -#ifdef __STDC__ log_fatal (const char *fmt, ...) -#else -log_fatal (fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start (ap, fmt); -#else - va_start (ap); - fmt = va_arg (ap, const char *); -#endif _log_print (1, LOG_CRIT, fmt, ap, LOG_PRINT, 0); va_end (ap); exit (1); diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 35bb32e7c05..713066bd44e 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.20 2002/02/16 21:27:37 millert Exp $ */ +/* $OpenBSD: tape.c,v 1.21 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $ */ /* @@ -1269,27 +1269,14 @@ checksum(buf) } #ifdef RRESTORE -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif void -#ifdef __STDC__ msg(const char *fmt, ...) -#else -msg(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(stderr, fmt, ap); va_end(ap); } diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c index d042110a150..a7840f19537 100644 --- a/sbin/restore/utilities.c +++ b/sbin/restore/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.7 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: utilities.c,v 1.8 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: utilities.c,v 1.11 1997/03/19 08:42:56 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utilities.c 8.4 (Berkeley) 10/18/94"; #else -static char rcsid[] = "$OpenBSD: utilities.c,v 1.7 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: utilities.c,v 1.8 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -49,6 +49,7 @@ static char rcsid[] = "$OpenBSD: utilities.c,v 1.7 2001/11/05 07:39:17 mpech Exp #include <ufs/ufs/dir.h> #include <err.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -403,27 +404,11 @@ reply(question) /* * handle unexpected inconsistencies */ -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ panic(const char *fmt, ...) -#else -panic(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vfprintf(stderr, fmt, ap); va_end(ap); diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c index f6a7ad4c682..b8fab275fe1 100644 --- a/usr.bin/file/is_tar.c +++ b/usr.bin/file/is_tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: is_tar.c,v 1.4 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: is_tar.c,v 1.5 2002/02/19 19:39:38 millert Exp $ */ /* * is_tar() -- figure out whether file is a tar archive. @@ -19,11 +19,7 @@ #define isodigit(c) ( ((c) >= '0') && ((c) <= '7') ) -#if defined(__STDC__) || defined(__cplusplus) static int from_oct(int, char*); /* Decode octal number */ -#else -static int from_oct(); -#endif /* * Return diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c index 0bc8c5f1fe2..804eb79b0c2 100644 --- a/usr.bin/file/print.c +++ b/usr.bin/file/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.6 1998/07/10 15:05:25 mickey Exp $ */ +/* $OpenBSD: print.c,v 1.7 2002/02/19 19:39:38 millert Exp $ */ /* * print.c - debugging printout routines @@ -30,11 +30,7 @@ #include <stdio.h> #include <errno.h> #include <string.h> -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> #include <stdlib.h> #include <unistd.h> #include <time.h> @@ -42,7 +38,7 @@ #include "file.h" #ifndef lint -static char *moduleid = "$OpenBSD: print.c,v 1.6 1998/07/10 15:05:25 mickey Exp $"; +static char *moduleid = "$OpenBSD: print.c,v 1.7 2002/02/19 19:39:38 millert Exp $"; #endif /* lint */ #define SZOF(a) (sizeof(a) / sizeof(a[0])) @@ -124,23 +120,11 @@ ckfputs(str, fil) /*VARARGS*/ void -#ifdef __STDC__ ckfprintf(FILE *f, const char *fmt, ...) -#else -ckfprintf(va_alist) - va_dcl -#endif { va_list va; -#ifdef __STDC__ + va_start(va, fmt); -#else - FILE *f; - const char *fmt; - va_start(va); - f = va_arg(va, FILE *); - fmt = va_arg(va, const char *); -#endif (void) vfprintf(f, fmt, va); if (ferror(f)) err(1, "write failed"); diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index aa38b099fc9..14c2866b599 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $ */ +/* $OpenBSD: ftp.c,v 1.43 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */ /* @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94"; #else -static char rcsid[] = "$OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftp.c,v 1.43 2002/02/19 19:39:38 millert Exp $"; #endif #endif /* not lint */ @@ -91,11 +91,7 @@ static char rcsid[] = "$OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $" #include <string.h> #include <unistd.h> #include <utime.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "ftp_var.h" @@ -292,29 +288,16 @@ cmdabort(notused) /*VARARGS*/ int -#ifdef __STDC__ command(const char *fmt, ...) -#else -command(va_alist) - va_dcl -#endif { va_list ap; int r; sig_t oldintr; -#ifndef __STDC__ - const char *fmt; -#endif abrtflag = 0; if (debug) { fputs("---> ", ttyout); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); - fmt = va_arg(ap, const char *); -#endif if (strncmp("PASS ", fmt, 5) == 0) fputs("PASS XXXX", ttyout); else if (strncmp("ACCT ", fmt, 5) == 0) @@ -331,12 +314,7 @@ command(va_alist) return (0); } oldintr = signal(SIGINT, cmdabort); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); - fmt = va_arg(ap, char *); -#endif vfprintf(cout, fmt, ap); va_end(ap); fputs("\r\n", cout); diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c index c1abb2c8be0..fe32c8f4d9a 100644 --- a/usr.bin/indent/io.c +++ b/usr.bin/indent/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.4 2001/01/08 07:14:42 pjanzen Exp $ */ +/* $OpenBSD: io.c,v 1.5 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1985 Sun Microsystems, Inc. @@ -37,13 +37,14 @@ #ifndef lint /*static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: io.c,v 1.4 2001/01/08 07:14:42 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: io.c,v 1.5 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ #include <stdio.h> #include <ctype.h> #include <stdlib.h> #include <string.h> +#include <stdarg.h> #include <err.h> #include "indent_globs.h" @@ -537,32 +538,15 @@ count_spaces(current, buffer) return (cur); } -#if __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - int found_err; /* VARARGS2 */ void -#if __STDC__ diag(int level, char *msg, ...) -#else -diag(level, msg, va_alist) - int level; - char *msg; - va_dcl -#endif { - va_list ap; -#if __STDC__ - va_start(ap, msg); -#else - va_start(ap); -#endif + va_list ap; + va_start(ap, msg); if (level) found_err = 1; if (output == stdout) { diff --git a/usr.bin/make/defines.h b/usr.bin/make/defines.h index dbf14cab830..11961a94c77 100644 --- a/usr.bin/make/defines.h +++ b/usr.bin/make/defines.h @@ -2,7 +2,7 @@ #define DEFINES_H /* $OpenPackages$ */ -/* $OpenBSD: defines.h,v 1.1 2001/05/23 12:34:41 espie Exp $ */ +/* $OpenBSD: defines.h,v 1.2 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 2001 Marc Espie. @@ -93,12 +93,7 @@ extern int debug; #define DEBUG_FOR 0x0400 #define DEBUG_LOUD 0x0800 -#ifdef __STDC__ #define CONCAT(a,b) a##b -#else -#define I(a) a -#define CONCAT(a,b) I(a)b -#endif /* __STDC__ */ #define DEBUG(module) (debug & CONCAT(DEBUG_,module)) diff --git a/usr.bin/make/error.c b/usr.bin/make/error.c index 8bcd6363cee..086739a4ed4 100644 --- a/usr.bin/make/error.c +++ b/usr.bin/make/error.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: error.c,v 1.9 2001/09/05 22:32:41 deraadt Exp $ */ +/* $OpenBSD: error.c,v 1.10 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 2001 Marc Espie. @@ -25,14 +25,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "config.h" #include "defines.h" @@ -50,22 +46,11 @@ static void ParseVErrorInternal(const char *, unsigned long, int, const char *, */ /* VARARGS */ void -#ifdef __STDC__ Error(char *fmt, ...) -#else -Error(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - char *fmt; - va_start(ap); - fmt = va_arg(ap, char *); -#endif + va_start(ap, fmt); (void)vfprintf(stderr, fmt, ap); va_end(ap); (void)fprintf(stderr, "\n"); @@ -81,22 +66,11 @@ Error(va_alist) */ /* VARARGS */ void -#ifdef __STDC__ Fatal(char *fmt, ...) -#else -Fatal(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - char *fmt; - va_start(ap); - fmt = va_arg(ap, char *); -#endif + va_start(ap, fmt); Job_Wait(); (void)vfprintf(stderr, fmt, ap); @@ -118,23 +92,11 @@ Fatal(va_alist) */ /* VARARGS */ void -#ifdef __STDC__ Punt(char *fmt, ...) -#else -Punt(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif + va_start(ap, fmt); (void)fprintf(stderr, "make: "); (void)vfprintf(stderr, fmt, ap); va_end(ap); @@ -186,13 +148,8 @@ Finish(errors) */ /* VARARGS */ static void -#ifdef __STDC__ ParseVErrorInternal(const char *cfname, unsigned long clineno, int type, const char *fmt, va_list ap) -#else -ParseVErrorInternal(va_alist) - va_dcl -#endif { if (cfname) (void)fprintf(stderr, "\"%s\", line %lu: ", cfname, clineno); @@ -212,25 +169,11 @@ ParseVErrorInternal(va_alist) */ /* VARARGS */ void -#ifdef __STDC__ Parse_Error(int type, const char *fmt, ...) -#else -Parse_Error(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - int type; /* Error type (PARSE_WARNING, PARSE_FATAL) */ - char *fmt; - - va_start(ap); - type = va_arg(ap, int); - fmt = va_arg(ap, char *); -#endif + va_start(ap, fmt); ParseVErrorInternal(Parse_Getfilename(), Parse_Getlineno(), type, fmt, ap); va_end(va); } diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c index f30c50667c5..d05fc425a72 100644 --- a/usr.bin/make/targ.c +++ b/usr.bin/make/targ.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: targ.c,v 1.34 2001/05/29 12:53:43 espie Exp $ */ +/* $OpenBSD: targ.c,v 1.35 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $ */ /* @@ -447,13 +447,8 @@ Targ_PrintType(type) { int tbit; -#ifdef __STDC__ #define PRINTBIT(attr) case CONCAT(OP_,attr): printf("." #attr " "); break #define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf("." #attr " "); break -#else -#define PRINTBIT(attr) case CONCAT(OP_,attr): printf(".attr "); break -#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf(".attr "); break -#endif /* __STDC__ */ type &= ~OP_OPMASK; diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c index 5de54011808..131bd9e18c0 100644 --- a/usr.bin/make/util.c +++ b/usr.bin/make/util.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: util.c,v 1.16 2001/05/23 12:34:51 espie Exp $ */ +/* $OpenBSD: util.c,v 1.17 2002/02/19 19:39:38 millert Exp $ */ /* $NetBSD: util.c,v 1.10 1996/12/31 17:56:04 christos Exp $ */ /* @@ -35,16 +35,8 @@ #include "config.h" #include "defines.h" -#ifndef __STDC__ -# ifndef const -# define const -# endif -#endif - #ifdef sun - - extern int errno, sys_nerr; extern char *sys_errlist[]; @@ -375,11 +367,7 @@ signal(s, a))() #endif #ifndef BSD4_4 -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef _IOSTRG #define STRFLAG (_IOSTRG|_IOWRT) /* no _IOWRT: avoid stdio bug */ @@ -413,28 +401,12 @@ vsnprintf(s, n, fmt, args) } int -#ifdef __STDC__ snprintf(char *s, size_t n, const char *fmt, ...) -#else -snprintf(va_alist) - va_dcl -#endif { va_list ap; int rv; -#ifdef __STDC__ - va_start(ap, fmt); -#else - char *s; - size_t n; - const char *fmt; - - va_start(ap); - s = va_arg(ap, char *); - n = va_arg(ap, size_t); - fmt = va_arg(ap, const char *); -#endif + va_start(ap, fmt); rv = vsnprintf(s, n, fmt, ap); va_end(ap); return rv; diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c index 40c3122ba4b..a360802a507 100644 --- a/usr.bin/oldrdist/main.c +++ b/usr.bin/oldrdist/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 2002/02/16 21:27:50 millert Exp $ */ +/* $OpenBSD: main.c,v 1.12 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -41,9 +41,10 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:50 millert Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.12 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ +#include <stdarg.h> #include "defs.h" #define NHOSTS 100 @@ -307,28 +308,13 @@ prnames(nl) printf(")\n"); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ warn(const char *fmt, ...) -#else -warn(fmt, va_alist) - char *fmt; - va_dcl -#endif { extern int yylineno; va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "rdist: line %d: Warning: ", yylineno); (void)vfprintf(stderr, fmt, ap); (void)fprintf(stderr, "\n"); diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c index 51afafea5a4..a7b878e60c2 100644 --- a/usr.bin/oldrdist/server.c +++ b/usr.bin/oldrdist/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.16 2002/02/16 21:27:50 millert Exp $ */ +/* $OpenBSD: server.c,v 1.17 2002/02/19 19:39:38 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,10 +35,11 @@ #ifndef lint /* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: server.c,v 1.16 2002/02/16 21:27:50 millert Exp $"; +static char *rcsid = "$OpenBSD: server.c,v 1.17 2002/02/19 19:39:38 millert Exp $"; #endif /* not lint */ #include <sys/wait.h> +#include <stdarg.h> #include "defs.h" #define ack() (void) write(rem, "\0\n", 2) @@ -1432,28 +1433,12 @@ dospecial(cmd) ack(); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ log(FILE *fp, const char *fmt, ...) -#else -log(fp, fmt, va_alist) - FILE *fp; - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif /* Print changes locally if not quiet mode */ if (!qflag) (void) vprintf(fmt, ap); @@ -1465,22 +1450,12 @@ log(fp, fmt, va_alist) } void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - char *fmt; - va_dcl -#endif { static FILE *fp; va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif + va_start(ap, fmt); ++nerrs; if (iamremote) { if (!fp && (rem < 0 || !(fp = fdopen(rem, "w")))) @@ -1504,22 +1479,12 @@ error(fmt, va_alist) } void -#ifdef __STDC__ fatal(const char *fmt, ...) -#else -fatal(fmt, va_alist) - char *fmt; - va_dcl -#endif { static FILE *fp; va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif + va_start(ap, fmt); ++nerrs; if (!fp && !(fp = fdopen(rem, "w"))) return; @@ -1603,21 +1568,12 @@ cleanup(signo) } static void -#ifdef __STDC__ note(const char *fmt, ...) -#else -note(fmt, va_alist) - char *fmt; - va_dcl -#endif { static char buf[BUFSIZ]; va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); comment(buf); diff --git a/usr.bin/patch/backupfile.h b/usr.bin/patch/backupfile.h index 16881d2633b..3773aa12b28 100644 --- a/usr.bin/patch/backupfile.h +++ b/usr.bin/patch/backupfile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: backupfile.h,v 1.2 1996/06/10 11:21:26 niklas Exp $*/ +/* $OpenBSD: backupfile.h,v 1.3 2002/02/19 19:39:39 millert Exp $*/ /* backupfile.h -- declarations for making Emacs style backup file names Copyright (C) 1990 Free Software Foundation, Inc. @@ -31,10 +31,5 @@ enum backup_type extern enum backup_type backup_type; extern char *simple_backup_suffix; -#ifdef __STDC__ char *find_backup_file_name (char *file); enum backup_type get_version (char *version); -#else -char *find_backup_file_name (); -enum backup_type get_version (); -#endif diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 859be7d9ba0..5215d405963 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.6 2002/02/16 21:27:51 millert Exp $ */ +/* $OpenBSD: printf.c,v 1.7 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -43,7 +43,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: printf.c,v 1.6 2002/02/16 21:27:51 millert Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.7 2002/02/19 19:39:39 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -78,31 +78,16 @@ static char **gargv; #ifdef SHELL #define main printfcmd #include "../../bin/sh/bltin/bltin.h" - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <vararg.h> -#endif static void -#ifdef __STDC__ warnx(const char *fmt, ...) -#else -warnx(fmt, va_alist) - const char *fmt; - va_dcl -#endif { char buf[64]; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vsprintf(buf, fmt, ap); va_end(ap); @@ -369,11 +354,7 @@ print_escape(str) break; case 'a': /* alert */ -#ifdef __STDC__ putchar('\a'); -#else - putchar(007); -#endif break; case 'b': /* backspace */ diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c index 1b7792fc0f4..b3832bf46e2 100644 --- a/usr.bin/rdist/rdist.c +++ b/usr.bin/rdist/rdist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdist.c,v 1.11 2001/12/29 23:16:10 millert Exp $ */ +/* $OpenBSD: rdist.c,v 1.12 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -39,7 +39,7 @@ static char RCSid[] = "$From: rdist.c,v 6.65 1995/12/12 00:20:39 mcooper Exp $"; #else static char RCSid[] = -"$OpenBSD: rdist.c,v 1.11 2001/12/29 23:16:10 millert Exp $"; +"$OpenBSD: rdist.c,v 1.12 2002/02/19 19:39:39 millert Exp $"; #endif static char sccsid[] = "@(#)main.c 5.1 (Berkeley) 6/6/85"; @@ -59,13 +59,8 @@ static char copyright[] = * Remote distribution program. */ -#ifdef __STDC__ void docmdargs(int, char **); void usage(void); -#else -void docmdargs(); -void usage(); -#endif char *distfile = NULL; /* Name of distfile to use */ int maxchildren = MAXCHILDREN; /* Max no of concurrent PIDs */ diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index 8f26b31ca6a..39b80273bb3 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogin.c,v 1.29 2002/02/17 19:42:31 millert Exp $ */ +/* $OpenBSD: rlogin.c,v 1.30 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: rlogin.c,v 1.29 2002/02/17 19:42:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: rlogin.c,v 1.30 2002/02/19 19:39:39 millert Exp $"; #endif #endif /* not lint */ @@ -73,12 +73,7 @@ static char rcsid[] = "$OpenBSD: rlogin.c,v 1.29 2002/02/17 19:42:31 millert Exp #include <stdlib.h> #include <string.h> #include <unistd.h> - -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef KERBEROS #include <des.h> @@ -604,12 +599,7 @@ writer() } void -#ifdef __STDC__ echo(char c) -#else -echo(c) - char c; -#endif { char *p; char buf[8]; @@ -890,13 +880,7 @@ msg(str) #ifdef KERBEROS /* VARARGS */ void -#ifdef __STDC__ warning(const char *fmt, ...) -#else -warning(fmt, va_alist) - char *fmt; - va_dcl -#endif { char myrealm[REALM_SZ]; va_list ap; @@ -904,11 +888,7 @@ warning(fmt, va_alist) if (krb_get_lrealm(myrealm, 0) != KSUCCESS) return; (void)fprintf(stderr, "rlogin: warning, using standard rlogin: "); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vfprintf(stderr, fmt, ap); va_end(ap); (void)fprintf(stderr, ".\n"); diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index 1549077fd57..64b3bf31b55 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsh.c,v 1.24 2002/02/17 19:42:31 millert Exp $ */ +/* $OpenBSD: rsh.c,v 1.25 2002/02/19 19:39:39 millert Exp $ */ /*- * Copyright (c) 1983, 1990 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$OpenBSD: rsh.c,v 1.24 2002/02/17 19:42:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: rsh.c,v 1.25 2002/02/19 19:39:39 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -59,11 +59,7 @@ static char rcsid[] = "$OpenBSD: rsh.c,v 1.24 2002/02/17 19:42:31 millert Exp $" #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "pathnames.h" #ifdef KERBEROS @@ -444,28 +440,15 @@ sendsig(signo) #ifdef KERBEROS /* VARARGS */ void -#ifdef __STDC__ warning(const char *fmt, ...) -#else -warning(va_alist) -va_dcl -#endif { va_list ap; -#ifndef __STDC__ - char *fmt; -#endif char myrealm[REALM_SZ]; if (krb_get_lrealm(myrealm, 0) != KSUCCESS) return; (void)fprintf(stderr, "rsh: warning, using standard rsh: "); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); - fmt = va_arg(ap, char *); -#endif vfprintf(stderr, fmt, ap); va_end(ap); (void)fprintf(stderr, ".\n"); diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c index c70346b2155..c23a66c05b5 100644 --- a/usr.bin/sed/misc.c +++ b/usr.bin/sed/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.3 1997/07/25 21:05:41 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.4 2002/02/19 19:39:39 millert Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; */ -static char *rcsid = "$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:41 mickey Exp $"; +static char *rcsid = "$OpenBSD: misc.c,v 1.4 2002/02/19 19:39:39 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -49,6 +49,7 @@ static char *rcsid = "$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:41 mickey Exp $"; #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdarg.h> #include "defs.h" #include "extern.h" @@ -104,30 +105,15 @@ strregerror(errcode, preg) return (oe); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif /* * Error reporting function */ void -#ifdef __STDC__ err(int severity, const char *fmt, ...) -#else -err(severity, fmt, va_alist) - int severity; - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "sed: "); switch (severity) { case WARNING: diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index c9eba97b477..0fd273982ff 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -1,4 +1,4 @@ -/* $OpenBSD: su.c,v 1.43 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: su.c,v 1.44 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91"; #else -static const char rcsid[] = "$OpenBSD: su.c,v 1.43 2002/02/16 21:27:54 millert Exp $"; +static const char rcsid[] = "$OpenBSD: su.c,v 1.44 2002/02/19 19:39:39 millert Exp $"; #endif #endif /* not lint */ @@ -62,11 +62,7 @@ static const char rcsid[] = "$OpenBSD: su.c,v 1.43 2002/02/16 21:27:54 millert E #include <string.h> #include <syslog.h> #include <unistd.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <bsd_auth.h> char *ontty(void); @@ -349,52 +345,20 @@ usage() } void -#ifdef __STDC__ auth_err(auth_session_t *as, int eval, const char *fmt, ...) -#else -auth_err(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - auth_session_t *as; - int eval; - const char *fmt; - - va_start(ap); - as = va_arg(ap, auth_session_t *); - eval = va_arg(ap, int); - fmt = va_arg(ap, const char *); -#endif verr(eval, fmt, ap); auth_close(as); va_end(ap); } void -#ifdef __STDC__ auth_errx(auth_session_t *as, int eval, const char *fmt, ...) -#else -auth_errx(va_alist) - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - auth_session_t *as; - int eval; - const char *fmt; - - va_start(ap); - as = va_arg(ap, auth_session_t *); - eval = va_arg(ap, int); - fmt = va_arg(ap, const char *); -#endif verrx(eval, fmt, ap); auth_close(as); va_end(ap); diff --git a/usr.bin/sup/src/libc.h b/usr.bin/sup/src/libc.h index 777555d2d7d..79d92cdb718 100644 --- a/usr.bin/sup/src/libc.h +++ b/usr.bin/sup/src/libc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libc.h,v 1.7 2001/05/04 22:16:15 millert Exp $ */ +/* $OpenBSD: libc.h,v 1.8 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -98,19 +98,12 @@ #endif /* _TIME_H_ */ /* CMU stdio additions */ -#if defined(__STDC__) extern FILE *fopenp(const char*, const char*, char*, char*); extern FILE *fwantread(const char*, const char*, const char*, const char*); extern FILE *fwantwrite(const char*, const char*, const char*, const char*, int); -#else /* __STDC__ */ -extern FILE *fopenp(); -extern FILE *fwantread(); -extern FILE *fwantwrite(); -#endif /* __STDC__ */ /* CMU string routines */ -#if defined(__STDC__) extern char* foldup(char*, const char*); extern char* folddown(char*, const char*); extern char* sindex(const char*, const char*); @@ -146,41 +139,17 @@ extern unsigned int hexarg(const char**, const char*, const char*, unsigned int, unsigned int, unsigned int); extern unsigned int atoh(const char*); extern char *concat(const char*, int, ...); -#else /* __STDC__ */ -extern char *foldup(), *folddown(); -extern char *sindex(), *skipto(), *skipover(), *nxtarg(); -extern char *getstr(), *strarg(); -extern long getlong(), longarg(); -extern short getshort(), shortarg(); -extern float getfloat(), floatarg(); -extern double getdouble(), doublearg(); -extern unsigned int getoct(), octarg(), gethex(), hexarg(); -extern unsigned int atoo(), atoh(); -extern char *concat(); -#endif /* __STDC__ */ /* CMU library routines */ -#if defined(__STDC__) extern char *getname(int); extern char *pathof(char *); extern const char *errmsg(int); -#else /* __STDC__ */ -extern char *getname(); -extern char *pathof(); -extern const char *errmsg(); -#endif /* __STDC__ */ /* CMU time additions */ -#if defined(__STDC__) extern long gtime(const struct tm*); extern long atot(const char*); -#else /* __STDC__ */ -extern long gtime(); -extern long atot(); -#endif /* __STDC__ */ /* 4.3 BSD standard library routines; taken from man(3) */ -#if defined(__STDC__) #if 0 typedef int (*PFI)(); #endif @@ -260,28 +229,4 @@ extern int ttyslot(void); extern unsigned ualarm(unsigned, unsigned); extern void usleep(unsigned); #endif -#else /* __STDC__ */ -extern double atof(); -extern long atol(); -extern char *crypt(); -extern char *ecvt(); -extern char *fcvt(); -extern char *gcvt(); -extern char *getenv(); -extern char *getlogin(); -extern char *getpass(); -extern char *getusershell(); -extern char *getwd(); -extern char *malloc(); -extern char *realloc(); -extern char *calloc(); -extern char *alloca(); -extern char *mktemp(); -extern long random(); -extern char *initstate(); -extern char *setstate(); -extern char *re_comp(); -extern char *ttyname(); -extern unsigned ualarm(); -#endif /* __STDC__ */ #endif /* not _LIBC_H_ */ diff --git a/usr.bin/sup/src/log.c b/usr.bin/sup/src/log.c index 5f17ce9cc02..cfd184b28d5 100644 --- a/usr.bin/sup/src/log.c +++ b/usr.bin/sup/src/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.7 2001/05/04 22:16:15 millert Exp $ */ +/* $OpenBSD: log.c,v 1.8 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -65,27 +65,12 @@ logopen(program) } void -#ifdef __STDC__ logquit(int retval, char *fmt, ...) -#else -/*VARARGS*//*ARGSUSED*/ -logquit(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - int retval; - char *fmt; - - va_start(ap); - retval = va_arg(ap,int); - fmt = va_arg(ap,char *); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); if (opened) { @@ -97,25 +82,12 @@ va_dcl } void -#ifdef __STDC__ logerr(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -logerr(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap,char *); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); if (opened) { @@ -127,25 +99,12 @@ va_dcl } void -#ifdef __STDC__ loginfo(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -loginfo(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap,char *); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); if (opened) { @@ -174,25 +133,12 @@ int allow_severity = LIBWRAP_ALLOW_FACILITY|LIBWRAP_ALLOW_SEVERITY; int deny_severity = LIBWRAP_DENY_FACILITY|LIBWRAP_DENY_SEVERITY; void -#ifdef __STDC__ logdeny(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -logdeny(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); if (opened) { @@ -204,25 +150,12 @@ va_dcl } void -#ifdef __STDC__ logallow(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -logallow(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap,char *); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); if (opened) { diff --git a/usr.bin/sup/src/quit.c b/usr.bin/sup/src/quit.c index fbbf0a0f3c6..b1db270374f 100644 --- a/usr.bin/sup/src/quit.c +++ b/usr.bin/sup/src/quit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quit.c,v 1.4 2001/04/29 21:52:15 millert Exp $ */ +/* $OpenBSD: quit.c,v 1.5 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -49,25 +49,11 @@ #include "supextern.h" void -#ifdef __STDC__ quit (int status, char * fmt, ...) -#else -quit (va_alist) -va_dcl -#endif { va_list args; -#ifdef __STDC__ - va_start(args, fmt); -#else - int status; - char *fmt; - - va_start(args); - status = va_arg(args, int); - fmt = va_arg(args, char *); -#endif + va_start(args, fmt); fflush(stdout); (void) vfprintf(stderr, fmt, args); va_end(args); diff --git a/usr.bin/sup/src/run.c b/usr.bin/sup/src/run.c index 63113d3c71f..229f7555c20 100644 --- a/usr.bin/sup/src/run.c +++ b/usr.bin/sup/src/run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: run.c,v 1.11 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: run.c,v 1.12 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -95,12 +95,6 @@ #include "supcdefs.h" #include "supextern.h" -#ifndef __STDC__ -#ifndef const -#define const -#endif -#endif - static int dorun(char *, char **, int); static char **makearglist(va_list); @@ -126,24 +120,12 @@ makearglist(ap) } int -#ifdef __STDC__ run(char *name, ...) -#else -run(va_alist) -va_dcl -#endif { int val; va_list ap; char **argv; -#ifdef __STDC__ va_start(ap, name); -#else - char *name; - - va_start(ap); - name = va_arg(ap, char *); -#endif if ((argv = makearglist(ap)) == NULL) return -1; @@ -159,25 +141,13 @@ char *name,**argv; } int -#ifdef __STDC__ runp(char *name, ...) -#else -runp (va_alist) -va_dcl -#endif { int val; va_list ap; char **argv; -#ifdef __STDC__ - va_start(ap, name); -#else - char *name; - - va_start(ap); - name = va_arg(ap, char *); -#endif + va_start(ap, name); if ((argv = makearglist(ap)) == NULL) return -1; val = runvp (name, argv); diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c index c1b8702b573..f9c874cf344 100644 --- a/usr.bin/sup/src/scm.c +++ b/usr.bin/sup/src/scm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scm.c,v 1.14 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: scm.c,v 1.15 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -177,11 +177,7 @@ #include <net/if.h> #include <netdb.h> #include <syslog.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "supcdefs.h" #include "supextern.h" @@ -627,26 +623,11 @@ matchhost(name) /* is this name of remote host? */ return (0); } -#ifdef __STDC__ int scmerr(int error,char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -int scmerr(va_alist) -va_dcl -#endif { va_list ap; -#ifdef __STDC__ - va_start(ap,fmt); -#else - int error; - char *fmt; - - va_start(ap); - error = va_arg(ap,int); - fmt = va_arg(ap,char *); -#endif + va_start(ap,fmt); (void) fflush(stdout); if (progpid > 0) fprintf(stderr, "%s %d: ", program, progpid); diff --git a/usr.bin/sup/src/snprintf.c b/usr.bin/sup/src/snprintf.c index 6ffe59b1105..768c15796bd 100644 --- a/usr.bin/sup/src/snprintf.c +++ b/usr.bin/sup/src/snprintf.c @@ -34,15 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: snprintf.c,v 1.1 1997/10/11 23:35:44 beck Exp $"; +static char rcsid[] = "$OpenBSD: snprintf.c,v 1.2 2002/02/19 19:39:39 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef _IOSTRG #define STRFLAG (_IOSTRG|_IOWRT) /* no _IOWRT: avoid stdio bug */ @@ -51,15 +47,7 @@ static char rcsid[] = "$OpenBSD: snprintf.c,v 1.1 1997/10/11 23:35:44 beck Exp $ #endif #ifdef NEED_SNPRINTF -#ifdef __STDC__ snprintf(char *str, size_t n, char const *fmt, ...) -#else -snprintf(str, n, fmt, va_alist) - char *str; - size_t n; - char *fmt; - va_dcl -#endif { int ret; va_list ap; @@ -67,11 +55,7 @@ snprintf(str, n, fmt, va_alist) if ((int)n < 1) return (EOF); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif f._flag = STRFLAG; f._base = f._ptr = str; f._cnt = n-1; diff --git a/usr.bin/sup/src/sup.h b/usr.bin/sup/src/sup.h index a1887be7ae6..d4e8512c780 100644 --- a/usr.bin/sup/src/sup.h +++ b/usr.bin/sup/src/sup.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sup.h,v 1.8 2001/05/04 22:16:16 millert Exp $ */ +/* $OpenBSD: sup.h,v 1.9 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -247,8 +247,4 @@ typedef struct tliststruct TREELIST; #define MAXCHILDREN 3 /* maximum number of children allowed to sup at the same time */ -#ifdef __STDC__ -# include <stdarg.h> -#else -# include <varargs.h> -#endif +#include <stdarg.h> diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c index 227bcec87b4..54800d9e29d 100644 --- a/usr.bin/sup/src/supcmain.c +++ b/usr.bin/sup/src/supcmain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmain.c,v 1.13 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supcmain.c,v 1.14 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -605,11 +605,7 @@ init(argc, argv) int oflags, aflags; int cwant; #ifdef MACH -#ifdef __STDC__ void (*oldsigsys)(); -#else - int (*oldsigsys)(); -#endif #endif /* MACH */ sysflag = FALSE; /* not system upgrade */ diff --git a/usr.bin/sup/src/supcmeat.c b/usr.bin/sup/src/supcmeat.c index 63b80e153b5..0a4442c6481 100644 --- a/usr.bin/sup/src/supcmeat.c +++ b/usr.bin/sup/src/supcmeat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmeat.c,v 1.15 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supcmeat.c,v 1.16 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -1501,27 +1501,12 @@ finishone(t, fv) } void -#ifdef __STDC__ done (int value,char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -done (va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - int value; - char *fmt; - - va_start(ap); - value = va_arg(ap, int); - fmt = va_arg(ap, char *); -#endif (void) netcrypt(NULL); if (fmt) @@ -1543,26 +1528,12 @@ va_dcl } void -#ifdef __STDC__ goaway (char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -goaway (va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif - (void) netcrypt (NULL); if (fmt) { vsnprintf(buf, sizeof(buf), fmt, ap); diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c index ebafbc7979e..548c516f512 100644 --- a/usr.bin/sup/src/supcmisc.c +++ b/usr.bin/sup/src/supcmisc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmisc.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supcmisc.c,v 1.13 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -276,13 +276,7 @@ ugconvert(uname, gname, uid, gid, mode) *********************************************/ void -#ifdef __STDC__ notify (char *fmt,...) /* record error message */ -#else -/*VARARGS*//*ARGSUSED*/ -notify (va_alist) /* record error message */ -va_dcl -#endif { char buf[STRINGLENGTH]; char collrelname[STRINGLENGTH]; @@ -290,14 +284,7 @@ va_dcl static FILE *noteF = NULL; /* mail program on pipe */ va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif if (fmt == NULL) { if (noteF && noteF != stdout) (void) pclose(noteF); diff --git a/usr.bin/sup/src/supfilesrv.c b/usr.bin/sup/src/supfilesrv.c index d29774fbe29..5a935914db1 100644 --- a/usr.bin/sup/src/supfilesrv.c +++ b/usr.bin/sup/src/supfilesrv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supfilesrv.c,v 1.27 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supfilesrv.c,v 1.28 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -222,11 +222,7 @@ #include <grp.h> #include <fcntl.h> #include <limits.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <sys/time.h> #include <sys/resource.h> #include <sys/wait.h> @@ -1873,25 +1869,12 @@ changeuid(namep, passwordp, fileuid, filegid) } void -#ifdef __STDC__ goaway(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -goaway(va_alist) -va_dcl -#endif { char buf[STRINGLENGTH]; va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif (void) netcrypt(NULL); vsnprintf(buf, sizeof(buf), fmt, ap); diff --git a/usr.bin/sup/src/supmsg.c b/usr.bin/sup/src/supmsg.c index c639d637792..e22ce70571d 100644 --- a/usr.bin/sup/src/supmsg.c +++ b/usr.bin/sup/src/supmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supmsg.c,v 1.9 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supmsg.c,v 1.10 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -571,27 +571,13 @@ writeone(t, v) } -#ifdef __STDC__ int msgrecv(int (*xferfile)(TREE *, va_list),...) -#else -/*VARARGS*//*ARGSUSED*/ -int -msgrecv(va_alist) -va_dcl -#endif { va_list args; int x; TREE *t = upgradeT; -#ifdef __STDC__ va_start(args,xferfile); -#else - int (*xferfile)(TREE *, void *); - - va_start(args); - xferfile = va_arg(args, int (*)(TREE *, void *)); -#endif if (server) { x = writemsg (MSGRECV); if (t == NULL) { diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c index 8c6a516e334..e70872fde80 100644 --- a/usr.bin/sup/src/supscan.c +++ b/usr.bin/sup/src/supscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supscan.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: supscan.c,v 1.13 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -115,11 +115,7 @@ #include <c.h> #include <netdb.h> #include <setjmp.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <sys/time.h> #include <sys/types.h> #include "supcdefs.h" @@ -388,25 +384,11 @@ getscancoll(filename, collname, basedir) } void -#ifdef __STDC__ goaway(char *fmt,...) -#else -/*VARARGS*//*ARGSUSED*/ -goaway(va_alist) -va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap,fmt); -#else - char *fmt; - - va_start(ap); - fmt = va_arg(ap, char *); -#endif - vfprintf(stderr, fmt, ap); va_end(ap); (void) putc ('\n', stderr); diff --git a/usr.bin/sup/src/sysent.h b/usr.bin/sup/src/sysent.h index 607431a2d3e..f6a1d5141b0 100644 --- a/usr.bin/sup/src/sysent.h +++ b/usr.bin/sup/src/sysent.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysent.h,v 1.6 2001/07/25 16:54:11 deraadt Exp $ */ +/* $OpenBSD: sysent.h,v 1.7 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -47,7 +47,6 @@ #ifndef _SYSENT_H_ #define _SYSENT_H_ 1 -#if defined(__STDC__) #if 0 #include <sys/types.h> #include <sys/time.h> @@ -133,12 +132,4 @@ extern int iwrite(int, int, int, int, void *, int); extern int pioctl(const char *, unsigned long, struct ViceIoctl *, int); extern int setpag(void); #endif -#else /* defined(__STDC__) */ -extern gid_t getgid(); -extern gid_t getegid(); -extern long gethostid(); -extern uid_t getuid(); -extern uid_t geteuid(); -extern off_t lseek(); -#endif /* __STDC__ */ #endif /* not _SYSENT_H_ */ diff --git a/usr.bin/sup/src/time.h b/usr.bin/sup/src/time.h index 304191c5a43..becfaa4c5c6 100644 --- a/usr.bin/sup/src/time.h +++ b/usr.bin/sup/src/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.3 1997/07/25 21:05:43 mickey Exp $ */ +/* $OpenBSD: time.h,v 1.4 2002/02/19 19:39:39 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -69,7 +69,6 @@ struct tm { char *tm_zone; /* timezone abbreviation */ }; -#if defined(__STDC__) || defined(c_plusplus) extern struct tm *gmtime(const time_t *); extern struct tm *localtime(const time_t *); extern time_t mktime(const struct tm *); @@ -80,17 +79,5 @@ extern char *ctime(const time_t *); extern char *timezone(int , int); extern void tzset(void); extern void tzsetwall(void); -#else -extern struct tm *gmtime(); -extern struct tm *localtime(); -extern time_t mktime(); -extern time_t time(); -extern double difftime(); -extern char *asctime(); -extern char *ctime(); -extern char *timezone(); -extern void tzset(); -extern void tzsetwall(); -#endif #endif /* _TIME_H */ diff --git a/usr.bin/sup/src/unvis.c b/usr.bin/sup/src/unvis.c index 0c6b2e7c0c4..ea1550dea4c 100644 --- a/usr.bin/sup/src/unvis.c +++ b/usr.bin/sup/src/unvis.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: unvis.c,v 1.2 2001/05/04 22:16:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: unvis.c,v 1.3 2002/02/19 19:39:39 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -57,14 +57,7 @@ static char rcsid[] = "$OpenBSD: unvis.c,v 1.2 2001/05/04 22:16:17 millert 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/usr.bin/sup/src/vis.c b/usr.bin/sup/src/vis.c index 4f772b4ced8..c4d25c75c26 100644 --- a/usr.bin/sup/src/vis.c +++ b/usr.bin/sup/src/vis.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: vis.c,v 1.2 2001/05/04 22:16:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: vis.c,v 1.3 2002/02/19 19:39:39 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -77,11 +77,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/usr.bin/sup/src/vis.h b/usr.bin/sup/src/vis.h index 89ef59651b6..69fba380491 100644 --- a/usr.bin/sup/src/vis.h +++ b/usr.bin/sup/src/vis.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.h,v 1.2 2001/05/05 15:56:04 millert Exp $ */ +/* $OpenBSD: vis.h,v 1.3 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */ /*- @@ -74,18 +74,10 @@ */ #define UNVIS_END 1 /* no more characters */ -#ifdef __STDC__ char *vis(char *, int, int, int); int strvis(char *, const char *, int); int strvisx(char *, const char *, size_t, int); int strunvis(char *, const char *); int unvis(char *, char, int *, int); -#else -char *vis(); -int strvis(); -int strvisx(); -int strunvis(); -int unvis(); -#endif #endif /* !_VIS_H_ */ diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index add50f59b9a..0e17cf0fe66 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.22 2002/02/16 21:27:54 millert Exp $ */ +/* $OpenBSD: main.c,v 1.23 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.22 2002/02/16 21:27:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.23 2002/02/19 19:39:39 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -59,6 +59,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.22 2002/02/16 21:27:54 millert Exp $ #include <unistd.h> #include <stdlib.h> #include <limits.h> +#include <stdarg.h> #include "systat.h" #include "extern.h" @@ -300,32 +301,14 @@ sigwinch(signo) gotwinch = 1; } - -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - -#ifdef __STDC__ void error(const char *fmt, ...) -#else -void -error(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; char buf[255]; int oy, ox; -#ifdef __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif + va_start(ap, fmt); if (wnd) { getyx(stdscr, oy, ox); (void) vsnprintf(buf, sizeof buf, fmt, ap); diff --git a/usr.bin/vi/common/msg.c b/usr.bin/vi/common/msg.c index dfff4e47a87..197c9769f2e 100644 --- a/usr.bin/vi/common/msg.c +++ b/usr.bin/vi/common/msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.c,v 1.9 2002/02/16 21:27:57 millert Exp $ */ +/* $OpenBSD: msg.c,v 1.10 2002/02/19 19:39:39 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -26,17 +26,12 @@ static const char sccsid[] = "@(#)msg.c 10.48 (Berkeley) 9/15/96"; #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - #include "common.h" #include "../vi/vi.h" @@ -47,15 +42,7 @@ static const char sccsid[] = "@(#)msg.c 10.48 (Berkeley) 9/15/96"; * PUBLIC: void msgq(SCR *, mtype_t, const char *, ...); */ void -#ifdef __STDC__ msgq(SCR *sp, mtype_t mt, const char *fmt, ...) -#else -msgq(sp, mt, fmt, va_alist) - SCR *sp; - mtype_t mt; - const char *fmt; - va_dcl -#endif { #ifndef NL_ARGMAX #define __NL_ARGMAX 20 /* Set to 9 by System V. */ @@ -275,11 +262,7 @@ retry: FREE_SPACE(sp, bp, blen); #endif format: /* Format the arguments into the string. */ -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif len = vsnprintf(mp, REM, fmt, ap); va_end(ap); if (len >= nlen) diff --git a/usr.bin/vi/common/util.c b/usr.bin/vi/common/util.c index 0172e887517..c4d177b2337 100644 --- a/usr.bin/vi/common/util.c +++ b/usr.bin/vi/common/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ +/* $OpenBSD: util.c,v 1.7 2002/02/19 19:39:39 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -192,11 +192,7 @@ nget_slong(valp, p, endp, base) } #ifdef DEBUG -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif /* * TRACE -- @@ -205,25 +201,14 @@ nget_slong(valp, p, endp, base) * PUBLIC: void TRACE(SCR *, const char *, ...); */ void -#ifdef __STDC__ TRACE(SCR *sp, const char *fmt, ...) -#else -TRACE(sp, fmt, va_alist) - SCR *sp; - char *fmt; - va_dcl -#endif { FILE *tfp; va_list ap; if ((tfp = sp->gp->tracefp) == NULL) return; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(tfp, fmt, ap); va_end(ap); diff --git a/usr.bin/vi/ex/ex_print.c b/usr.bin/vi/ex/ex_print.c index 1091668a0ec..4ff0bc6af34 100644 --- a/usr.bin/vi/ex/ex_print.c +++ b/usr.bin/vi/ex/ex_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_print.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ +/* $OpenBSD: ex_print.c,v 1.6 2002/02/19 19:39:39 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -21,15 +21,10 @@ static const char sccsid[] = "@(#)ex_print.c 10.18 (Berkeley) 5/12/96"; #include <bitstring.h> #include <ctype.h> #include <limits.h> +#include <stdarg.h> #include <stdio.h> #include <string.h> -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - #include "../common/common.h" static int ex_prchars(SCR *, const char *, size_t *, size_t, u_int, int); @@ -273,14 +268,7 @@ intr: *colp = col; * PUBLIC: int ex_printf(SCR *, const char *, ...); */ int -#ifdef __STDC__ ex_printf(SCR *sp, const char *fmt, ...) -#else -ex_printf(sp, fmt, va_alist) - SCR *sp; - const char *fmt; - va_dcl -#endif { EX_PRIVATE *exp; va_list ap; @@ -288,11 +276,7 @@ ex_printf(sp, fmt, va_alist) exp = EXP(sp); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif n = vsnprintf(exp->obp + exp->obp_len, sizeof(exp->obp) - exp->obp_len, fmt, ap); va_end(ap); diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c index 18dfaf49a62..29d637efe34 100644 --- a/usr.bin/xlint/lint1/emit.c +++ b/usr.bin/xlint/lint1/emit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emit.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ +/* $OpenBSD: emit.c,v 1.4 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: emit.c,v 1.2 1995/07/03 21:24:00 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: emit.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: emit.c,v 1.4 2002/02/19 19:39:39 millert Exp $"; #endif #include <stdio.h> @@ -164,18 +164,10 @@ outqchar(c) case '\r': outchar('r'); break; -#ifdef __STDC__ case '\v': -#else - case '\013': -#endif outchar('v'); break; -#ifdef __STDC__ case '\a': -#else - case '\007': -#endif outchar('a'); break; default: diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c index 435e9627922..c071db931f6 100644 --- a/usr.bin/xlint/lint1/err.c +++ b/usr.bin/xlint/lint1/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ +/* $OpenBSD: err.c,v 1.5 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: err.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: err.c,v 1.5 2002/02/19 19:39:39 millert Exp $"; #endif /* number of errors found */ @@ -43,11 +43,7 @@ int nerr; int sytxerr; #include <stdlib.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "lint1.h" @@ -424,42 +420,22 @@ vwarning(n, ap) } void -#ifdef __STDC__ error(int n, ...) -#else -error(n, va_alist) - int n; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, n); -#else - va_start(ap); -#endif verror(n, ap); va_end(ap); } void -#ifdef __STDC__ lerror(const char *msg, ...) -#else -lerror(msg, va_alist) - const char *msg; - va_dcl -#endif { va_list ap; const char *fn; -#ifdef __STDC__ va_start(ap, msg); -#else - va_start(ap); -#endif fn = basename(curr_pos.p_file); (void)fprintf(stderr, "%s(%d): lint error: ", fn, curr_pos.p_line); (void)vfprintf(stderr, msg, ap); @@ -469,42 +445,22 @@ lerror(msg, va_alist) } void -#ifdef __STDC__ warning(int n, ...) -#else -warning(n, va_alist) - int n; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, n); -#else - va_start(ap); -#endif vwarning(n, ap); va_end(ap); } void -#ifdef __STDC__ message(int n, ...) -#else -message(n, va_alist) - int n; - va_dcl -#endif { va_list ap; const char *fn; -#ifdef __STDC__ va_start(ap, n); -#else - va_start(ap); -#endif fn = basename(curr_pos.p_file); (void)printf("%s(%d): ", fn, curr_pos.p_line); (void)vprintf(msgs[n], ap); @@ -513,22 +469,12 @@ message(n, va_alist) } int -#ifdef __STDC__ gnuism(int n, ...) -#else -gnuism(n, va_alist) - int n; - va_dcl -#endif { va_list ap; int msg; -#ifdef __STDC__ va_start(ap, n); -#else - va_start(ap); -#endif if (sflag && !gflag) { verror(n, ap); msg = 1; diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h index 8de3345d7e5..241cc329048 100644 --- a/usr.bin/xlint/lint1/param.h +++ b/usr.bin/xlint/lint1/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.7 1997/03/25 17:07:40 rahnds Exp $ */ +/* $OpenBSD: param.h,v 1.8 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: param.h,v 1.6 1996/04/01 21:47:57 mark Exp $ */ /* @@ -111,23 +111,9 @@ typedef long quad_t; typedef u_long u_quad_t; #endif #endif - - -/* - * long double only in ANSI C. - */ -#ifdef __STDC__ typedef long double ldbl_t; -#else -typedef double ldbl_t; -#endif /* - * Some traditional compilers are not able to assign structures. + * Modern compilers are able to assign structures. */ -#ifdef __STDC__ #define STRUCT_ASSIGN(dest, src) (dest) = (src) -#else -#define STRUCT_ASSIGN(dest, src) (void)memcpy(&(dest), &(src), \ - sizeof (dest)); -#endif diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l index 49d2acbbea9..56a01745496 100644 --- a/usr.bin/xlint/lint1/scan.l +++ b/usr.bin/xlint/lint1/scan.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scan.l,v 1.4 2002/02/16 21:27:59 millert Exp $ */ +/* $OpenBSD: scan.l,v 1.5 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $ */ /* @@ -34,7 +34,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: scan.l,v 1.4 2002/02/16 21:27:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: scan.l,v 1.5 2002/02/19 19:39:39 millert Exp $"; #endif #include <stdlib.h> @@ -834,11 +834,7 @@ getescc(d) if (tflag) /* \a undefined in traditional C */ warning(81); -#ifdef __STDC__ return ('\a'); -#else - return ('\007'); -#endif case 'b': return ('\b'); case 'f': @@ -853,11 +849,7 @@ getescc(d) if (tflag) /* \v undefined in traditional C */ warning(264); -#ifdef __STDC__ return ('\v'); -#else - return ('\013'); -#endif case '8': case '9': /* bad octal digit %c */ warning(77, c); diff --git a/usr.bin/xlint/lint2/msg.c b/usr.bin/xlint/lint2/msg.c index b9758026a0e..0ac37f3c53f 100644 --- a/usr.bin/xlint/lint2/msg.c +++ b/usr.bin/xlint/lint2/msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ +/* $OpenBSD: msg.c,v 1.4 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: msg.c,v 1.2 1995/07/03 21:24:56 cgd Exp $ */ /* @@ -33,17 +33,13 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: msg.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: msg.c,v 1.4 2002/02/19 19:39:39 millert Exp $"; #endif #include <string.h> #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "lint2.h" @@ -71,25 +67,12 @@ static const char *msgs[] = { static const char *basename(const char *); -#ifdef __STDC__ void msg(int n, ...) { -#else -void -msg(va_alist) - va_dcl - int n; -{ -#endif va_list ap; -#ifdef __STDC__ va_start(ap, n); -#else - va_start(ap); - n = va_arg(ap, int); -#endif (void)vprintf(msgs[n], ap); (void)printf("\n"); diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c index 8c8e9e407e5..83439799396 100644 --- a/usr.bin/xlint/lint2/read.c +++ b/usr.bin/xlint/lint2/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ +/* $OpenBSD: read.c,v 1.5 2002/02/19 19:39:39 millert Exp $ */ /* $NetBSD: read.c,v 1.2 1995/07/03 21:24:59 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: read.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: read.c,v 1.5 2002/02/19 19:39:39 millert Exp $"; #endif #include <stdio.h> @@ -900,11 +900,7 @@ inpqstrg(src, epp) c = '\t'; break; case 'v': -#ifdef __STDC__ c = '\v'; -#else - c = '\013'; -#endif break; case 'b': c = '\b'; @@ -916,11 +912,7 @@ inpqstrg(src, epp) c = '\f'; break; case 'a': -#ifdef __STDC__ c = '\a'; -#else - c = '\007'; -#endif break; case '\\': c = '\\'; diff --git a/usr.sbin/afs/src/lib/roken/getopt.c b/usr.sbin/afs/src/lib/roken/getopt.c index 45fc3502345..03f9e9e2570 100644 --- a/usr.sbin/afs/src/lib/roken/getopt.c +++ b/usr.sbin/afs/src/lib/roken/getopt.c @@ -35,9 +35,6 @@ static char sccsid[] = "@(#)getopt.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef __STDC__ -#define const -#endif #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/afs/src/lwp/lwp_elf.h b/usr.sbin/afs/src/lwp/lwp_elf.h index e17f7ddaeb2..98c40c87225 100644 --- a/usr.sbin/afs/src/lwp/lwp_elf.h +++ b/usr.sbin/afs/src/lwp/lwp_elf.h @@ -1,16 +1,12 @@ /* * For common usage of elf platforms * - * $Id: lwp_elf.h,v 1.1 2000/09/11 14:41:08 art Exp $ + * $Id: lwp_elf.h,v 1.2 2002/02/19 19:39:39 millert Exp $ */ #ifndef _C_LABEL #if !defined(SYSV) && !defined(__ELF__) && !defined(AFS_SUN5_ENV) -#ifdef __STDC__ #define _C_LABEL(name) _##name -#else -#define _C_LABEL(name) _/**/name -#endif #else /* SYSV || __ELF__ || AFS_SUN5_ENV */ #define _C_LABEL(name) name #endif @@ -18,11 +14,7 @@ #ifndef ENTRY #if !defined(SYSV) && !defined(__ELF__) && !defined(AFS_SUN5_ENV) -#ifdef __STDC__ #define ENTRY(name) _##name##: -#else -#define ENTRY(name) _/**/name/**/: -#endif #else /* SYSV || __ELF__ || AFS_SUN5_ENV */ #define ENTRY(name) name: #endif diff --git a/usr.sbin/afs/src/lwp/process.m68k.S b/usr.sbin/afs/src/lwp/process.m68k.S index 96b3489d953..d5db8e7fc00 100644 --- a/usr.sbin/afs/src/lwp/process.m68k.S +++ b/usr.sbin/afs/src/lwp/process.m68k.S @@ -1,4 +1,4 @@ -/* $Id: process.m68k.S,v 1.1 2000/09/11 14:41:09 art Exp $ */ +/* $Id: process.m68k.S,v 1.2 2002/02/19 19:39:39 millert Exp $ */ /* **************************************************************************** @@ -30,11 +30,7 @@ #if !defined(__ELF__) && !defined(sun3) #define reg(x) x #else /* __ELF__ || sun3 */ -#ifdef __STDC__ #define reg(x) %##x -#else -#define reg(x) %/**/x -#endif /* __STDC__ */ #endif /* __ELF__ || sun3 */ /* diff --git a/usr.sbin/afs/src/rx/rx.h b/usr.sbin/afs/src/rx/rx.h index a8aa311ec03..2c0f7ec0253 100644 --- a/usr.sbin/afs/src/rx/rx.h +++ b/usr.sbin/afs/src/rx/rx.h @@ -1,4 +1,4 @@ -/* $Id: rx.h,v 1.3 2000/09/11 14:41:21 art Exp $ */ +/* $Id: rx.h,v 1.4 2002/02/19 19:39:39 millert Exp $ */ /* **************************************************************************** @@ -296,13 +296,8 @@ struct rx_securityClass { int refCount; }; -#if defined(__STDC__) && !defined(__HIGHC__) #define RXS_OP(obj,op,args) ((obj->ops->op_ ## op) ? \ (*(obj)->ops->op_ ## op)args : 0) -#else -#define RXS_OP(obj,op,args) ((obj->ops->op_/**/op) ? \ - (*(obj)->ops->op_/**/op)args : 0) -#endif #define RXS_Close(obj) RXS_OP(obj,Close,(obj)) #define RXS_NewConnection(obj,conn) RXS_OP(obj,NewConnection,(obj,conn)) diff --git a/usr.sbin/altq/altqd/libaltq2.c b/usr.sbin/altq/altqd/libaltq2.c index d546905b39d..f8c7a684abd 100644 --- a/usr.sbin/altq/altqd/libaltq2.c +++ b/usr.sbin/altq/altqd/libaltq2.c @@ -38,11 +38,7 @@ #include <errno.h> #include <string.h> #include <syslog.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "altq_qop.h" @@ -62,11 +58,7 @@ log_write(int severity, int syserr, const char *format, ...) { va_list ap; -#ifdef __STDC__ va_start(ap, format); -#else - va_start(ap); -#endif if (severity <= l_debug) { if (!daemonize) { diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 16e516ab684..4f0df962862 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.17 2002/02/17 19:42:35 millert Exp $ */ +/* $OpenBSD: config.h,v 1.18 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $ */ /* @@ -57,10 +57,8 @@ #include <paths.h> #endif /* ...BSD */ -#ifdef __STDC__ #include <stdlib.h> #include <unistd.h> -#endif /* These are really for MAKE_BOOTSTRAP but harmless. */ #ifndef __dead diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c index 699ae2acfba..02171718044 100644 --- a/usr.sbin/config/util.c +++ b/usr.sbin/config/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */ +/* $OpenBSD: util.c,v 1.8 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $ */ /* @@ -45,16 +45,12 @@ * from: @(#)util.c 8.1 (Berkeley) 6/6/93 */ +#include <sys/types.h> #include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif -#include <sys/types.h> #include "config.h" static void nomem(void); @@ -172,22 +168,12 @@ nvfreel(nv) * and line number. */ void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; extern const char *yyfile; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vxerror(yyfile, currentline(), fmt, ap); va_end(ap); } @@ -197,23 +183,11 @@ error(fmt, va_alist) * find out about it until later). */ void -#ifdef __STDC__ xerror(const char *file, int line, const char *fmt, ...) -#else -xerror(file, line, fmt, va_alist) - const char *file; - int line; - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vxerror(file, line, fmt, ap); va_end(ap); } @@ -239,21 +213,11 @@ vxerror(file, line, fmt, ap) * Internal error, abort. */ __dead void -#ifdef __STDC__ panic(const char *fmt, ...) -#else -panic(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fprintf(stderr, "config: panic: "); (void)vfprintf(stderr, fmt, ap); (void)putc('\n', stderr); diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index 48b4f45eea0..1a97a90fe70 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $ */ +/* $OpenBSD: common.c,v 1.16 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ #if 0 static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $"; +static const char rcsid[] = "$OpenBSD: common.c,v 1.16 2002/02/19 19:39:40 millert Exp $"; #endif #endif /* not lint */ @@ -61,6 +61,7 @@ static const char rcsid[] = "$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 mille #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdarg.h> #include "lp.h" #include "pathnames.h" @@ -405,28 +406,13 @@ delay(n) (void) select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &tdelay); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ fatal(const char *msg, ...) -#else -fatal(msg, va_alist) - char *msg; - va_dcl -#endif { extern char *__progname; va_list ap; -#ifdef __STDC__ + va_start(ap, msg); -#else - va_start(ap); -#endif if (from != host) (void)printf("%s: ", host); (void)printf("%s: ", __progname); diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index fb10a6dbcae..68b48b5f3e4 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printjob.c,v 1.30 2002/02/16 21:28:04 millert Exp $ */ +/* $OpenBSD: printjob.c,v 1.31 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $ */ /* @@ -70,6 +70,7 @@ static const char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95"; #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdarg.h> #include <ctype.h> #include "lp.h" #include "lp.local.h" @@ -1536,30 +1537,14 @@ setty() return; } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - static void -#ifdef __STDC__ pstatus(const char *msg, ...) -#else -pstatus(msg, va_alist) - char *msg; - va_dcl -#endif { int fd; char buf[BUFSIZ]; va_list ap; -#ifdef __STDC__ - va_start(ap, msg); -#else - va_start(ap); -#endif + va_start(ap, msg); umask(0); fd = open(ST, O_WRONLY|O_CREAT, 0664); if (fd < 0 || flock(fd, LOCK_EX) < 0) { diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 71021f5114b..251af2c92d0 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $ */ +/* $OpenBSD: recvjob.c,v 1.19 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95"; #else -static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $"; +static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.19 2002/02/19 19:39:40 millert Exp $"; #endif #endif /* not lint */ @@ -65,6 +65,7 @@ static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 mill #include <errno.h> #include <stdlib.h> #include <string.h> +#include <stdarg.h> #include "lp.h" #include "lp.local.h" #include "extern.h" @@ -343,28 +344,13 @@ rcleanup(signo) errno = save_errno; } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - static void -#ifdef __STDC__ frecverr(const char *msg, ...) -#else -frecverr(msg, va_alist) - char *msg; - va_dcl -#endif { extern char fromb[]; va_list ap; -#ifdef __STDC__ + va_start(ap, msg); -#else - va_start(ap); -#endif rcleanup(0); syslog(LOG_ERR, "%s", fromb); vsyslog(LOG_ERR, msg, ap); diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c index ffe94ae536f..1313552ff9c 100644 --- a/usr.sbin/map-mbone/mapper.c +++ b/usr.sbin/map-mbone/mapper.c @@ -39,11 +39,7 @@ #include <sys/time.h> #include "defs.h" #include <arpa/inet.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #define DEFAULT_TIMEOUT 2 /* How long to wait before retrying requests */ #define DEFAULT_RETRIES 1 /* How many times to ask each router */ @@ -171,33 +167,18 @@ Neighbor *find_neighbor(addr, node) * message and the current debug level. For errors of severity LOG_ERR or * worse, terminate the program. */ -#ifdef __STDC__ void log(int severity, int syserr, char *format, ...) { - va_list ap; - char fmt[100]; - - va_start(ap, format); -#else -/*VARARGS3*/ -void -log(severity, syserr, format, va_alist) - int severity, syserr; - char *format; - va_dcl -{ - va_list ap; - char fmt[100]; - - va_start(ap); -#endif + va_list ap; + char fmt[100]; switch (debug) { case 0: if (severity > LOG_WARNING) return; case 1: if (severity > LOG_NOTICE ) return; case 2: if (severity > LOG_INFO ) return; default: + va_start(ap, format); fmt[0] = '\0'; if (severity == LOG_WARNING) strcat(fmt, "warning - "); diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c index 1fbd584aeac..b49f0a9eb44 100644 --- a/usr.sbin/mrinfo/mrinfo.c +++ b/usr.sbin/mrinfo/mrinfo.c @@ -87,11 +87,7 @@ static char rcsid[] = #include <sys/time.h> #include "defs.h" #include <arpa/inet.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #define DEFAULT_TIMEOUT 4 /* How long to wait before retrying requests */ #define DEFAULT_RETRIES 3 /* How many times to ask each router */ @@ -140,26 +136,12 @@ inet_name(addr) * message and the current debug level. For errors of severity LOG_ERR or * worse, terminate the program. */ -#ifdef __STDC__ void log(int severity, int syserr, char *format, ...) { va_list ap; char fmt[100]; - va_start(ap, format); -#else -void -log(severity, syserr, format, va_alist) - int severity, syserr; - char *format; - va_dcl -{ - va_list ap; - char fmt[100]; - - va_start(ap); -#endif switch (debug) { case 0: if (severity > LOG_WARNING) @@ -175,6 +157,7 @@ log(severity, syserr, format, va_alist) if (severity == LOG_WARNING) strcat(fmt, "warning - "); strncat(fmt, format, 80); + va_start(ap, format); vfprintf(stderr, fmt, ap); va_end(ap); if (syserr == 0) diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y index 4dbeae54eff..bb805e25acc 100644 --- a/usr.sbin/mrouted/cfparse.y +++ b/usr.sbin/mrouted/cfparse.y @@ -23,12 +23,8 @@ * THE USE OF THIS SOFTWARE. */ #include <stdio.h> -#ifdef __STDC__ -#include <stdarg.h> -#else #include <string.h> -#include <varargs.h> -#endif +#include <stdarg.h> #include "defs.h" #include <netdb.h> @@ -395,7 +391,6 @@ addrmask : ADDRMASK { $$ = $1; } | ADDR { $$.addr = $1; $$.mask = 0; } ; %% -#ifdef __STDC__ static void fatal(char *fmt, ...) { @@ -403,25 +398,12 @@ fatal(char *fmt, ...) char buf[200]; va_start(ap, fmt); -#else -/*VARARGS1*/ -static void -fatal(fmt, va_alist) -char *fmt; -va_dcl -{ - va_list ap; - char buf[200]; - - va_start(ap); -#endif vsprintf(buf, fmt, ap); va_end(ap); log(LOG_ERR,0,"%s: %s near line %d", configfilename, buf, lineno); } -#ifdef __STDC__ static void warn(char *fmt, ...) { @@ -429,18 +411,6 @@ warn(char *fmt, ...) char buf[200]; va_start(ap, fmt); -#else -/*VARARGS1*/ -static void -warn(fmt, va_alist) -char *fmt; -va_dcl -{ - va_list ap; - char buf[200]; - - va_start(ap); -#endif vsprintf(buf, fmt, ap); va_end(ap); diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index b5c6150a910..e9f0befad2d 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -78,13 +78,7 @@ typedef void (*ihfunc_t)(int, fd_set *); #define DEL_ALL_ROUTES 1 /* for Deleting kernel table entries */ -/* obnoxious gcc gives an extraneous warning about this constant... */ -#if defined(__STDC__) || defined(__GNUC__) #define JAN_1970 2208988800UL /* 1970 - 1900 in seconds */ -#else -#define JAN_1970 2208988800L /* 1970 - 1900 in seconds */ -#define const /**/ -#endif #ifdef RSRR #define BIT_ZERO(X) ((X) = 0) diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c index 756a35cfe9e..edebd6f50e1 100644 --- a/usr.sbin/mrouted/main.c +++ b/usr.sbin/mrouted/main.c @@ -20,11 +20,7 @@ #include "defs.h" -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <fcntl.h> #include <util.h> @@ -34,7 +30,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: main.c,v 1.8 2002/02/16 21:28:05 millert Exp $"; + "@(#) $Id: main.c,v 1.9 2002/02/19 19:39:40 millert Exp $"; #endif extern char *configfilename; @@ -259,14 +255,12 @@ usage: fprintf(stderr, rsrr_init(); #endif /* RSRR */ -#if defined(__STDC__) || defined(__GNUC__) /* * Allow cleanup if unexpected exit. Apparently some architectures * have a kernel bug where closing the socket doesn't do an * ip_mrouter_done(), so we attempt to do it on exit. */ atexit(cleanup); -#endif if (debug) fprintf(stderr, "pruning %s\n", pruning ? "on" : "off"); @@ -638,7 +632,6 @@ resetlogging(arg) * according to the severity of the message and the current debug level. * For errors of severity LOG_ERR or worse, terminate the program. */ -#ifdef __STDC__ void log(int severity, int syserr, char *format, ...) { @@ -651,24 +644,6 @@ log(int severity, int syserr, char *format, ...) time_t t; va_start(ap, format); -#else -/*VARARGS3*/ -void -log(severity, syserr, format, va_alist) - int severity, syserr; - char *format; - va_dcl -{ - va_list ap; - static char fmt[211] = "warning - "; - char *msg; - char tbuf[20]; - struct timeval now; - struct tm *thyme; - time_t t; - - va_start(ap); -#endif vsprintf(&fmt[10], format, ap); va_end(ap); msg = (severity == LOG_WARNING) ? fmt : &fmt[10]; diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c index d0e5e9a140a..a224fe4ea4e 100644 --- a/usr.sbin/mtrace/mtrace.c +++ b/usr.sbin/mtrace/mtrace.c @@ -52,7 +52,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: mtrace.c,v 1.11 2002/02/17 19:42:37 millert Exp $"; + "@(#) $Id: mtrace.c,v 1.12 2002/02/19 19:39:40 millert Exp $"; #endif #include <netdb.h> @@ -63,11 +63,7 @@ static char rcsid[] = #include <sys/ioctl.h> #include "defs.h" #include <arpa/inet.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef SUNOS5 #include <sys/systeminfo.h> #endif @@ -1675,27 +1671,11 @@ check_vif_state() * of the message and the current debug level. For errors of severity * LOG_ERR or worse, terminate the program. */ -#ifdef __STDC__ void log(int severity, int syserr, char *format, ...) { - va_list ap; - char fmt[100]; - - va_start(ap, format); -#else -/*VARARGS3*/ -void -log(severity, syserr, format, va_alist) - int severity, syserr; - char *format; - va_dcl -{ - va_list ap; - char fmt[100]; - - va_start(ap); -#endif + va_list ap; + char fmt[100]; switch (debug) { case 0: if (severity > LOG_WARNING) return; @@ -1705,6 +1685,7 @@ log(severity, syserr, format, va_alist) fmt[0] = '\0'; if (severity == LOG_WARNING) strcat(fmt, "warning - "); strncat(fmt, format, 80); + va_start(ap, format); vfprintf(stderr, fmt, ap); va_end(ap); if (syserr == 0) diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 8160a844997..54c4fa4fb3d 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -1,5 +1,5 @@ /* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */ -/* $OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $ */ +/* $OpenBSD: create.c,v 1.15 2002/02/19 19:39:40 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $"; +static const char rcsid[] = "$OpenBSD: create.c,v 1.15 2002/02/19 19:39:40 millert Exp $"; #endif #endif /* not lint */ @@ -53,6 +53,7 @@ static const char rcsid[] = "$OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 mille #include <errno.h> #include <unistd.h> #include <stdio.h> +#include <stdarg.h> #include <md5.h> #include <sha1.h> #include <rmd160.h> @@ -354,30 +355,13 @@ dsort(a, b) return (strcmp((*a)->fts_name, (*b)->fts_name)); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ output(int indent, int *offset, const char *fmt, ...) -#else -output(indent, offset, fmt, va_alist) - int indent; - int *offset; - char *fmt; - va_dcl -#endif { va_list ap; char buf[1024]; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index 32c2ab6907b..66c5d0ad8c1 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.10 2002/02/16 21:28:05 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.11 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: misc.c,v 1.4 1995/03/07 21:26:23 cgd Exp $ */ /*- @@ -40,6 +40,7 @@ #include <sys/stat.h> #include <fts.h> #include <stdio.h> +#include <stdarg.h> #include "mtree.h" #include "extern.h" @@ -100,27 +101,12 @@ keycompare(a, b) return (strcmp(((KEY *)a)->name, ((KEY *)b)->name)); } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif (void)fflush(NULL); (void)fprintf(stderr, "\nmtree: "); (void)vfprintf(stderr, fmt, ap); diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c index e02bb725f5b..2e15eb6d3de 100644 --- a/usr.sbin/pppd/chat/chat.c +++ b/usr.sbin/pppd/chat/chat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $ */ +/* $OpenBSD: chat.c,v 1.16 2002/02/19 19:39:40 millert Exp $ */ /* * Chat -- a program for automatic session establishment (i.e. dial @@ -83,7 +83,7 @@ #if 0 static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: chat.c,v 1.16 2002/02/19 19:39:40 millert Exp $"; #endif #endif @@ -99,6 +99,7 @@ static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $ #include <sys/types.h> #include <sys/stat.h> #include <syslog.h> +#include <stdarg.h> #ifndef TERMIO #undef TERMIOS @@ -118,17 +119,6 @@ static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $ #define SIGTYPE void #endif -#undef __V - -#ifdef __STDC__ -#include <stdarg.h> -#define __V(x) x -#else -#include <varargs.h> -#define __V(x) (va_alist) va_dcl -#define const -#endif - #ifndef O_NONBLOCK #define O_NONBLOCK O_NDELAY #endif @@ -446,18 +436,11 @@ char line[1024]; /* * Send a message to syslog and/or stderr. */ -void logf __V((const char *fmt, ...)) +void logf(const char *fmt, ...) { va_list args; -#ifdef __STDC__ va_start(args, fmt); -#else - char *fmt; - va_start(args); - fmt = va_arg(args, char *); -#endif - vfmtmsg(line, sizeof(line), fmt, args); va_end(args); if (to_log) @@ -470,20 +453,11 @@ void logf __V((const char *fmt, ...)) * Print an error message and terminate. */ -void fatal __V((int code, const char *fmt, ...)) +void fatal(int code, const char *fmt, ...) { va_list args; -#ifdef __STDC__ va_start(args, fmt); -#else - int code; - char *fmt; - va_start(args); - code = va_arg(args, int); - fmt = va_arg(args, char *); -#endif - vfmtmsg(line, sizeof(line), fmt, args); if (to_log) syslog(LOG_ERR, "%s", line); diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index b1598b35a1b..338df8ab558 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $ */ +/* $OpenBSD: main.c,v 1.34 2002/02/19 19:39:40 millert Exp $ */ /* * main.c - Point-to-Point Protocol main module @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.34 2002/02/19 19:39:40 millert Exp $"; #endif #endif @@ -1299,21 +1299,13 @@ format_packet(p, len, printer, arg) } static void -pr_log __V((void *arg, char *fmt, ...)) +pr_log(void *arg, char *fmt, ...) { int n; va_list pvar; char buf[256]; -#ifdef __STDC__ va_start(pvar, fmt); -#else - void *arg; - char *fmt; - va_start(pvar); - arg = va_arg(pvar, void *); - fmt = va_arg(pvar, char *); -#endif n = vfmtmsg(buf, sizeof(buf), fmt, pvar); va_end(pvar); @@ -1384,22 +1376,12 @@ novm(msg) * Returns the number of chars put into buf. */ int -fmtmsg __V((char *buf, int buflen, char *fmt, ...)) +fmtmsg(char *buf, int buflen, char *fmt, ...) { va_list args; int n; -#ifdef __STDC__ va_start(args, fmt); -#else - char *buf; - int buflen; - char *fmt; - va_start(args); - buf = va_arg(args, char *); - buflen = va_arg(args, int); - fmt = va_arg(args, char *); -#endif n = vfmtmsg(buf, buflen, fmt, args); va_end(args); return n; diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index e5fb33cb15d..c1472ec7e21 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $ */ +/* $OpenBSD: options.c,v 1.16 2002/02/19 19:39:40 millert Exp $ */ /* * options.c - handles option processing for PPP. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.16 2002/02/19 19:39:40 millert Exp $"; #endif #endif @@ -722,18 +722,12 @@ options_for_tty() * stderr if phase == PHASE_INITIALIZE. */ void -option_error __V((char *fmt, ...)) +option_error(char *fmt, ...) { va_list args; char buf[256]; -#ifdef __STDC__ va_start(args, fmt); -#else - char *fmt; - va_start(args); - fmt = va_arg(args, char *); -#endif vfmtmsg(buf, sizeof(buf), fmt, args); va_end(args); if (phase == PHASE_INITIALIZE) diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index 708efac92fa..a478e85a2cb 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pppd.h,v 1.12 2002/02/17 19:42:38 millert Exp $ */ +/* $OpenBSD: pppd.h,v 1.13 2002/02/19 19:39:40 millert Exp $ */ /* * pppd.h - PPP daemon global declarations. @@ -29,20 +29,12 @@ #define __PPPD_H__ #include <stdio.h> /* for FILE */ +#include <stdarg.h> #include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */ #include <sys/types.h> /* for u_int32_t, if defined */ #include <sys/time.h> /* for struct timeval */ #include <net/ppp_defs.h> -#ifdef __STDC__ -#include <stdarg.h> -#define __V(x) x -#else -#include <varargs.h> -#define __V(x) (va_alist) va_dcl -#define const -#endif - /* * Limits. */ diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index bbe7fa7f290..ffc2815b1b5 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $ */ +/* $OpenBSD: rarpd.c,v 1.34 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $ */ /* @@ -28,7 +28,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $"; +static char rcsid[] = "$OpenBSD: rarpd.c,v 1.34 2002/02/19 19:39:40 millert Exp $"; #endif @@ -43,6 +43,7 @@ static char rcsid[] = "$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp #include <stdlib.h> #include <syslog.h> #include <string.h> +#include <stdarg.h> #include <sys/types.h> #include <unistd.h> #include <sys/time.h> @@ -974,42 +975,22 @@ ipaddrtonetmask(addr) /* NOTREACHED */ } -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - void -#ifdef __STDC__ err(int fatal, const char *fmt,...) -#else -err(fmt, va_alist) - int fatal; - char *fmt; -va_dcl -#endif { va_list ap; + if (dflag) { if (fatal) (void) fprintf(stderr, "rarpd: error: "); else (void) fprintf(stderr, "rarpd: warning: "); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) vfprintf(stderr, fmt, ap); va_end(ap); (void) fprintf(stderr, "\n"); } -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vsyslog(LOG_ERR, fmt, ap); va_end(ap); if (fatal) { @@ -1019,22 +1000,12 @@ va_dcl } void -#ifdef __STDC__ debug(const char *fmt,...) -#else -debug(fmt, va_alist) - char *fmt; -va_dcl -#endif { va_list ap; if (dflag) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void) fprintf(stderr, "rarpd: "); (void) vfprintf(stderr, fmt, ap); va_end(ap); diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c index 50359c9c98d..621565a3638 100644 --- a/usr.sbin/rdate/rdate.c +++ b/usr.sbin/rdate/rdate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdate.c,v 1.12 2001/08/15 19:39:09 stevesk Exp $ */ +/* $OpenBSD: rdate.c,v 1.13 2002/02/19 19:39:40 millert Exp $ */ /* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */ /* @@ -42,7 +42,7 @@ #if 0 from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: rdate.c,v 1.12 2001/08/15 19:39:09 stevesk Exp $"; +static char rcsid[] = "$OpenBSD: rdate.c,v 1.13 2002/02/19 19:39:40 millert Exp $"; #endif #endif /* lint */ @@ -61,11 +61,7 @@ static char rcsid[] = "$OpenBSD: rdate.c,v 1.12 2001/08/15 19:39:09 stevesk Exp #include <time.h> /* seconds from midnight Jan 1900 - 1970 */ -#ifdef __STDC__ #define DIFFERENCE 2208988800UL -#else -#define DIFFERENCE 2208988800 -#endif extern char *__progname; diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 11fd8399567..a4ee1f83ea6 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $ */ +/* $OpenBSD: route6d.c,v 1.25 2002/02/19 19:39:40 millert Exp $ */ /* $KAME: route6d.c,v 1.73 2001/09/05 01:12:34 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #if 0 -static char _rcsid[] = "$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $"; +static char _rcsid[] = "$OpenBSD: route6d.c,v 1.25 2002/02/19 19:39:40 millert Exp $"; #endif #include <stdio.h> @@ -41,11 +41,7 @@ static char _rcsid[] = "$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert E #include <stdlib.h> #include <string.h> #include <signal.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <syslog.h> #include <stddef.h> #include <errno.h> @@ -3301,22 +3297,12 @@ ripsuptrig() } void -#ifdef __STDC__ fatal(const char *fmt, ...) -#else -fatal(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; char buf[1024]; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vsnprintf(buf, sizeof(buf), fmt, ap); perror(buf); syslog(LOG_ERR, "%s: %s", buf, strerror(errno)); @@ -3325,33 +3311,18 @@ fatal(fmt, va_alist) } void -#ifdef __STDC__ tracet(int level, const char *fmt, ...) -#else -tracet(level, fmt, va_alist) - int level; - char *fmt; - va_dcl -#endif { va_list ap; if (level <= dflag) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif fprintf(stderr, "%s: ", hms()); vfprintf(stderr, fmt, ap); va_end(ap); } if (dflag) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (level > 0) vsyslog(LOG_DEBUG, fmt, ap); else @@ -3361,32 +3332,17 @@ tracet(level, fmt, va_alist) } void -#ifdef __STDC__ trace(int level, const char *fmt, ...) -#else -trace(level, fmt, va_alist) - int level; - char *fmt; - va_dcl -#endif { va_list ap; if (level <= dflag) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vfprintf(stderr, fmt, ap); va_end(ap); } if (dflag) { -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (level > 0) vsyslog(LOG_DEBUG, fmt, ap); else diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index 2e91c2f7e58..ee86140475a 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsold.c,v 1.16 2002/02/17 19:42:39 millert Exp $ */ +/* $OpenBSD: rtsold.c,v 1.17 2002/02/19 19:39:40 millert Exp $ */ /* $KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $ */ /* @@ -716,15 +716,7 @@ usage(char *progname) } void -#if __STDC__ warnmsg(int priority, const char *func, const char *msg, ...) -#else -warnmsg(priority, func, msg, va_alist) - int priority; - const char *func; - const char *msg; - va_dcl -#endif { va_list ap; char buf[BUFSIZ]; diff --git a/usr.sbin/tcpdump/addrtoname.c b/usr.sbin/tcpdump/addrtoname.c index 38800f5c4db..227af7589cd 100644 --- a/usr.sbin/tcpdump/addrtoname.c +++ b/usr.sbin/tcpdump/addrtoname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrtoname.c,v 1.18 2001/11/03 12:09:12 ho Exp $ */ +/* $OpenBSD: addrtoname.c,v 1.19 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -25,17 +25,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/addrtoname.c,v 1.18 2001/11/03 12:09:12 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/addrtoname.c,v 1.19 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h index 78a2d0658f5..005251af9ea 100644 --- a/usr.sbin/tcpdump/interface.h +++ b/usr.sbin/tcpdump/interface.h @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.h,v 1.30 2002/01/23 23:32:20 mickey Exp $ */ +/* $OpenBSD: interface.h,v 1.31 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -20,7 +20,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.30 2002/01/23 23:32:20 mickey Exp $ (LBL) + * @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/interface.h,v 1.31 2002/02/19 19:39:40 millert Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -136,10 +136,8 @@ extern const u_char *snapend; /* Bail if "var" was not captured */ #define TCHECK(var) TCHECK2(var, sizeof(var)) -#ifdef __STDC__ struct timeval; struct bpf_timeval; -#endif extern void ts_print(const struct bpf_timeval *); @@ -153,11 +151,9 @@ extern void safeputchar(int); extern void wrapup(int); -#ifdef __STDC__ extern __dead void error(const char *, ...) __attribute__((volatile, format (printf, 1, 2))); extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2))); -#endif extern char *read_infile(char *); extern char *copy_argv(char **); @@ -170,9 +166,7 @@ extern char *dnnum_string(u_short); /* The printer routines. */ -#ifdef __STDC__ struct pcap_pkthdr; -#endif extern int ether_encap_print(u_short, const u_char *, u_int, u_int); extern int llc_print(const u_char *, u_int, u_int, const u_char *, diff --git a/usr.sbin/tcpdump/print-arp.c b/usr.sbin/tcpdump/print-arp.c index 4129b714a29..3c106cbee10 100644 --- a/usr.sbin/tcpdump/print-arp.c +++ b/usr.sbin/tcpdump/print-arp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-arp.c,v 1.9 2000/10/03 14:31:56 ho Exp $ */ +/* $OpenBSD: print-arp.c,v 1.10 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -23,17 +23,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-arp.c,v 1.9 2000/10/03 14:31:56 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-arp.c,v 1.10 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c index f8e545c1821..ac391b226dc 100644 --- a/usr.sbin/tcpdump/print-atalk.c +++ b/usr.sbin/tcpdump/print-atalk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-atalk.c,v 1.18 2001/11/06 03:11:40 deraadt Exp $ */ +/* $OpenBSD: print-atalk.c,v 1.19 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -25,17 +25,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atalk.c,v 1.18 2001/11/06 03:11:40 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atalk.c,v 1.19 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-atm.c b/usr.sbin/tcpdump/print-atm.c index e748c9e27b5..07c6d37c466 100644 --- a/usr.sbin/tcpdump/print-atm.c +++ b/usr.sbin/tcpdump/print-atm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-atm.c,v 1.6 2000/10/03 14:31:56 ho Exp $ */ +/* $OpenBSD: print-atm.c,v 1.7 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996, 1997 @@ -22,17 +22,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atm.c,v 1.6 2000/10/03 14:31:56 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-atm.c,v 1.7 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-bootp.c b/usr.sbin/tcpdump/print-bootp.c index 05c6c7b4103..b4a361f99f6 100644 --- a/usr.sbin/tcpdump/print-bootp.c +++ b/usr.sbin/tcpdump/print-bootp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-bootp.c,v 1.11 2000/10/03 14:31:56 ho Exp $ */ +/* $OpenBSD: print-bootp.c,v 1.12 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -24,17 +24,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-bootp.c,v 1.11 2000/10/03 14:31:56 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-bootp.c,v 1.12 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-decnet.c b/usr.sbin/tcpdump/print-decnet.c index c7224a80268..567a9c7de81 100644 --- a/usr.sbin/tcpdump/print-decnet.c +++ b/usr.sbin/tcpdump/print-decnet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-decnet.c,v 1.9 2001/11/06 03:11:40 deraadt Exp $ */ +/* $OpenBSD: print-decnet.c,v 1.10 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 @@ -23,17 +23,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-decnet.c,v 1.9 2001/11/06 03:11:40 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-decnet.c,v 1.10 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #ifdef HAVE_LIBDNET diff --git a/usr.sbin/tcpdump/print-dhcp6.c b/usr.sbin/tcpdump/print-dhcp6.c index c309c0ce593..d9bf4a4fe26 100644 --- a/usr.sbin/tcpdump/print-dhcp6.c +++ b/usr.sbin/tcpdump/print-dhcp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $ */ +/* $OpenBSD: print-dhcp6.c,v 1.5 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (C) 1998 and 1999 WIDE Project. @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.5 2002/02/19 19:39:40 millert Exp $"; #endif #ifdef INET6 @@ -40,10 +40,8 @@ static const char rcsid[] = #include <sys/time.h> #include <sys/socket.h> -#if __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c index 07d457ea570..662ce520a5d 100644 --- a/usr.sbin/tcpdump/print-enc.c +++ b/usr.sbin/tcpdump/print-enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-enc.c,v 1.6 2000/10/03 14:31:57 ho Exp $ */ +/* $OpenBSD: print-enc.c,v 1.7 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-enc.c,v 1.6 2000/10/03 14:31:57 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-enc.c,v 1.7 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -33,9 +33,7 @@ static const char rcsid[] = #include <sys/ioctl.h> #include <sys/mbuf.h> -#ifdef __STDC__ struct rtentry; -#endif #include <net/if.h> #include <netinet/ip_ipsp.h> #include <net/if_enc.h> diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c index ac0aea607ca..e618bc97d5e 100644 --- a/usr.sbin/tcpdump/print-ether.c +++ b/usr.sbin/tcpdump/print-ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ether.c,v 1.17 2001/02/05 15:18:47 jason Exp $ */ +/* $OpenBSD: print-ether.c,v 1.18 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -22,17 +22,15 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ether.c,v 1.17 2001/02/05 15:18:47 jason Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ether.c,v 1.18 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-fddi.c b/usr.sbin/tcpdump/print-fddi.c index ba6bd91978e..de20c64c93b 100644 --- a/usr.sbin/tcpdump/print-fddi.c +++ b/usr.sbin/tcpdump/print-fddi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-fddi.c,v 1.11 2000/10/03 14:31:57 ho Exp $ */ +/* $OpenBSD: print-fddi.c,v 1.12 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-fddi.c,v 1.11 2000/10/03 14:31:57 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-fddi.c,v 1.12 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #ifdef HAVE_FDDI @@ -33,10 +33,8 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-icmp.c b/usr.sbin/tcpdump/print-icmp.c index dbc1e32fc2e..ba8becbd04f 100644 --- a/usr.sbin/tcpdump/print-icmp.c +++ b/usr.sbin/tcpdump/print-icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-icmp.c,v 1.13 2001/11/07 18:48:16 deraadt Exp $ */ +/* $OpenBSD: print-icmp.c,v 1.14 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 @@ -23,17 +23,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-icmp.c,v 1.13 2001/11/07 18:48:16 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-icmp.c,v 1.14 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c index 31662015da8..510fb0f6ee1 100644 --- a/usr.sbin/tcpdump/print-ike.c +++ b/usr.sbin/tcpdump/print-ike.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ike.c,v 1.9 2001/11/12 18:04:08 deraadt Exp $ */ +/* $OpenBSD: print-ike.c,v 1.10 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -29,18 +29,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ike.c,v 1.9 2001/11/12 18:04:08 deraadt Exp $ (XXX)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ike.c,v 1.10 2002/02/19 19:39:40 millert Exp $ (XXX)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif - #include <net/if.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c index 906ecf5025a..156976d0d82 100644 --- a/usr.sbin/tcpdump/print-ip6.c +++ b/usr.sbin/tcpdump/print-ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip6.c,v 1.2 2001/11/07 07:40:13 deraadt Exp $ */ +/* $OpenBSD: print-ip6.c,v 1.3 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 @@ -42,9 +42,7 @@ static const char rcsid[] = #include <netinet/tcp.h> #include <stdio.h> -#ifdef __STDC__ #include <stdlib.h> -#endif #include <unistd.h> #include "interface.h" diff --git a/usr.sbin/tcpdump/print-ipx.c b/usr.sbin/tcpdump/print-ipx.c index 5b3208f55c8..e0e51a49deb 100644 --- a/usr.sbin/tcpdump/print-ipx.c +++ b/usr.sbin/tcpdump/print-ipx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ipx.c,v 1.8 2001/11/06 03:11:40 deraadt Exp $ */ +/* $OpenBSD: print-ipx.c,v 1.9 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ipx.c,v 1.8 2001/11/06 03:11:40 deraadt Exp $"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ipx.c,v 1.9 2002/02/19 19:39:40 millert Exp $"; #endif #include <sys/param.h> @@ -41,10 +41,8 @@ static const char rcsid[] = #include <netinet/udp_var.h> #include <netinet/tcp.h> -#ifdef __STDC__ -#include <stdlib.h> -#endif #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "interface.h" diff --git a/usr.sbin/tcpdump/print-isoclns.c b/usr.sbin/tcpdump/print-isoclns.c index 01d48926891..9b9d8b02f03 100644 --- a/usr.sbin/tcpdump/print-isoclns.c +++ b/usr.sbin/tcpdump/print-isoclns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-isoclns.c,v 1.9 2000/10/03 14:31:57 ho Exp $ */ +/* $OpenBSD: print-isoclns.c,v 1.10 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996 @@ -25,17 +25,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-isoclns.c,v 1.9 2000/10/03 14:31:57 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-isoclns.c,v 1.10 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-netbios.c b/usr.sbin/tcpdump/print-netbios.c index acccbda321a..1c49c447f60 100644 --- a/usr.sbin/tcpdump/print-netbios.c +++ b/usr.sbin/tcpdump/print-netbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-netbios.c,v 1.4 2000/10/03 14:31:57 ho Exp $ */ +/* $OpenBSD: print-netbios.c,v 1.5 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-netbios.c,v 1.4 2000/10/03 14:31:57 ho Exp $"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-netbios.c,v 1.5 2002/02/19 19:39:40 millert Exp $"; #endif #include <sys/param.h> @@ -40,10 +40,8 @@ static const char rcsid[] = #include <netinet/udp_var.h> #include <netinet/tcp.h> -#ifdef __STDC__ -#include <stdlib.h> -#endif #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "interface.h" diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c index d5632ae37e8..3558d7e0729 100644 --- a/usr.sbin/tcpdump/print-nfs.c +++ b/usr.sbin/tcpdump/print-nfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-nfs.c,v 1.10 2001/11/07 18:48:16 deraadt Exp $ */ +/* $OpenBSD: print-nfs.c,v 1.11 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -30,10 +30,8 @@ static const char rcsid[] = #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-ntp.c b/usr.sbin/tcpdump/print-ntp.c index 51a56c9fda6..161c5e474ec 100644 --- a/usr.sbin/tcpdump/print-ntp.c +++ b/usr.sbin/tcpdump/print-ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ntp.c,v 1.10 2001/11/07 18:48:16 deraadt Exp $ */ +/* $OpenBSD: print-ntp.c,v 1.11 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -27,17 +27,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ntp.c,v 1.10 2001/11/07 18:48:16 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ntp.c,v 1.11 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-null.c b/usr.sbin/tcpdump/print-null.c index 224da867a5d..39f2cbee91b 100644 --- a/usr.sbin/tcpdump/print-null.c +++ b/usr.sbin/tcpdump/print-null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-null.c,v 1.15 2002/01/23 23:32:20 mickey Exp $ */ +/* $OpenBSD: print-null.c,v 1.16 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-null.c,v 1.15 2002/01/23 23:32:20 mickey Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-null.c,v 1.16 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -32,10 +32,8 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c index 66f9a09d6e7..2b7f79efdee 100644 --- a/usr.sbin/tcpdump/print-pflog.c +++ b/usr.sbin/tcpdump/print-pflog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-pflog.c,v 1.9 2001/09/18 14:52:53 jakob Exp $ */ +/* $OpenBSD: print-pflog.c,v 1.10 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-pflog.c,v 1.9 2001/09/18 14:52:53 jakob Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-pflog.c,v 1.10 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -33,9 +33,7 @@ static const char rcsid[] = #include <sys/ioctl.h> #include <sys/mbuf.h> -#ifdef __STDC__ struct rtentry; -#endif #include <net/if.h> #include <net/if_pflog.h> diff --git a/usr.sbin/tcpdump/print-ppp.c b/usr.sbin/tcpdump/print-ppp.c index b32859e7e3c..697c2523cad 100644 --- a/usr.sbin/tcpdump/print-ppp.c +++ b/usr.sbin/tcpdump/print-ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ppp.c,v 1.13 2000/10/03 14:21:56 ho Exp $ */ +/* $OpenBSD: print-ppp.c,v 1.14 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ppp.c,v 1.13 2000/10/03 14:21:56 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ppp.c,v 1.14 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #ifdef PPP @@ -33,10 +33,8 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-raw.c b/usr.sbin/tcpdump/print-raw.c index 17ae7a518c2..2a1c01a1a5e 100644 --- a/usr.sbin/tcpdump/print-raw.c +++ b/usr.sbin/tcpdump/print-raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-raw.c,v 1.3 2000/10/03 14:31:58 ho Exp $ */ +/* $OpenBSD: print-raw.c,v 1.4 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1996 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-raw.c,v 1.3 2000/10/03 14:31:58 ho Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-raw.c,v 1.4 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> @@ -32,10 +32,8 @@ static const char rcsid[] = #include <sys/file.h> #include <sys/ioctl.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-sl.c b/usr.sbin/tcpdump/print-sl.c index cfa5d558015..7db4cdc6042 100644 --- a/usr.sbin/tcpdump/print-sl.c +++ b/usr.sbin/tcpdump/print-sl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-sl.c,v 1.11 2000/10/13 08:32:17 jakob Exp $ */ +/* $OpenBSD: print-sl.c,v 1.12 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1989, 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sl.c,v 1.11 2000/10/13 08:32:17 jakob Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sl.c,v 1.12 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #ifdef HAVE_NET_SLIP_H @@ -35,9 +35,7 @@ static const char rcsid[] = #include <sys/mbuf.h> #include <sys/socket.h> -#ifdef __STDC__ struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-stp.c b/usr.sbin/tcpdump/print-stp.c index c038ae761c5..4fd6237bf85 100644 --- a/usr.sbin/tcpdump/print-stp.c +++ b/usr.sbin/tcpdump/print-stp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-stp.c,v 1.1 2000/10/19 16:31:42 jason Exp $ */ +/* $OpenBSD: print-stp.c,v 1.2 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -41,10 +41,8 @@ #include <sys/file.h> #include <sys/ioctl.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/print-sunrpc.c index 51a539ad401..961c3bc1e37 100644 --- a/usr.sbin/tcpdump/print-sunrpc.c +++ b/usr.sbin/tcpdump/print-sunrpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-sunrpc.c,v 1.12 2001/11/07 18:48:16 deraadt Exp $ */ +/* $OpenBSD: print-sunrpc.c,v 1.13 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996 @@ -23,17 +23,15 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sunrpc.c,v 1.12 2001/11/07 18:48:16 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-sunrpc.c,v 1.13 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#ifdef __STDC__ struct mbuf; struct rtentry; -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c index f510451870c..98c6bc48492 100644 --- a/usr.sbin/tcpdump/util.c +++ b/usr.sbin/tcpdump/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.14 2001/11/06 03:11:40 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.15 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.14 2001/11/06 03:11:40 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.15 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/types.h> @@ -38,11 +38,7 @@ static const char rcsid[] = #endif #include <pcap.h> #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <stdlib.h> #include <string.h> #ifdef TIME_WITH_SYS_TIME @@ -200,22 +196,12 @@ tok2str(register const struct tok *lp, register const char *fmt, /* VARARGS */ __dead void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; (void)fprintf(stderr, "%s: ", program_name); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(stderr, fmt, ap); va_end(ap); if (*fmt) { @@ -229,22 +215,12 @@ error(fmt, va_alist) /* VARARGS */ void -#ifdef __STDC__ warning(const char *fmt, ...) -#else -warning(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; (void)fprintf(stderr, "%s: WARNING: ", program_name); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(stderr, fmt, ap); va_end(ap); if (*fmt) { diff --git a/usr.sbin/ypserv/common/yplog.c b/usr.sbin/ypserv/common/yplog.c index 703e0daeb49..a6647fdd64e 100644 --- a/usr.sbin/ypserv/common/yplog.c +++ b/usr.sbin/ypserv/common/yplog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yplog.c,v 1.5 1997/08/09 22:44:04 maja Exp $ */ +/* $OpenBSD: yplog.c,v 1.6 2002/02/19 19:39:41 millert Exp $ */ /* * Copyright (c) 1996 Charles D. Cranor @@ -40,11 +40,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include "yplog.h" static FILE *logfp = NULL; /* the log file */ @@ -55,21 +51,11 @@ static FILE *logfp = NULL; /* the log file */ */ void -#ifdef __STDC__ yplog(const char *fmt, ...) -#else -yplog(fmt, va_alist) - char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vyplog(fmt, ap); va_end(ap); } diff --git a/usr.sbin/ypserv/yppush/yppush.h b/usr.sbin/ypserv/yppush/yppush.h index 9414d8073a4..5114d0f403b 100644 --- a/usr.sbin/ypserv/yppush/yppush.h +++ b/usr.sbin/ypserv/yppush/yppush.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yppush.h,v 1.4 2000/10/12 09:47:27 deraadt Exp $ */ +/* $OpenBSD: yppush.h,v 1.5 2002/02/19 19:39:41 millert Exp $ */ /* * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se> @@ -36,7 +36,6 @@ #include <rpc/rpc.h> - enum yppush_status { YPPUSH_SUCC = 1, YPPUSH_AGE = 2, @@ -56,57 +55,26 @@ enum yppush_status { YPPUSH_REFUSED = -14, }; typedef enum yppush_status yppush_status; -#ifdef __cplusplus -extern "C" bool_t xdr_yppush_status(XDR *, yppush_status*); -#elif defined(__STDC__) -extern bool_t xdr_yppush_status(XDR *, yppush_status*); -#else /* Old Style C */ -bool_t xdr_yppush_status(); -#endif /* Old Style C */ - struct yppushresp_xfr { u_int transid; yppush_status status; }; typedef struct yppushresp_xfr yppushresp_xfr; -#ifdef __cplusplus -extern "C" bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*); -#elif defined(__STDC__) -extern bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*); -#else /* Old Style C */ -bool_t xdr_yppushresp_xfr(); -#endif /* Old Style C */ - - -#define YPPUSH_XFRRESPPROG ((u_long)0x40000000) -#define YPPUSH_XFRRESPVERS ((u_long)1) - -#ifdef __cplusplus -#define YPPUSHPROC_NULL ((u_long)0) -extern "C" void * yppushproc_null_1(void *, CLIENT *); -extern "C" void * yppushproc_null_1_svc(void *, struct svc_req *); -#define YPPUSHPROC_XFRRESP ((u_long)1) -extern "C" void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *); -extern "C" void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *); - -#elif defined(__STDC__) -#define YPPUSHPROC_NULL ((u_long)0) -extern void * yppushproc_null_1(void *, CLIENT *); -extern void * yppushproc_null_1_svc(void *, struct svc_req *); -#define YPPUSHPROC_XFRRESP ((u_long)1) -extern void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *); -extern void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *); -#else /* Old Style C */ -#define YPPUSHPROC_NULL ((u_long)0) -extern void * yppushproc_null_1(); -extern void * yppushproc_null_1_svc(); -#define YPPUSHPROC_XFRRESP ((u_long)1) -extern void * yppushproc_xfrresp_1(); -extern void * yppushproc_xfrresp_1_svc(); -#endif /* Old Style C */ +#define YPPUSH_XFRRESPPROG ((u_long)0x40000000) +#define YPPUSH_XFRRESPVERS ((u_long)1) +#define YPPUSHPROC_NULL ((u_long)0) +#define YPPUSHPROC_XFRRESP ((u_long)1) -char * yppush_err_string(enum yppush_status y); +__BEGIN_DECLS +bool_t xdr_yppush_status(XDR *, yppush_status*); +bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*); +void * yppushproc_null_1(void *, CLIENT *); +void * yppushproc_null_1_svc(void *, struct svc_req *); +void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *); +void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *); +char * yppush_err_string(enum yppush_status y); +__END_DECLS #endif /* !_YPPUSH_H_RPCGEN */ diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c index d0b9a9deef2..58dee344ac1 100644 --- a/usr.sbin/ypserv/yppush/yppush_svc.c +++ b/usr.sbin/ypserv/yppush/yppush_svc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt Exp $ */ +/* $OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $ */ /* * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $"; #endif /* not lint */ #include "yppush.h" @@ -47,10 +47,6 @@ static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.5 2001/11/19 04:21:41 deraadt #include <memory.h> #include <syslog.h> -#ifdef __STDC__ -#define SIG_PF void(*)(int) -#endif - #ifdef DEBUG #define RPC_SVC_FG #endif diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index ba24fbc22ac..cc283d4d5fe 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv.c,v 1.20 2002/02/18 22:20:55 deraadt Exp $ */ +/* $OpenBSD: ypserv.c,v 1.21 2002/02/19 19:39:41 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv.c,v 1.20 2002/02/18 22:20:55 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv.c,v 1.21 2002/02/19 19:39:41 millert Exp $"; #endif #include <sys/types.h> @@ -63,10 +63,6 @@ static char rcsid[] = "$OpenBSD: ypserv.c,v 1.20 2002/02/18 22:20:55 deraadt Exp #include "ypdef.h" #include <sys/wait.h> -#ifdef __STDC__ -#define SIG_PF void(*)(int) -#endif - #ifdef DEBUG #define RPC_SVC_FG #endif @@ -102,7 +98,7 @@ void _msgout(char* msg) } static void -closedown(void) +closedown(int sig) { int save_errno = errno; @@ -551,7 +547,7 @@ main(argc, argv) exit(1); } if (_rpcpmstart) { - (void) signal(SIGALRM, (SIG_PF) closedown); + (void) signal(SIGALRM, closedown); (void) alarm(_RPCSVC_CLOSEDOWN); } my_svc_run(); |