diff options
Diffstat (limited to 'usr.bin/m4/eval.c')
| -rw-r--r-- | usr.bin/m4/eval.c | 92 |
1 files changed, 24 insertions, 68 deletions
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index b9ce64a..0c803df 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.43 2002/02/16 21:27:48 millert Exp $ */ +/* $OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $ */ /* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */ /* @@ -38,8 +38,8 @@ */ #include <sys/cdefs.h> -__SCCSID("@(#)eval.c 8.2 (Berkeley) 4/27/95"); -__RCSID_SOURCE("$OpenBSD: eval.c,v 1.43 2002/02/16 21:27:48 millert Exp $"); +__SCCSID("@(#)eval.c 8.2 (Berkeley) 4/27/95"); +__RCSID_SOURCE("$OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $"); __FBSDID("$FreeBSD$"); /* @@ -106,10 +106,7 @@ unsigned long expansion_id; * argc is 3 for macro-or-builtin() and 2 for macro-or-builtin */ void -eval(argv, argc, td) - const char *argv[]; - int argc; - int td; +eval(const char *argv[], int argc, int td) { ssize_t mark = -1; @@ -131,10 +128,7 @@ eval(argv, argc, td) * expand_builtin - evaluate built-in macros. */ void -expand_builtin(argv, argc, td) - const char *argv[]; - int argc; - int td; +expand_builtin(const char *argv[], int argc, int td) { int c, n; int ac; @@ -498,9 +492,7 @@ expand_builtin(argv, argc, td) * expand_macro - user-defined macro expansion */ void -expand_macro(argv, argc) - const char *argv[]; - int argc; +expand_macro(const char *argv[], int argc) { const char *t; const char *p; @@ -573,9 +565,7 @@ expand_macro(argv, argc) * dodefine - install definition in the table */ void -dodefine(name, defn) - const char *name; - const char *defn; +dodefine(const char *name, const char *defn) { ndptr p; int n; @@ -611,8 +601,7 @@ dodefine(name, defn) * the given name. */ static void -dodefn(name) - const char *name; +dodefn(const char *name) { ndptr p; const char *real; @@ -637,9 +626,7 @@ dodefn(name) * lookup. */ static void -dopushdef(name, defn) - const char *name; - const char *defn; +dopushdef(const char *name, const char *defn) { ndptr p; @@ -660,8 +647,7 @@ dopushdef(name, defn) * dump_one_def - dump the specified definition. */ static void -dump_one_def(p) - ndptr p; +dump_one_def(ndptr p) { const char *real; @@ -684,9 +670,7 @@ dump_one_def(p) * hash table is dumped. */ static void -dodump(argv, argc) - const char *argv[]; - int argc; +dodump(const char *argv[], int argc) { int n; ndptr p; @@ -706,10 +690,7 @@ dodump(argv, argc) * dotrace - mark some macros as traced/untraced depending upon on. */ static void -dotrace(argv, argc, on) - const char *argv[]; - int argc; - int on; +dotrace(const char *argv[], int argc, int on) { int n; @@ -724,9 +705,7 @@ dotrace(argv, argc, on) * doifelse - select one of two alternatives - loop. */ static void -doifelse(argv, argc) - const char *argv[]; - int argc; +doifelse(const char *argv[], int argc) { cycle { if (STREQ(argv[2], argv[3])) @@ -746,8 +725,7 @@ doifelse(argv, argc) * doinclude - include a given file. */ static int -doincl(ifile) - const char *ifile; +doincl(const char *ifile) { if (ilevel + 1 == MAXINP) errx(1, "%s at line %lu: too many include files.", @@ -770,8 +748,7 @@ doincl(ifile) * macro processing. */ static int -dopaste(pfile) - const char *pfile; +dopaste(const char *pfile) { FILE *pf; int c; @@ -789,9 +766,7 @@ dopaste(pfile) #endif static void -gnu_dochq(argv, ac) - const char *argv[]; - int ac; +gnu_dochq(const char *argv[], int ac) { /* In gnu-m4 mode, the only way to restore quotes is to have no * arguments at all. */ @@ -811,9 +786,7 @@ gnu_dochq(argv, ac) * dochq - change quote characters */ static void -dochq(argv, argc) - const char *argv[]; - int argc; +dochq(const char *argv[], int argc) { if (argc > 2) { if (*argv[2]) @@ -834,9 +807,7 @@ dochq(argv, argc) } static void -gnu_dochc(argv, ac) - const char *argv[]; - int ac; +gnu_dochc(const char *argv[], int ac) { /* In gnu-m4 mode, no arguments mean no comment * arguments at all. */ @@ -858,9 +829,7 @@ gnu_dochc(argv, ac) * dochc - change comment characters */ static void -dochc(argv, argc) - const char *argv[]; - int argc; +dochc(const char *argv[], int argc) { if (argc > 2) { if (*argv[2]) @@ -882,8 +851,7 @@ dochc(argv, argc) * dodivert - divert the output to a temporary file */ static void -dodiv(n) - int n; +dodiv(int n) { int fd; @@ -914,9 +882,7 @@ dodiv(n) * other outputs, in numerical order. */ static void -doundiv(argv, argc) - const char *argv[]; - int argc; +doundiv(const char *argv[], int argc) { int ind; int n; @@ -939,9 +905,7 @@ doundiv(argv, argc) * dosub - select substring */ static void -dosub(argv, argc) - const char *argv[]; - int argc; +dosub(const char *argv[], int argc) { const char *ap, *fc, *k; int nc; @@ -990,11 +954,7 @@ dosub(argv, argc) * destination string. */ static void -map(dest, src, from, to) - char *dest; - const char *src; - const char *from; - const char *to; +map(char *dest, const char *src, const char *from, const char *to) { const char *tmp; unsigned char sch, dch; @@ -1066,10 +1026,7 @@ map(dest, src, from, to) * on the way. */ static const char * -handledash(buffer, end, src) - char *buffer; - char *end; - const char *src; +handledash(char *buffer, char *end, const char *src) { char *p; @@ -1094,4 +1051,3 @@ handledash(buffer, end, src) *p = '\0'; return buffer; } - |
