diff options
| author | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2002-10-07 14:13:49 +0000 |
|---|---|---|
| committer | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2002-10-07 14:13:49 +0000 |
| commit | d3222095465a4bd51e7ad304be7e3f9b1c49a02f (patch) | |
| tree | 08c9fabb755c4340744bf147f17b58e8c04aa79b /sbin | |
| parent | 9b5c55802ec65f0af4b5fe8b5d1c5f4ed11b42ce (diff) | |
Two cases of const-correctness and make one global local.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/parse.y | 4 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 8c728ab2283..df1fc52522a 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.162 2002/10/07 13:23:46 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.163 2002/10/07 14:13:48 dhartmei Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -2326,7 +2326,7 @@ check_rulestate(int desired_state) int kw_cmp(const void *k, const void *e) { - return (strcmp(k, ((struct keywords *)e)->k_name)); + return (strcmp(k, ((const struct keywords *)e)->k_name)); } int diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index b3afafd63e2..9b2aa0a0cc9 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.83 2002/07/05 14:07:32 henning Exp $ */ +/* $OpenBSD: pfctl.c,v 1.84 2002/10/07 14:13:48 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -70,7 +70,6 @@ int pfctl_rules(int, char *, int); int pfctl_debug(int, u_int32_t, int); int pfctl_clear_rule_counters(int, int); -int opts = 0; char *clearopt; char *rulesopt; char *showopt; @@ -79,7 +78,7 @@ int state_killers; char *state_kill[2]; int loadopt = PFCTL_FLAG_ALL; -char *infile; +const char *infile; static const struct { const char *name; @@ -800,6 +799,7 @@ main(int argc, char *argv[]) int dev = -1; int ch; int mode = O_RDONLY; + int opts = 0; if (argc < 2) usage(); |