diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-03-08 15:19:55 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-03-08 15:19:55 +0000 |
| commit | b62869e4ee5701adcc48e4cef972847213fd4d87 (patch) | |
| tree | e2b3603597c02832038ede51b0591a77c6c9b463 /contrib/pf/pfctl | |
| parent | 791e1cc5019d9988929ad94a40ae0443aa15169e (diff) | |
| download | FreeBSD-src-b62869e4ee5701adcc48e4cef972847213fd4d87.zip FreeBSD-src-b62869e4ee5701adcc48e4cef972847213fd4d87.tar.gz | |
Fix two instances of improper NULL/0 use idetified by the changes lately.
Submitted by: Patrick Marie
Approved by: bms(mentor)
Diffstat (limited to 'contrib/pf/pfctl')
| -rw-r--r-- | contrib/pf/pfctl/parse.y | 2 | ||||
| -rw-r--r-- | contrib/pf/pfctl/pfctl_altq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y index 9eb98f8..83c5165 100644 --- a/contrib/pf/pfctl/parse.y +++ b/contrib/pf/pfctl/parse.y @@ -2737,7 +2737,7 @@ natrule : nataction interface af proto fromto tag redirpool pooltype memcpy(&r.rpool.key, $8.key, sizeof(struct pf_poolhashkey)); - if ($9 != NULL) { + if ($9 != 0) { if (r.action != PF_NAT) { yyerror("the 'static-port' option is " "only valid with nat rules"); diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c index 807ecb5..baead1c 100644 --- a/contrib/pf/pfctl/pfctl_altq.c +++ b/contrib/pf/pfctl/pfctl_altq.c @@ -165,7 +165,7 @@ void print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw, struct node_queue_opt *qopts) { - if (a->qname[0] != NULL) { + if (a->qname[0] != '\0') { print_queue(a, level, bw, 0, qopts); return; } |
