WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra

cleanup courtesy of automatic checking (lint).

1 files changed, 134 insertions, 116 deletions

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 10f3b04bfe0f..b5cc1524ef4c 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -31,25 +31,24 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
-#include <sys/ucred.h>
 #include <sys/user.h>
 
 #include <err.h>
-#include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -72,7 +71,6 @@ int	utime(), stime(), ixrss(), idrss(), isrss();
 
 /* Compute offset in common structures. */
 #define	KOFF(x)	offsetof(struct kinfo_proc, x)
-#define	UOFF(x)	offsetof(struct usave, x)
 #define	ROFF(x)	offsetof(struct rusage, x)
 
 #define	UIDFMT	"u"
@@ -81,112 +79,130 @@ int	utime(), stime(), ixrss(), idrss(), isrss();
 #define	PIDLEN	5
 #define USERLEN UT_NAMESIZE
 
-VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4},
-	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4},
-	{"acflag", "ACFLG",
-		NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x"},
-	{"acflg", "", "acflag"},
-	{"blocked", "", "sigmask"},
-	{"caught", "", "sigcatch"},
-	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16},
-	{"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d"},
-	{"cputime", "", "time"},
-	{"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x"},
-	{"flags", "", "f"},
-	{"ignored", "", "sigignore"},
-	{"inblk", "INBLK",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, "ld"},
-	{"inblock", "", "inblk"},
-	{"jobc", "JOBC", NULL, 0, kvar, NULL, 4, KOFF(ki_jobc), SHORT, "d"},
-	{"ktrace", "KTRACE",
-		NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT, "x"},
-	{"lim", "LIM", NULL, 0, maxrss, NULL, 5},
-	{"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1},
-	{"logname", "", "login"},
-	{"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28},
-	{"lvl", "LVL", NULL, LJUST, lattr, NULL, 3},
-	{"majflt", "MAJFLT",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "ld"},
-	{"minflt", "MINFLT",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), LONG, "ld"},
-	{"msgrcv", "MSGRCV",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv), LONG, "ld"},
-	{"msgsnd", "MSGSND",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld"},
-	{"mtxname", "MUTEX", NULL, LJUST, mtxname, NULL, 6},
-	{"ni", "", "nice"},
-	{"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d"},
-	{"nivcsw", "NIVCSW",
-		NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "ld"},
-	{"nsignals", "", "nsigs"},
-	{"nsigs", "NSIGS",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals), LONG, "ld"},
-	{"nswap", "NSWAP",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "ld"},
-	{"nvcsw", "NVCSW",
-		NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld"},
-	{"nwchan", "WCHAN", NULL, 0, kvar, NULL, 8, KOFF(ki_wchan), KPTR, "lx"},
-	{"oublk", "OUBLK",
-		NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld"},
-	{"oublock", "", "oublk"},
-	{"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, "lx"},
-	{"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6},
-	{"pcpu", "", "%cpu"},
-	{"pending", "", "sig"},
-	{"pgid", "PGID",
-		NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pgid), UINT, PIDFMT},
-	{"pid", "PID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pid), UINT, PIDFMT},
-	{"pmem", "", "%mem"},
-	{"ppid", "PPID",
-		NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_ppid), UINT, PIDFMT},
-	{"pri", "PRI", NULL, 0, pri, NULL, 3},
-	{"re", "RE", NULL, 0, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d"},
+static VAR var[] = {
+	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
+	{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
+		"x", 0},
+	{"acflg", "", "acflag", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16,
+		0, CHAR, NULL, 0},
+	{"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d",
+		0},
+	{"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0},
+	{"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"inblk", "INBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG,
+		"ld", 0},
+	{"inblock", "", "inblk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"jobc", "JOBC", NULL, 0, kvar, NULL, 4, KOFF(ki_jobc), SHORT, "d",
+		0},
+	{"ktrace", "KTRACE", NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT,
+		"x", 0},
+	{"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0},
+	{"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR,
+		NULL, 0},
+	{"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28, 0, CHAR,
+		NULL, 0},
+	{"lvl", "LVL", NULL, LJUST, lattr, NULL, 3, 0, CHAR, NULL, 0},
+	{"majflt", "MAJFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_majflt),
+		LONG, "ld", 0},
+	{"minflt", "MINFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_minflt),
+		LONG, "ld", 0},
+	{"msgrcv", "MSGRCV", NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv),
+		LONG, "ld", 0},
+	{"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd),
+		LONG, "ld", 0},
+	{"mtxname", "MUTEX", NULL, LJUST, mtxname, NULL, 6, 0, CHAR, NULL,
+		0},
+	{"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d",
+		0},
+	{"nivcsw", "NIVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw),
+		LONG, "ld", 0},
+	{"nsignals", "", "nsigs", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"nsigs", "NSIGS", NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals),
+		LONG, "ld", 0},
+	{"nswap", "NSWAP", NULL, USER, rvar, NULL, 4, ROFF(ru_nswap),
+		LONG, "ld", 0},
+	{"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw),
+		LONG, "ld", 0},
+	{"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock),
+		LONG, "ld", 0},
+	{"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR,
+		"lx", 0},
+	{"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0},
+	{"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"pgid", "PGID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pgid), UINT,
+		PIDFMT, 0},
+	{"pid", "PID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pid), UINT,
+		PIDFMT, 0},
+	{"pmem", "", "%mem", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"ppid", "PPID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_ppid), UINT,
+		PIDFMT, 0},
+	{"pri", "PRI", NULL, 0, pri, NULL, 3, 0, CHAR, NULL, 0},
+	{"re", "RE", NULL, 0, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d",
+		0},
 	{"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid),
-		UINT, UIDFMT},
-	{"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d"},
-	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri)},
+		UINT, UIDFMT, 0},
+	{"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d",
+		0},
+	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
+		NULL, 0},
 	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
-		UINT, UIDFMT},
-	{"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN},
+		UINT, UIDFMT, 0},
+	{"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN,
+		0, CHAR, NULL, 0},
 	{"sid", "SID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_sid), UINT,
-		PIDFMT},
-	{"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT, "x"},
-	{"sigcatch", "CAUGHT",
-		NULL, 0, kvar, NULL, 8, KOFF(ki_sigcatch), UINT, "x"},
-	{"sigignore", "IGNORED",
-		NULL, 0, kvar, NULL, 8, KOFF(ki_sigignore), UINT, "x"},
-	{"sigmask", "BLOCKED",
-		NULL, 0, kvar, NULL, 8, KOFF(ki_sigmask), UINT, "x"},
-	{"sl", "SL", NULL, 0, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d"},
-	{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7},
-	{"stat", "", "state"},
-	{"state", "STAT", NULL, 0, state, NULL, 4},
-	{"svgid", "SVGID", NULL, 0,
-		kvar, NULL, UIDLEN, KOFF(ki_svgid), UINT, UIDFMT},
-	{"svuid", "SVUID", NULL, 0,
-		kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT},
-	{"tdev", "TDEV", NULL, 0, tdev, NULL, 4},
-	{"time", "TIME", NULL, USER, cputime, NULL, 9},
-	{"tpgid", "TPGID",
-		NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT},
+		PIDFMT, 0},
+	{"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT,
+		"x", 0},
+	{"sigcatch", "CAUGHT", NULL, 0, kvar, NULL, 8, KOFF(ki_sigcatch),
+		UINT, "x", 0},
+	{"sigignore", "IGNORED", NULL, 0, kvar, NULL, 8, KOFF(ki_sigignore),
+		UINT, "x", 0},
+	{"sigmask", "BLOCKED", NULL, 0, kvar, NULL, 8, KOFF(ki_sigmask),
+		UINT, "x", 0},
+	{"sl", "SL", NULL, 0, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d",
+		0},
+	{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7, 0, CHAR, NULL,
+		0},
+	{"stat", "", "state", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"state", "STAT", NULL, 0, state, NULL, 4, 0, CHAR, NULL, 0},
+	{"svgid", "SVGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svgid),
+		UINT, UIDFMT, 0},
+	{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
+		UINT, UIDFMT, 0},
+	{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+	{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
+	{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
+		PIDFMT, 0},
 	{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
-		PIDFMT},
-	{"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4},
-	{"tt", "TT ", NULL, 0, tname, NULL, 4},
-	{"tty", "TTY", NULL, LJUST, longtname, NULL, 8},
-	{"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN},
-	{"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid),
-		UINT, UIDFMT},
-	{"upr", "UPR", NULL, 0, kvar, NULL, 3, KOFF(ki_pri.pri_user),
-		UCHAR, "d"},
-	{"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN},
-	{"usrpri", "", "upr"},
-	{"vsize", "", "vsz"},
-	{"vsz", "VSZ", NULL, 0, vsize, NULL, 5},
-	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6},
-	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT, "x"},
-	{""},
+		PIDFMT, 0},
+	{"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4, 0, CHAR, NULL, 0},
+	{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
+	{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
+	{"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL,
+		0},
+	{"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT,
+		UIDFMT, 0},
+	{"upr", "UPR", NULL, 0, kvar, NULL, 3, KOFF(ki_pri.pri_user), UCHAR,
+		"d", 0},
+	{"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR,
+		NULL, 0},
+	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
+	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
+		"x", 0},
+	{"", NULL, NULL, 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 };
 
 void
@@ -194,7 +210,7 @@ showkey(void)
 {
 	VAR *v;
 	int i;
-	char *p, *sep;
+	const char *p, *sep;
 
 	i = 0;
 	sep = "";
@@ -211,17 +227,19 @@ showkey(void)
 }
 
 void
-parsefmt(char *p)
+parsefmt(const char *p)
 {
 	static struct varent *vtail;
+	char *tempstr, *tempstr1;
 
 #define	FMTSEP	" \t,\n"
-	while (p && *p) {
+	tempstr1 = tempstr = strdup(p);
+	while (tempstr && *tempstr) {
 		char *cp;
 		VAR *v;
 		struct varent *vent;
 
-		while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
+		while ((cp = strsep(&tempstr, FMTSEP)) != NULL && *cp == '\0')
 			/* void */;
 		if (cp == NULL || !(v = findvar(cp)))
 			continue;
@@ -236,6 +254,7 @@ parsefmt(char *p)
 			vtail = vent;
 		}
 	}
+	free(tempstr1);
 	if (!vhead)
 		errx(1, "no valid keywords");
 }
@@ -245,7 +264,6 @@ findvar(char *p)
 {
 	VAR *v, key;
 	char *hp;
-	int vcmp();
 
 	hp = strchr(p, '=');
 	if (hp)
@@ -273,5 +291,5 @@ findvar(char *p)
 static int
 vcmp(const void *a, const void *b)
 {
-        return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
+        return (strcmp(((const VAR *)a)->name, ((const VAR *)b)->name));
 }