ANSIfy

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index b181f79521d0891caabc6eae48c7bf2583e17335..18d78cae9e2e0e2de9273bf7ffe2afe63d8e8e7c 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -101,8 +101,7 @@ static struct member *new_member(char *, int);
        void  yyerror(const char *);
 
 void
-yyerror(s)
-    const char *s;
+yyerror(const char *s)
 {
     /* Save the line the first error occurred on. */
     if (errorlineno == -1) {
@@ -119,7 +118,7 @@ yyerror(s)
     }
     parse_error = TRUE;
 }
-#line 112 "gram.y"
+#line 111 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -135,7 +134,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 138 "y.tab.c"
+#line 137 "y.tab.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -633,12 +632,9 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 int yystacksize;
-#line 606 "gram.y"
+#line 605 "gram.y"
 static struct defaults *
-new_default(var, val, op)
-    char *var;
-    char *val;
-    int op;
+new_default(char *var, char *val, int op)
 {
     struct defaults *d;
 
@@ -655,9 +651,7 @@ new_default(var, val, op)
 }
 
 static struct member *
-new_member(name, type)
-    char *name;
-    int type;
+new_member(char *name, int type)
 {
     struct member *m;
 
@@ -676,10 +670,7 @@ new_member(name, type)
  * runas users the entries apply to (specified by the type).
  */
 static void
-add_defaults(type, bmem, defs)
-    int type;
-    struct member *bmem;
-    struct defaults *defs;
+add_defaults(int type, struct member *bmem, struct defaults *defs)
 {
     struct defaults *d;
     struct member_list binding;
@@ -705,9 +696,7 @@ add_defaults(type, bmem, defs)
  * and of the userspecs list.
  */
 static void
-add_userspec(members, privs)
-    struct member *members;
-    struct privilege *privs;
+add_userspec(struct member *members, struct privilege *privs)
 {
     struct userspec *u;
 
@@ -724,9 +713,7 @@ add_userspec(members, privs)
  * the current sudoers file to path.
  */
 void
-init_parser(path, quiet)
-    char *path;
-    int quiet;
+init_parser(char *path, int quiet)
 {
     struct defaults *d;
     struct member *m, *binding;
@@ -824,7 +811,7 @@ init_parser(path, quiet)
     sudolineno = 1;
     verbose = !quiet;
 }
-#line 775 "y.tab.c"
+#line 762 "y.tab.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1030,127 +1017,127 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 187 "gram.y"
+#line 186 "gram.y"
 { ; }
 break;
 case 5:
-#line 195 "gram.y"
+#line 194 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 198 "gram.y"
+#line 197 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 201 "gram.y"
+#line 200 "gram.y"
 {
                            add_userspec(yyvsp[-1].member, yyvsp[0].privilege);
                        }
 break;
 case 8:
-#line 204 "gram.y"
+#line 203 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 207 "gram.y"
+#line 206 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 210 "gram.y"
+#line 209 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 213 "gram.y"
+#line 212 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 216 "gram.y"
+#line 215 "gram.y"
 {
                            add_defaults(DEFAULTS, NULL, yyvsp[0].defaults);
                        }
 break;
 case 13:
-#line 219 "gram.y"
+#line 218 "gram.y"
 {
                            add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 14:
-#line 222 "gram.y"
+#line 221 "gram.y"
 {
                            add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 15:
-#line 225 "gram.y"
+#line 224 "gram.y"
 {
                            add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 16:
-#line 228 "gram.y"
+#line 227 "gram.y"
 {
                            add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 18:
-#line 234 "gram.y"
+#line 233 "gram.y"
 {
                            list_append(yyvsp[-2].defaults, yyvsp[0].defaults);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 240 "gram.y"
+#line 239 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, TRUE);
                        }
 break;
 case 20:
-#line 243 "gram.y"
+#line 242 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, FALSE);
                        }
 break;
 case 21:
-#line 246 "gram.y"
+#line 245 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, TRUE);
                        }
 break;
 case 22:
-#line 249 "gram.y"
+#line 248 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                        }
 break;
 case 23:
-#line 252 "gram.y"
+#line 251 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                        }
 break;
 case 25:
-#line 258 "gram.y"
+#line 257 "gram.y"
 {
                            list_append(yyvsp[-2].privilege, yyvsp[0].privilege);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 264 "gram.y"
+#line 263 "gram.y"
 {
                            struct privilege *p = emalloc(sizeof(*p));
                            list2tq(&p->hostlist, yyvsp[-2].member);
@@ -1161,51 +1148,51 @@ case 26:
                        }
 break;
 case 27:
-#line 274 "gram.y"
+#line 273 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = FALSE;
                        }
 break;
 case 28:
-#line 278 "gram.y"
+#line 277 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = TRUE;
                        }
 break;
 case 29:
-#line 284 "gram.y"
+#line 283 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 30:
-#line 287 "gram.y"
+#line 286 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 31:
-#line 290 "gram.y"
+#line 289 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 32:
-#line 293 "gram.y"
+#line 292 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                        }
 break;
 case 33:
-#line 296 "gram.y"
+#line 295 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 35:
-#line 302 "gram.y"
+#line 301 "gram.y"
 {
                            list_append(yyvsp[-2].cmndspec, yyvsp[0].cmndspec);
 #ifdef HAVE_SELINUX
@@ -1238,7 +1225,7 @@ case 35:
                        }
 break;
 case 36:
-#line 334 "gram.y"
+#line 333 "gram.y"
 {
                            struct cmndspec *cs = emalloc(sizeof(*cs));
                            if (yyvsp[-3].runas != NULL) {
@@ -1265,80 +1252,80 @@ case 36:
                        }
 break;
 case 37:
-#line 360 "gram.y"
+#line 359 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = FALSE;
                        }
 break;
 case 38:
-#line 364 "gram.y"
+#line 363 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = TRUE;
                        }
 break;
 case 39:
-#line 370 "gram.y"
+#line 369 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 40:
-#line 375 "gram.y"
+#line 374 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 41:
-#line 380 "gram.y"
+#line 379 "gram.y"
 {
                            yyval.seinfo.role = NULL;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 42:
-#line 384 "gram.y"
+#line 383 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[0].string;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 43:
-#line 388 "gram.y"
+#line 387 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[0].string;
                            yyval.seinfo.role = NULL;
                        }
 break;
 case 44:
-#line 392 "gram.y"
+#line 391 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[-1].string;
                            yyval.seinfo.type = yyvsp[0].string;
                        }
 break;
 case 45:
-#line 396 "gram.y"
+#line 395 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[-1].string;
                            yyval.seinfo.role = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 402 "gram.y"
+#line 401 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 47:
-#line 405 "gram.y"
+#line 404 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 48:
-#line 410 "gram.y"
+#line 409 "gram.y"
 {
                            yyval.runas = emalloc(sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[0].member;
@@ -1346,7 +1333,7 @@ case 48:
                        }
 break;
 case 49:
-#line 415 "gram.y"
+#line 414 "gram.y"
 {
                            yyval.runas = emalloc(sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[-2].member;
@@ -1354,7 +1341,7 @@ case 49:
                        }
 break;
 case 50:
-#line 420 "gram.y"
+#line 419 "gram.y"
 {
                            yyval.runas = emalloc(sizeof(struct runascontainer));
                            yyval.runas->runasusers = NULL;
@@ -1362,86 +1349,86 @@ case 50:
                        }
 break;
 case 51:
-#line 427 "gram.y"
+#line 426 "gram.y"
 {
                            yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv =
                                yyval.tag.log_input = yyval.tag.log_output = UNSPEC;
                        }
 break;
 case 52:
-#line 431 "gram.y"
+#line 430 "gram.y"
 {
                            yyval.tag.nopasswd = TRUE;
                        }
 break;
 case 53:
-#line 434 "gram.y"
+#line 433 "gram.y"
 {
                            yyval.tag.nopasswd = FALSE;
                        }
 break;
 case 54:
-#line 437 "gram.y"
+#line 436 "gram.y"
 {
                            yyval.tag.noexec = TRUE;
                        }
 break;
 case 55:
-#line 440 "gram.y"
+#line 439 "gram.y"
 {
                            yyval.tag.noexec = FALSE;
                        }
 break;
 case 56:
-#line 443 "gram.y"
+#line 442 "gram.y"
 {
                            yyval.tag.setenv = TRUE;
                        }
 break;
 case 57:
-#line 446 "gram.y"
+#line 445 "gram.y"
 {
                            yyval.tag.setenv = FALSE;
                        }
 break;
 case 58:
-#line 449 "gram.y"
+#line 448 "gram.y"
 {
                            yyval.tag.log_input = TRUE;
                        }
 break;
 case 59:
-#line 452 "gram.y"
+#line 451 "gram.y"
 {
                            yyval.tag.log_input = FALSE;
                        }
 break;
 case 60:
-#line 455 "gram.y"
+#line 454 "gram.y"
 {
                            yyval.tag.log_output = TRUE;
                        }
 break;
 case 61:
-#line 458 "gram.y"
+#line 457 "gram.y"
 {
                            yyval.tag.log_output = FALSE;
                        }
 break;
 case 62:
-#line 463 "gram.y"
+#line 462 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 63:
-#line 466 "gram.y"
+#line 465 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 64:
-#line 469 "gram.y"
+#line 468 "gram.y"
 {
                            struct sudo_command *c = emalloc(sizeof(*c));
                            c->cmnd = yyvsp[0].command.cmnd;
@@ -1450,7 +1437,7 @@ case 64:
                        }
 break;
 case 67:
-#line 481 "gram.y"
+#line 480 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1460,14 +1447,14 @@ case 67:
                        }
 break;
 case 69:
-#line 491 "gram.y"
+#line 490 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 72:
-#line 501 "gram.y"
+#line 500 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1477,14 +1464,14 @@ case 72:
                        }
 break;
 case 74:
-#line 511 "gram.y"
+#line 510 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 77:
-#line 521 "gram.y"
+#line 520 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1494,7 +1481,7 @@ case 77:
                        }
 break;
 case 80:
-#line 534 "gram.y"
+#line 533 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1504,96 +1491,96 @@ case 80:
                        }
 break;
 case 82:
-#line 544 "gram.y"
+#line 543 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 83:
-#line 550 "gram.y"
+#line 549 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = FALSE;
                        }
 break;
 case 84:
-#line 554 "gram.y"
+#line 553 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = TRUE;
                        }
 break;
 case 85:
-#line 560 "gram.y"
+#line 559 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 86:
-#line 563 "gram.y"
+#line 562 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 87:
-#line 566 "gram.y"
+#line 565 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 88:
-#line 569 "gram.y"
+#line 568 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                        }
 break;
 case 89:
-#line 572 "gram.y"
+#line 571 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 91:
-#line 578 "gram.y"
+#line 577 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 92:
-#line 584 "gram.y"
+#line 583 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = FALSE;
                        }
 break;
 case 93:
-#line 588 "gram.y"
+#line 587 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = TRUE;
                        }
 break;
 case 94:
-#line 594 "gram.y"
+#line 593 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 95:
-#line 597 "gram.y"
+#line 596 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 96:
-#line 600 "gram.y"
+#line 599 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
-#line 1544 "y.tab.c"
+#line 1531 "y.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index eb79bb51b53c9143c6363315c2597e5059aad543..ca684bad7030784d78d052c54467de8a93a6741e 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -89,8 +89,7 @@ static struct member *new_member(char *, int);
        void  yyerror(const char *);
 
 void
-yyerror(s)
-    const char *s;
+yyerror(const char *s)
 {
     /* Save the line the first error occurred on. */
     if (errorlineno == -1) {
@@ -604,10 +603,7 @@ group              :       ALIAS {
 
 %%
 static struct defaults *
-new_default(var, val, op)
-    char *var;
-    char *val;
-    int op;
+new_default(char *var, char *val, int op)
 {
     struct defaults *d;
 
@@ -624,9 +620,7 @@ new_default(var, val, op)
 }
 
 static struct member *
-new_member(name, type)
-    char *name;
-    int type;
+new_member(char *name, int type)
 {
     struct member *m;
 
@@ -645,10 +639,7 @@ new_member(name, type)
  * runas users the entries apply to (specified by the type).
  */
 static void
-add_defaults(type, bmem, defs)
-    int type;
-    struct member *bmem;
-    struct defaults *defs;
+add_defaults(int type, struct member *bmem, struct defaults *defs)
 {
     struct defaults *d;
     struct member_list binding;
@@ -674,9 +665,7 @@ add_defaults(type, bmem, defs)
  * and of the userspecs list.
  */
 static void
-add_userspec(members, privs)
-    struct member *members;
-    struct privilege *privs;
+add_userspec(struct member *members, struct privilege *privs)
 {
     struct userspec *u;
 
@@ -693,9 +682,7 @@ add_userspec(members, privs)
  * the current sudoers file to path.
  */
 void
-init_parser(path, quiet)
-    char *path;
-    int quiet;
+init_parser(char *path, int quiet)
 {
     struct defaults *d;
     struct member *m, *binding;

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index 01ebcb51da7089366a719bbe09ebf2ef354175de..6eebbc3f0c4ceb2a6e120e942613ec5ca65aef97 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -3238,8 +3238,7 @@ int main()
 #line 560 "toke.l"
 
 static unsigned char
-hexchar(s)
-    const char *s;
+hexchar(const char *s)
 {
     int i;
     int result = 0;
@@ -3284,9 +3283,7 @@ hexchar(s)
 }
 
 static int
-_fill(src, len, olen)
-    char *src;
-    int len, olen;
+_fill(char *src, int len, int olen)
 {
     char *dst;
 
@@ -3321,9 +3318,7 @@ _fill(src, len, olen)
 }
 
 static int
-append(src, len)
-    char *src;
-    int len;
+append(char *src, int len)
 {
     int olen = 0;
 
@@ -3337,9 +3332,7 @@ append(src, len)
     ((c) == ',' || (c) == ':' || (c) == '=' || (c) == ' ' || (c) == '\t' || (c) == '#')
 
 static int
-fill_cmnd(src, len)
-    char *src;
-    int len;
+fill_cmnd(char *src, int len)
 {
     char *dst;
     int i;
@@ -3366,10 +3359,7 @@ fill_cmnd(src, len)
 }
 
 static int
-fill_args(s, len, addspace)
-    char *s;
-    int len;
-    int addspace;
+fill_args(char *s, int len, int addspace)
 {
     int new_len;
     char *p;
@@ -3422,9 +3412,7 @@ struct include_stack {
 };
 
 static int
-pl_compare(v1, v2)
-    const void *v1;
-    const void *v2;
+pl_compare(const void *v1, const void *v2)
 {
     const struct path_list * const *p1 = v1;
     const struct path_list * const *p2 = v2;
@@ -3433,9 +3421,7 @@ pl_compare(v1, v2)
 }
 
 static char *
-switch_dir(stack, dirpath)
-    struct include_stack *stack;
-    char *dirpath;
+switch_dir(struct include_stack *stack, char *dirpath)
 {
     DIR *dir;
     int i, count = 0;
@@ -3527,7 +3513,7 @@ static struct include_stack *istack;
 static int keepopen;
 
 void
-init_lexer()
+init_lexer(void)
 {
     struct path_list *pl;
 
@@ -3550,9 +3536,7 @@ init_lexer()
 }
 
 static int
-_push_include(path, isdir)
-    char *path;
-    int isdir;
+_push_include(char *path, int isdir)
 {
     struct path_list *pl;
     FILE *fp;
@@ -3606,7 +3590,7 @@ _push_include(path, isdir)
 }
 
 static int
-pop_include()
+pop_include(void)
 {
     struct path_list *pl;
     FILE *fp;
@@ -3647,8 +3631,7 @@ pop_include()
 }
 
 static char *
-parse_include(base)
-    char *base;
+parse_include(char *base)
 {
     char *cp, *ep, *path;
     int len = 0, subst = 0;
@@ -3705,8 +3688,7 @@ parse_include(base)
  * Returns TRUE if address is valid else FALSE.
  */
 static int
-ipv6_valid(s)
-    const char *s;
+ipv6_valid(const char *s)
 {
     int nmatch = 0;
 

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index a2363b017b77fbfa43478cdaf3b8ee8eb9d92351..79775896efbd6404775016b538aa41b62aac5608 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -559,8 +559,7 @@ sudoedit            {
 
 %%
 static unsigned char
-hexchar(s)
-    const char *s;
+hexchar(const char *s)
 {
     int i;
     int result = 0;
@@ -605,9 +604,7 @@ hexchar(s)
 }
 
 static int
-_fill(src, len, olen)
-    char *src;
-    int len, olen;
+_fill(char *src, int len, int olen)
 {
     char *dst;
 
@@ -642,9 +639,7 @@ _fill(src, len, olen)
 }
 
 static int
-append(src, len)
-    char *src;
-    int len;
+append(char *src, int len)
 {
     int olen = 0;
 
@@ -658,9 +653,7 @@ append(src, len)
     ((c) == ',' || (c) == ':' || (c) == '=' || (c) == ' ' || (c) == '\t' || (c) == '#')
 
 static int
-fill_cmnd(src, len)
-    char *src;
-    int len;
+fill_cmnd(char *src, int len)
 {
     char *dst;
     int i;
@@ -687,10 +680,7 @@ fill_cmnd(src, len)
 }
 
 static int
-fill_args(s, len, addspace)
-    char *s;
-    int len;
-    int addspace;
+fill_args(char *s, int len, int addspace)
 {
     int new_len;
     char *p;
@@ -743,9 +733,7 @@ struct include_stack {
 };
 
 static int
-pl_compare(v1, v2)
-    const void *v1;
-    const void *v2;
+pl_compare(const void *v1, const void *v2)
 {
     const struct path_list * const *p1 = v1;
     const struct path_list * const *p2 = v2;
@@ -754,9 +742,7 @@ pl_compare(v1, v2)
 }
 
 static char *
-switch_dir(stack, dirpath)
-    struct include_stack *stack;
-    char *dirpath;
+switch_dir(struct include_stack *stack, char *dirpath)
 {
     DIR *dir;
     int i, count = 0;
@@ -848,7 +834,7 @@ static struct include_stack *istack;
 static int keepopen;
 
 void
-init_lexer()
+init_lexer(void)
 {
     struct path_list *pl;
 
@@ -871,9 +857,7 @@ init_lexer()
 }
 
 static int
-_push_include(path, isdir)
-    char *path;
-    int isdir;
+_push_include(char *path, int isdir)
 {
     struct path_list *pl;
     FILE *fp;
@@ -927,7 +911,7 @@ _push_include(path, isdir)
 }
 
 static int
-pop_include()
+pop_include(void)
 {
     struct path_list *pl;
     FILE *fp;
@@ -968,8 +952,7 @@ pop_include()
 }
 
 static char *
-parse_include(base)
-    char *base;
+parse_include(char *base)
 {
     char *cp, *ep, *path;
     int len = 0, subst = 0;
@@ -1026,8 +1009,7 @@ parse_include(base)
  * Returns TRUE if address is valid else FALSE.
  */
 static int
-ipv6_valid(s)
-    const char *s;
+ipv6_valid(const char *s)
 {
     int nmatch = 0;