Index: sbin/atm/fore_dnld/fore_dnld.c
===================================================================
RCS file: /home/ncvs/src/sbin/atm/fore_dnld/fore_dnld.c,v
retrieving revision 1.15
diff -u -r1.15 fore_dnld.c
--- sbin/atm/fore_dnld/fore_dnld.c	31 Jul 2003 14:26:07 -0000	1.15
+++ sbin/atm/fore_dnld/fore_dnld.c	7 Jan 2004 11:17:55 -0000
@@ -903,8 +903,7 @@
 	u_char	*ram;			/* pointer to RAM */
 	Mon960	*Mon;			/* Uart */
 	Aali	*aap;
-	char	c;
-	int	i, err;
+	int	c, i, err;
 	int	binary = 0;		/* Send binary file */
 	caddr_t	buf;			/* Ioctl buffer */
 	char	bus_dev[80];		/* Bus device to mmap on */
Index: sbin/camcontrol/modeedit.c
===================================================================
RCS file: /home/ncvs/src/sbin/camcontrol/modeedit.c,v
retrieving revision 1.16
diff -u -r1.16 modeedit.c
--- sbin/camcontrol/modeedit.c	22 Aug 2003 01:56:17 -0000	1.16
+++ sbin/camcontrol/modeedit.c	15 Nov 2003 12:46:05 -0000
@@ -362,6 +362,7 @@
 	int found;
 	int lineno;
 	enum { LOCATE, PAGENAME, PAGEDEF } state;
+	int ch;
 	char c;
 
 #define	SETSTATE_LOCATE do {						\
@@ -397,19 +398,20 @@
 	lineno = 0;
 	found = 0;
 	SETSTATE_LOCATE;
-	while ((c = fgetc(pagedb)) != EOF) {
+	while ((ch = fgetc(pagedb)) != EOF) {
 
 		/* Keep a line count to make error messages more useful. */
 		UPDATE_LINENO;
 
 		/* Skip over comments anywhere in the mode database. */
-		if (c == '#') {
+		if (ch == '#') {
 			do {
-				c = fgetc(pagedb);
-			} while (c != '\n' && c != EOF);
+				ch = fgetc(pagedb);
+			} while (ch != '\n' && ch != EOF);
 			UPDATE_LINENO;
 			continue;
 		}
+		c = ch;
 
 		/* Strip out newline characters. */
 		if (c == '\n')
Index: sbin/devfs/devfs.c
===================================================================
RCS file: /home/ncvs/src/sbin/devfs/devfs.c,v
retrieving revision 1.4
diff -u -r1.4 devfs.c
--- sbin/devfs/devfs.c	29 Jul 2002 17:09:21 -0000	1.4
+++ sbin/devfs/devfs.c	15 Nov 2003 12:51:54 -0000
@@ -59,7 +59,7 @@
 {
 	const char *mountpt;
 	struct cmd *c;
-	char ch;
+	int ch;
 
 	mountpt = NULL;
 	while ((ch = getopt(ac, av, "m:")) != -1)
Index: sbin/devfs/rule.c
===================================================================
RCS file: /home/ncvs/src/sbin/devfs/rule.c,v
retrieving revision 1.4
diff -u -r1.4 rule.c
--- sbin/devfs/rule.c	28 Jul 2002 06:59:40 -0000	1.4
+++ sbin/devfs/rule.c	15 Nov 2003 12:56:55 -0000
@@ -82,7 +82,7 @@
 rule_main(int ac, char **av)
 {
 	struct cmd *c;
-	char ch;
+	int ch;
 
 	setprogname("devfs rule");
 	optreset = optind = 1;
Index: sbin/mdmfs/mdmfs.c
===================================================================
RCS file: /home/ncvs/src/sbin/mdmfs/mdmfs.c,v
retrieving revision 1.17
diff -u -r1.17 mdmfs.c
--- sbin/mdmfs/mdmfs.c	5 Aug 2003 15:04:39 -0000	1.17
+++ sbin/mdmfs/mdmfs.c	7 Jan 2004 11:19:22 -0000
@@ -91,7 +91,8 @@
 	bool have_mdtype;
 	bool detach, softdep, autounit;
 	char *mtpoint, *unitstr;
-	char ch, *p;
+	char *p;
+	int ch;
 	void *set;
 
 	/* Misc. initialization. */
Index: sbin/quotacheck/quotacheck.c
===================================================================
RCS file: /home/ncvs/src/sbin/quotacheck/quotacheck.c,v
retrieving revision 1.22
diff -u -r1.22 quotacheck.c
--- sbin/quotacheck/quotacheck.c	7 Aug 2003 05:38:56 -0000	1.22
+++ sbin/quotacheck/quotacheck.c	7 Jan 2004 11:21:51 -0000
@@ -150,9 +150,9 @@
 	struct passwd *pw;
 	struct group *gr;
 	struct quotaname *auxdata;
-	int i, argnum, maxrun, errs;
+	int i, argnum, maxrun, errs, ch;
 	long done = 0;
-	char ch, *name;
+	char *name;
 
 	errs = maxrun = 0;
 	while ((ch = getopt(argc, argv, "aguvl:")) != -1) {
Index: sys/sys/proc.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/proc.h,v
retrieving revision 1.363
diff -u -r1.363 proc.h
--- sys/sys/proc.h	3 Jan 2004 02:02:26 -0000	1.363
+++ sys/sys/proc.h	7 Jan 2004 11:40:11 -0000
@@ -510,7 +510,7 @@
 #define	kg_startcopy	kg_endzero
 	u_char		kg_pri_class;	/* (j) Scheduling class. */
 	u_char		kg_user_pri;	/* (j) User pri from estcpu and nice. */
-	char		kg_nice;	/* (c + j) Process "nice" value. */
+	signed char	kg_nice;	/* (c + j) Process "nice" value. */
 #define	kg_endcopy kg_numthreads
 	int		kg_numthreads;	/* (j) Num threads in total. */
 	int		kg_kses;	/* (j) Num KSEs in group. */
Index: sys/sys/user.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/user.h,v
retrieving revision 1.53
diff -u -r1.53 user.h
--- sys/sys/user.h	13 May 2003 20:36:02 -0000	1.53
+++ sys/sys/user.h	15 Nov 2003 12:21:05 -0000
@@ -143,7 +143,7 @@
 	long	ki_kiflag;		/* KI_* flags (below) */
 	int	ki_traceflag;		/* Kernel trace points */
 	char	ki_stat;		/* S* process status */
-	char	ki_nice;		/* Process "nice" value */
+	signed char ki_nice;		/* Process "nice" value */
 	char	ki_lock;		/* Process lock (prevent swap) count */
 	char	ki_rqindex;		/* Run queue index */
 	u_char	ki_oncpu;		/* Which cpu we are on */
Index: usr.bin/locale/locale.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/locale/locale.c,v
retrieving revision 1.10
diff -u -r1.10 locale.c
--- usr.bin/locale/locale.c	26 Jun 2003 11:05:56 -0000	1.10
+++ usr.bin/locale/locale.c	17 Nov 2003 06:05:31 -0000
@@ -211,7 +211,7 @@
 int
 main(int argc, char *argv[])
 {
-	char	ch;
+	int	ch;
 	int	tmp;
 
 	while ((ch = getopt(argc, argv, "ackm")) != -1) {
Index: usr.bin/uuencode/uuencode.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.17
diff -u -r1.17 uuencode.c
--- usr.bin/uuencode/uuencode.c	3 May 2003 19:44:46 -0000	1.17
+++ usr.bin/uuencode/uuencode.c	17 Nov 2003 07:34:01 -0000
@@ -77,7 +77,7 @@
 {
 	struct stat sb;
 	int base64;
-	char ch;
+	int ch;
 	char *outfile;
 
 	base64 = 0;
Index: usr.sbin/edquota/edquota.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/edquota/edquota.c,v
retrieving revision 1.20
diff -u -r1.20 edquota.c
--- usr.sbin/edquota/edquota.c	3 May 2003 21:06:36 -0000	1.20
+++ usr.sbin/edquota/edquota.c	17 Nov 2003 07:38:37 -0000
@@ -107,8 +107,8 @@
 	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];
 
Index: usr.sbin/getfmac/getfmac.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/getfmac/getfmac.c,v
retrieving revision 1.1
diff -u -r1.1 getfmac.c
--- usr.sbin/getfmac/getfmac.c	23 Oct 2002 03:15:23 -0000	1.1
+++ usr.sbin/getfmac/getfmac.c	17 Nov 2003 07:58:31 -0000
@@ -58,9 +58,9 @@
 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;
Index: usr.sbin/getpmac/getpmac.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/getpmac/getpmac.c,v
retrieving revision 1.1
diff -u -r1.1 getpmac.c
--- usr.sbin/getpmac/getpmac.c	23 Oct 2002 03:15:23 -0000	1.1
+++ usr.sbin/getpmac/getpmac.c	17 Nov 2003 08:02:46 -0000
@@ -57,10 +57,10 @@
 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;
Index: usr.sbin/mixer/mixer.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mixer/mixer.c,v
retrieving revision 1.20
diff -u -r1.20 mixer.c
--- usr.sbin/mixer/mixer.c	15 Jun 2003 08:46:04 -0000	1.20
+++ usr.sbin/mixer/mixer.c	17 Nov 2003 08:08:35 -0000
@@ -93,7 +93,7 @@
 	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;
 
Index: usr.sbin/quotaon/quotaon.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/quotaon/quotaon.c,v
retrieving revision 1.8
diff -u -r1.8 quotaon.c
--- usr.sbin/quotaon/quotaon.c	3 May 2003 21:06:39 -0000	1.8
+++ usr.sbin/quotaon/quotaon.c	17 Nov 2003 08:14:42 -0000
@@ -80,9 +80,9 @@
 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)
Index: usr.sbin/repquota/repquota.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/repquota/repquota.c,v
retrieving revision 1.16
diff -u -r1.16 repquota.c
--- usr.sbin/repquota/repquota.c	7 Jul 2003 21:41:23 -0000	1.16
+++ usr.sbin/repquota/repquota.c	7 Jan 2004 11:35:35 -0000
@@ -110,9 +110,9 @@
 	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) {
Index: usr.sbin/sa/main.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sa/main.c,v
retrieving revision 1.13
diff -u -r1.13 main.c
--- usr.sbin/sa/main.c	3 May 2003 21:06:40 -0000	1.13
+++ usr.sbin/sa/main.c	7 Jan 2004 11:36:35 -0000
@@ -81,9 +81,8 @@
 int
 main(int argc, char **argv)
 {
-	char ch;
 	char pathacct[] = _PATH_ACCT;
-	int error = 0;
+	int ch, error = 0;
 
 	dfltargv[0] = pathacct;
 
Index: usr.sbin/watch/watch.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/watch/watch.c,v
retrieving revision 1.28
diff -u -r1.28 watch.c
--- usr.sbin/watch/watch.c	3 May 2003 21:06:41 -0000	1.28
+++ usr.sbin/watch/watch.c	17 Nov 2003 08:46:49 -0000
@@ -283,9 +283,9 @@
 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, "");