diff options
| author | jamie <jamie@FreeBSD.org> | 2012-05-03 21:39:23 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2012-05-03 21:39:23 +0000 |
| commit | 18b00ce05256ac1bef00083a0ce9a34fcb4c49a9 (patch) | |
| tree | 5df7a5374150f5c1f64e0d5a6d4282f1c547156e /usr.sbin/jail/config.c | |
| parent | 593ade1bddc87e9ddb3e4aa2313c4f5f83bc23dc (diff) | |
| download | FreeBSD-src-18b00ce05256ac1bef00083a0ce9a34fcb4c49a9.zip FreeBSD-src-18b00ce05256ac1bef00083a0ce9a34fcb4c49a9.tar.gz | |
Add a meta-parameter IP__NULL to enum intparam, instead of mixing
enum values and zeroes. This keeps clang happy (and is just good form).
Submitted by: dim
Diffstat (limited to 'usr.sbin/jail/config.c')
| -rw-r--r-- | usr.sbin/jail/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 7080a59..16f5095 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -328,7 +328,7 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, } } else { flags = PF_APPEND; - if (ipnum != 0) { + if (ipnum != IP__NULL) { name = intparams[ipnum].name; flags |= intparams[ipnum].flags; } else if ((cs = strchr(value, '='))) { @@ -350,7 +350,7 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, } /* See if this parameter has already been added. */ - if (ipnum != 0) + if (ipnum != IP__NULL) dp = j->intparams[ipnum]; else TAILQ_FOREACH(dp, &j->params, tq) @@ -375,10 +375,10 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, np->flags = flags; np->gen = 0; TAILQ_INSERT_TAIL(&j->params, np, tq); - if (ipnum != 0) + if (ipnum != IP__NULL) j->intparams[ipnum] = np; else - for (ipnum = 1; ipnum < IP_NPARAM; ipnum++) + for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++) if (!(intparams[ipnum].flags & PF_CONV) && equalopts(name, intparams[ipnum].name)) { j->intparams[ipnum] = np; |
