diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2003-01-20 18:37:53 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2003-01-20 18:37:53 +0000 |
| commit | 6ac77690f88965d1ae00c377b912f8d31214f1c7 (patch) | |
| tree | 38d95e95c060a63716c3f955892257406742c8e6 /sbin | |
| parent | 7308a0b752b23f18e6b96fd1b4f24a5be32301b9 (diff) | |
Remove unused argument from print_name() and fix two other nits
found by lint.
ok henning
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/parse.y | 5 | ||||
| -rw-r--r-- | sbin/pfctl/pf_print_state.c | 8 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.c | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 6054e000b40..41b10b088a1 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.294 2003/01/19 10:19:15 camield Exp $ */ +/* $OpenBSD: parse.y,v 1.295 2003/01/20 18:37:52 camield Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -2122,7 +2122,8 @@ hashkey : /* empty */ if ($$ == NULL) err(1, "hashkey: calloc"); MD5Init(&context); - MD5Update(&context, $1, strlen($1)); + MD5Update(&context, (unsigned char *)$1, + strlen($1)); MD5Final((unsigned char *)$$, &context); HTONL($$->key32[0]); HTONL($$->key32[1]); diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index d8da757b586..fd7dc9d0555 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_print_state.c,v 1.19 2003/01/20 17:16:56 cedric Exp $ */ +/* $OpenBSD: pf_print_state.c,v 1.20 2003/01/20 18:37:52 camield Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -55,7 +55,7 @@ #include "pfctl_parser.h" #include "pfctl.h" -void print_name(struct pf_addr *, struct pf_addr *, sa_family_t); +void print_name(struct pf_addr *, sa_family_t); void print_addr(struct pf_addr_wrap *addr, sa_family_t af, int verbose) @@ -88,7 +88,7 @@ print_addr(struct pf_addr_wrap *addr, sa_family_t af, int verbose) } void -print_name(struct pf_addr *addr, struct pf_addr *mask, sa_family_t af) +print_name(struct pf_addr *addr, sa_family_t af) { char host[NI_MAXHOST]; @@ -126,7 +126,7 @@ print_host(struct pf_state_host *h, sa_family_t af, int opts) u_int16_t p = ntohs(h->port); if (opts & PF_OPT_USEDNS) - print_name(&h->addr, NULL, af); + print_name(&h->addr, af); else { struct pf_addr_wrap aw; diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 8239818d9ec..cb53b8de596 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.137 2003/01/19 15:28:12 camield Exp $ */ +/* $OpenBSD: pfctl.c,v 1.138 2003/01/20 18:37:52 camield Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1177,8 +1177,8 @@ pfctl_test_altqsupport(int dev, int opts) return (0); } else err(1, "DIOCGETALTQS"); - } else - return (1); + } + return (1); } int |