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 | |
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')
-rw-r--r-- | usr.sbin/jail/command.c | 2 | ||||
-rw-r--r-- | usr.sbin/jail/config.c | 8 | ||||
-rw-r--r-- | usr.sbin/jail/jail.c | 8 | ||||
-rw-r--r-- | usr.sbin/jail/jailp.h | 3 |
4 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index 1c17da0..cbc7b88 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -100,7 +100,7 @@ next_command(struct cfjail *j) if (j->comstring == NULL) { j->comparam += create_failed ? -1 : 1; switch ((comparam = *j->comparam)) { - case 0: + case IP__NULL: return 0; case IP_MOUNT_DEVFS: if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) 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; diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index d6de5ca..e827e11 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -81,7 +81,7 @@ static struct permspec perm_sysctl[] = { }; static const enum intparam startcommands[] = { - 0, + IP__NULL, #ifdef INET IP__IP4_IFADDR, #endif @@ -97,11 +97,11 @@ static const enum intparam startcommands[] = { IP_EXEC_START, IP_COMMAND, IP_EXEC_POSTSTART, - 0 + IP__NULL }; static const enum intparam stopcommands[] = { - 0, + IP__NULL, IP_EXEC_PRESTOP, IP_EXEC_STOP, IP_STOP_TIMEOUT, @@ -116,7 +116,7 @@ static const enum intparam stopcommands[] = { #ifdef INET IP__IP4_IFADDR, #endif - 0 + IP__NULL }; int diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h index 226ecd4..4bf7929 100644 --- a/usr.sbin/jail/jailp.h +++ b/usr.sbin/jail/jailp.h @@ -71,7 +71,8 @@ #define JF_DO_STOP(js) (((js) & (JF_SET | JF_STOP)) == JF_STOP) enum intparam { - IP_ALLOW_DYING = 1, /* Allow making changes to a dying jail */ + IP__NULL = 0, /* Null command */ + IP_ALLOW_DYING, /* Allow making changes to a dying jail */ IP_COMMAND, /* Command run inside jail at creation */ IP_DEPEND, /* Jail starts after (stops before) another */ IP_EXEC_CLEAN, /* Run commands in a clean environment */ |