=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rpcgen/rpc_scan.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- src/usr.bin/rpcgen/rpc_scan.c 2001/07/17 02:23:59 1.3 +++ src/usr.bin/rpcgen/rpc_scan.c 2001/07/18 22:26:00 1.4 @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_scan.c,v 1.3 2001/07/17 02:23:59 pvalchev Exp $ */ +/* $OpenBSD: rpc_scan.c,v 1.4 2001/07/18 22:26:00 deraadt Exp $ */ /* $NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -47,15 +47,15 @@ #include "rpc_parse.h" #include "rpc_util.h" -static void unget_token __P((token *tokp)); -static void findstrconst __P((char **, char **)); -static void findchrconst __P((char **, char **)); -static void findconst __P((char **, char **)); -static void findkind __P((char **, token *)); -static int cppline __P((char *)); -static int directive __P((char *)); -static void printdirective __P((char *)); -static void docppline __P((char *, int *, char **)); +static unget_token __P((token *tokp)); +static findstrconst __P((char **, char **)); +static findchrconst __P((char **, char **)); +static findconst __P((char **, char **)); +static findkind __P((char **, token *)); +static cppline __P((char *)); +static directive __P((char *)); +static printdirective __P((char *)); +static docppline __P((char *, int *, char **)); #define startcomment(where) (where[0] == '/' && where[1] == '*') #define endcomment(where) (where[-1] == '*' && where[0] == '/') @@ -308,7 +308,7 @@ } } -static void +static unget_token(tokp) token *tokp; { @@ -316,7 +316,7 @@ pushed = 1; } -static void +static findstrconst(str, val) char **str; char **val; @@ -326,7 +326,7 @@ p = *str; do { - p++; + *p++; } while (*p && *p != '"'); if (*p == 0) { error("unterminated string constant"); @@ -339,7 +339,7 @@ *str = p; } -static void +static findchrconst(str, val) char **str; char **val; @@ -349,7 +349,7 @@ p = *str; do { - p++; + *p++; } while (*p && *p != '\''); if (*p == 0) { error("unterminated string constant"); @@ -365,7 +365,7 @@ *str = p; } -static void +static findconst(str, val) char **str; char **val; @@ -416,7 +416,7 @@ {TOK_EOF, "??????"}, }; -static void +static findkind(mark, tokp) char **mark; token *tokp; @@ -445,28 +445,28 @@ *mark = str + len; } -static int +static cppline(line) char *line; { return (line == curline && *line == '#'); } -static int +static directive(line) char *line; { return (line == curline && *line == '%'); } -static void +static printdirective(line) char *line; { f_print(fout, "%s", line + 1); } -static void +static docppline(line, lineno, fname) char *line; int *lineno;