diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/edquota/edquota.c | 4 | ||||
| -rw-r--r-- | usr.sbin/getfmac/getfmac.c | 4 | ||||
| -rw-r--r-- | usr.sbin/getpmac/getpmac.c | 4 | ||||
| -rw-r--r-- | usr.sbin/mixer/mixer.c | 2 | ||||
| -rw-r--r-- | usr.sbin/quotaon/quotaon.c | 4 | ||||
| -rw-r--r-- | usr.sbin/repquota/repquota.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sa/main.c | 3 | ||||
| -rw-r--r-- | usr.sbin/watch/watch.c | 4 |
8 files changed, 14 insertions, 15 deletions
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index fb1be0e07e59..a03087707419 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -107,8 +107,8 @@ main(int argc, char **argv) int i, quotatype, range, tmpfd; uid_t startuid, enduid; u_int32_t *limp; - char *protoname, *cp, *oldoptarg, ch; - int eflag = 0, tflag = 0, pflag = 0; + char *protoname, *cp, *oldoptarg; + int eflag = 0, tflag = 0, pflag = 0, ch; char *fspath = NULL; char buf[30]; diff --git a/usr.sbin/getfmac/getfmac.c b/usr.sbin/getfmac/getfmac.c index 9c3dc6d08483..351f43ece84d 100644 --- a/usr.sbin/getfmac/getfmac.c +++ b/usr.sbin/getfmac/getfmac.c @@ -58,9 +58,9 @@ usage(void) int main(int argc, char *argv[]) { - char ch, *labellist, *string; + char *labellist, *string; mac_t label; - int hflag; + int ch, hflag; int error, i; labellist = NULL; diff --git a/usr.sbin/getpmac/getpmac.c b/usr.sbin/getpmac/getpmac.c index 61398608058e..ee289e8028d4 100644 --- a/usr.sbin/getpmac/getpmac.c +++ b/usr.sbin/getpmac/getpmac.c @@ -57,10 +57,10 @@ usage(void) int main(int argc, char *argv[]) { - char ch, *labellist, *string; + char *labellist, *string; mac_t label; pid_t pid; - int error, pid_set; + int ch, error, pid_set; pid_set = 0; pid = 0; diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index f06abb38f39b..7abac464e33c 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -93,7 +93,7 @@ main(int argc, char *argv[]) int l = 0, r = 0, t = 0; char lstr[5], rstr[5]; int n = 0, lrel = 0, rrel = 0; - char ch; + int ch; char *name; diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c index 3d54a27c5408..3ade757de132 100644 --- a/usr.sbin/quotaon/quotaon.c +++ b/usr.sbin/quotaon/quotaon.c @@ -80,9 +80,9 @@ int main(int argc, char **argv) { register struct fstab *fs; - char ch, *qfnp, *whoami; + char *qfnp, *whoami; long argnum, done = 0; - int i, offmode = 0, errs = 0; + int ch, i, offmode = 0, errs = 0; whoami = rindex(*argv, '/') + 1; if (whoami == (char *)1) diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c index 5930a8a11f2b..7c0e22dd177f 100644 --- a/usr.sbin/repquota/repquota.c +++ b/usr.sbin/repquota/repquota.c @@ -110,9 +110,9 @@ main(int argc, char **argv) register struct fstab *fs; register struct passwd *pw; register struct group *gr; - int gflag = 0, uflag = 0, errs = 0; + int ch, gflag = 0, uflag = 0, errs = 0; long i, argnum, done = 0; - char ch, *qfnp; + char *qfnp; while ((ch = getopt(argc, argv, "agnuv")) != -1) { switch(ch) { diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index 2fde380a5395..fe7de23f770a 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -81,9 +81,8 @@ cmpf_t sa_cmp = cmp_usrsys; int main(int argc, char **argv) { - char ch; char pathacct[] = _PATH_ACCT; - int error = 0; + int ch, error = 0; dfltargv[0] = pathacct; diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c index eef44b037381..bca50967299a 100644 --- a/usr.sbin/watch/watch.c +++ b/usr.sbin/watch/watch.c @@ -283,9 +283,9 @@ ask_dev(char *dbuf, const char *msg) int main(int ac, char *av[]) { - int res, rv, nread; + int ch, res, rv, nread; size_t b_size = MIN_SIZE; - char ch, *buf, chb[READB_LEN]; + char *buf, chb[READB_LEN]; fd_set fd_s; (void) setlocale(LC_TIME, ""); |