Index: apply/apply.c
===================================================================
RCS file: /cvs/src/usr.bin/apply/apply.c,v
retrieving revision 1.4
diff -u -u -r1.4 apply.c
--- apply/apply.c	19 Jun 2004 12:34:52 -0000	1.4
+++ apply/apply.c	7 Nov 2004 20:02:13 -0000
@@ -205,7 +205,7 @@
 
 		/* Run the command. */
 		if (debug)
-			(void)printf("%s\n", c);
+			printf("%s\n", c);
 		else
 			if (exec_shell(c, shell, name))
 				rval = 1;
@@ -240,7 +240,7 @@
 	case -1:			/* error */
 		err(1, "vfork");
 	case 0:				/* child */
-		(void)sigsetmask(omask);
+		sigsetmask(omask);
 		execl(use_shell, use_name, "-c", command, (char *)NULL);
 		warn("%s", use_shell);
 		_exit(1);
@@ -248,9 +248,9 @@
 	intsave = signal(SIGINT, SIG_IGN);
 	quitsave = signal(SIGQUIT, SIG_IGN);
 	pid = waitpid(pid, &pstat, 0);
-	(void)sigsetmask(omask);
-	(void)signal(SIGINT, intsave);
-	(void)signal(SIGQUIT, quitsave);
+	sigsetmask(omask);
+	signal(SIGINT, intsave);
+	signal(SIGQUIT, quitsave);
 	return(pid == -1 ? -1 : pstat);
 }
 
@@ -258,7 +258,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	"usage: apply [-a magic] [-d] [-0123456789] command arguments ...\n");
 	exit(1);
 }
Index: ar/append.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/append.c,v
retrieving revision 1.3
diff -u -u -r1.3 append.c
--- ar/append.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/append.c	7 Nov 2004 20:02:13 -0000
@@ -77,11 +77,11 @@
 			continue;
 		}
 		if (options & AR_V)
-			(void)printf("q - %s\n", file);
+			printf("q - %s\n", file);
 		cf.rfd = fd;
 		cf.rname = file;
 		put_arobj(&cf, &sb);
-		(void)close(fd);
+		close(fd);
 	}
 	close_archive(afd);
 	return (eval);
Index: ar/ar.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/ar.c,v
retrieving revision 1.4
diff -u -u -r1.4 ar.c
--- ar/ar.c	3 Nov 2003 19:31:28 -0000	1.4
+++ ar/ar.c	7 Nov 2004 20:02:13 -0000
@@ -75,7 +75,7 @@
 	char *p;
 	int (*fcall)(char **) = NULL;
 
-	(void) setlocale(LC_TIME, "");;
+	setlocale(LC_TIME, "");;
 
 	if (argc < 3)
 		usage();
@@ -88,7 +88,7 @@
 		if (!(p = malloc((u_int)(strlen(argv[1]) + 2))))
 			err(1, NULL);
 		*p = '-';
-		(void)strcpy(p + 1, argv[1]);
+		strcpy(p + 1, argv[1]);
 		argv[1] = p;
 	}
 
@@ -221,7 +221,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 		"usage: ar -d [-Tv] archive file ...",
 		"       ar -m [-Tv] archive file ...",
 		"       ar -m [-abiTv] position archive file ...",
Index: ar/archive.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/archive.c,v
retrieving revision 1.3
diff -u -u -r1.3 archive.c
--- ar/archive.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/archive.c	7 Nov 2004 20:02:13 -0000
@@ -110,7 +110,7 @@
 close_archive(int fd)
 {
 
-	(void)close(fd);			/* Implicit unlock. */
+	close(fd);			/* Implicit unlock. */
 }
 
 /* Convert ar header field to an integer. */
@@ -207,7 +207,7 @@
 	 */
 	if (sb) {
 		name = basename(cfp->rname);
-		(void)fstat(cfp->rfd, sb);
+		fstat(cfp->rfd, sb);
 
 		/*
 		 * If not truncating names and the name is too long or contains
@@ -216,23 +216,23 @@
 		lname = strlen(name);
 		if (options & AR_TR) {
 			if (lname > OLDARMAXNAME) {
-				(void)fflush(stdout);
+				fflush(stdout);
 				warnx("warning: %s truncated to %.*s",
 				    name, OLDARMAXNAME, name);
-				(void)fflush(stderr);
+				fflush(stderr);
 			}
-			(void)sprintf(hb, HDR3, name,
+			sprintf(hb, HDR3, name,
 			    (long)sb->st_mtimespec.tv_sec, sb->st_uid,
 			    sb->st_gid, sb->st_mode, sb->st_size, ARFMAG);
 			lname = 0;
 		} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
-			(void)sprintf(hb, HDR1, AR_EFMT1, lname,
+			sprintf(hb, HDR1, AR_EFMT1, lname,
 			    (long)sb->st_mtimespec.tv_sec, sb->st_uid,
 			    sb->st_gid, sb->st_mode, sb->st_size + lname,
 			    ARFMAG);
 		else {
 			lname = 0;
-			(void)sprintf(hb, HDR2, name,
+			sprintf(hb, HDR2, name,
 			    (long)sb->st_mtimespec.tv_sec, sb->st_uid,
 			    sb->st_gid, sb->st_mode, sb->st_size, ARFMAG);
 		}
Index: ar/contents.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/contents.c,v
retrieving revision 1.3
diff -u -u -r1.3 contents.c
--- ar/contents.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/contents.c	7 Nov 2004 20:02:13 -0000
@@ -77,20 +77,20 @@
 		if (options & AR_V) {
 			static int d_first = -1;
 
-			(void)strmode(chdr.mode, buf);
-			(void)printf("%s %6d/%-6d %8qd ",
+			strmode(chdr.mode, buf);
+			printf("%s %6d/%-6d %8qd ",
 			    buf + 1, chdr.uid, chdr.gid, chdr.size);
 
 			if (d_first < 0)
 				d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 			tp = localtime(&chdr.date);
-			(void)strftime(buf, sizeof(buf),
+			strftime(buf, sizeof(buf),
 				       d_first ? "%e %b %R %Y" :
 						 "%b %e %R %Y",
 				       tp);
-			(void)printf("%s %s\n", buf, file);
+			printf("%s %s\n", buf, file);
 		} else
-			(void)printf("%s\n", file);
+			printf("%s\n", file);
 		if (!all && !*argv)
 			break;
 next:		skip_arobj(afd);
Index: ar/delete.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/delete.c,v
retrieving revision 1.3
diff -u -u -r1.3 delete.c
--- ar/delete.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/delete.c	7 Nov 2004 20:02:13 -0000
@@ -71,7 +71,7 @@
 	while (get_arobj(afd)) {
 		if (*argv && (file = files(argv))) {
 			if (options & AR_V)
-				(void)printf("d - %s\n", file);
+				printf("d - %s\n", file);
 			skip_arobj(afd);
 			continue;
 		}
@@ -79,12 +79,12 @@
 	}
 
 	size = lseek(tfd, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd, (off_t)0, SEEK_SET);
-	(void)lseek(afd, (off_t)SARMAG, SEEK_SET);
+	lseek(tfd, (off_t)0, SEEK_SET);
+	lseek(afd, (off_t)SARMAG, SEEK_SET);
 	SETCF(tfd, tname, afd, archive, NOPAD);
 	copy_ar(&cf, size);
-	(void)close(tfd);
-	(void)ftruncate(afd, size + SARMAG);
+	close(tfd);
+	ftruncate(afd, size + SARMAG);
 	close_archive(afd);
 
 	if (*argv) {
Index: ar/extract.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/extract.c,v
retrieving revision 1.3
diff -u -u -r1.3 extract.c
--- ar/extract.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/extract.c	7 Nov 2004 20:02:13 -0000
@@ -96,7 +96,7 @@
 		}
 
 		if (options & AR_V)
-			(void)printf("x - %s\n", file);
+			printf("x - %s\n", file);
 
 		cf.wfd = tfd;
 		cf.wname = file;
@@ -113,7 +113,7 @@
 				eval = 1;
 			}
 		}
-		(void)close(tfd);
+		close(tfd);
 		if (!all && !*argv)
 			break;
 	}
Index: ar/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- ar/misc.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/misc.c	7 Nov 2004 20:02:13 -0000
@@ -71,16 +71,16 @@
 	}
 
 	if (envtmp)
-		(void)sprintf(path, "%s/%s", envtmp, _NAME_ARTMP);
+		sprintf(path, "%s/%s", envtmp, _NAME_ARTMP);
 	else
 		strcpy(path, _PATH_ARTMP);
 
 	sigfillset(&set);
-	(void)sigprocmask(SIG_BLOCK, &set, &oset);
+	sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((fd = mkstemp(path)) == -1)
 		error(tname);
-        (void)unlink(path);
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
+        unlink(path);
+	sigprocmask(SIG_SETMASK, &oset, NULL);
 	return (fd);
 }
 
Index: ar/move.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/move.c,v
retrieving revision 1.3
diff -u -u -r1.3 move.c
--- ar/move.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/move.c	7 Nov 2004 20:02:13 -0000
@@ -87,7 +87,7 @@
 	for (curfd = tfd1; get_arobj(afd);) {
 		if (*argv && (file = files(argv))) {
 			if (options & AR_V)
-				(void)printf("m - %s\n", file);
+				printf("m - %s\n", file);
 			cf.wfd = tfd2;
 			put_arobj(&cf, (struct stat *)NULL);
 			continue;
@@ -111,24 +111,24 @@
 		close_archive(afd);
 		return (1);
 	}
-	(void)lseek(afd, (off_t)SARMAG, SEEK_SET);
+	lseek(afd, (off_t)SARMAG, SEEK_SET);
 
 	SETCF(tfd1, tname, afd, archive, NOPAD);
 	tsize = size = lseek(tfd1, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd1, (off_t)0, SEEK_SET);
+	lseek(tfd1, (off_t)0, SEEK_SET);
 	copy_ar(&cf, size);
 
 	tsize += size = lseek(tfd2, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd2, (off_t)0, SEEK_SET);
+	lseek(tfd2, (off_t)0, SEEK_SET);
 	cf.rfd = tfd2;
 	copy_ar(&cf, size);
 
 	tsize += size = lseek(tfd3, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd3, (off_t)0, SEEK_SET);
+	lseek(tfd3, (off_t)0, SEEK_SET);
 	cf.rfd = tfd3;
 	copy_ar(&cf, size);
 
-	(void)ftruncate(afd, tsize + SARMAG);
+	ftruncate(afd, tsize + SARMAG);
 	close_archive(afd);
 
 	if (*argv) {
Index: ar/print.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/print.c,v
retrieving revision 1.3
diff -u -u -r1.3 print.c
--- ar/print.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/print.c	7 Nov 2004 20:02:13 -0000
@@ -72,8 +72,8 @@
 			continue;
 		}
 		if (options & AR_V) {
-			(void)printf("\n<%s>\n\n", file);
-			(void)fflush(stdout);
+			printf("\n<%s>\n\n", file);
+			fflush(stdout);
 		}
 		copy_ar(&cf, chdr.size);
 		if (!all && !*argv)
Index: ar/replace.c
===================================================================
RCS file: /cvs/src/usr.bin/ar/replace.c,v
retrieving revision 1.3
diff -u -u -r1.3 replace.c
--- ar/replace.c	2 Oct 2003 17:42:25 -0000	1.3
+++ ar/replace.c	7 Nov 2004 20:02:13 -0000
@@ -100,19 +100,19 @@
 				warn("%s", file);
 				goto useold;
 			}
-			(void)fstat(sfd, &sb);
+			fstat(sfd, &sb);
 			if (options & AR_U && sb.st_mtime <= chdr.date) {
-				(void) close(sfd);
+				close(sfd);
 				goto useold;
 			}
 
 			if (options & AR_V)
-			     (void)printf("r - %s\n", file);
+			     printf("r - %s\n", file);
 
 			/* Read from disk, write to an archive; pad on write */
 			SETCF(sfd, file, curfd, tname, WPAD);
 			put_arobj(&cf, &sb);
-			(void)close(sfd);
+			close(sfd);
 			skip_arobj(afd);
 			continue;
 		}
@@ -142,36 +142,36 @@
 	/* Append any left-over arguments to the end of the after file. */
 append:	while ( (file = *argv++) ) {
 		if (options & AR_V)
-			(void)printf("a - %s\n", file);
+			printf("a - %s\n", file);
 		if ((sfd = open(file, O_RDONLY)) < 0) {
 			errflg = 1;
 			warn("%s", file);
 			continue;
 		}
-		(void)fstat(sfd, &sb);
+		fstat(sfd, &sb);
 		/* Read from disk, write to an archive; pad on write. */
 		SETCF(sfd, file,
 		    options & (AR_A|AR_B) ? tfd1 : tfd2, tname, WPAD);
 		put_arobj(&cf, &sb);
-		(void)close(sfd);
+		close(sfd);
 	}
 
-	(void)lseek(afd, (off_t)SARMAG, SEEK_SET);
+	lseek(afd, (off_t)SARMAG, SEEK_SET);
 
 	SETCF(tfd1, tname, afd, archive, NOPAD);
 	if (tfd1 != -1) {
 		tsize = size = lseek(tfd1, (off_t)0, SEEK_CUR);
-		(void)lseek(tfd1, (off_t)0, SEEK_SET);
+		lseek(tfd1, (off_t)0, SEEK_SET);
 		copy_ar(&cf, size);
 	} else
 		tsize = 0;
 
 	tsize += size = lseek(tfd2, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd2, (off_t)0, SEEK_SET);
+	lseek(tfd2, (off_t)0, SEEK_SET);
 	cf.rfd = tfd2;
 	copy_ar(&cf, size);
 
-	(void)ftruncate(afd, tsize + SARMAG);
+	ftruncate(afd, tsize + SARMAG);
 	close_archive(afd);
 	return (errflg);
 }
Index: basename/basename.c
===================================================================
RCS file: /cvs/src/usr.bin/basename/basename.c,v
retrieving revision 1.3
diff -u -u -r1.3 basename.c
--- basename/basename.c	2 Oct 2003 17:42:25 -0000	1.3
+++ basename/basename.c	7 Nov 2004 20:02:13 -0000
@@ -74,7 +74,7 @@
 	if (*++argv && (q = strchr(p, '\0') - strlen(*argv)) > p &&
 	    strcmp(*argv, q) == 0)
 			*q = '\0';
-	(void)printf("%s\n", p);
+	printf("%s\n", p);
 	exit(0);
 }
 
@@ -82,6 +82,6 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: basename string [suffix]\n");
+	fprintf(stderr, "usage: basename string [suffix]\n");
 	exit(1);
 }
Index: biff/biff.c
===================================================================
RCS file: /cvs/src/usr.bin/biff/biff.c,v
retrieving revision 1.3
diff -u -u -r1.3 biff.c
--- biff/biff.c	2 Oct 2003 17:42:25 -0000	1.3
+++ biff/biff.c	7 Nov 2004 20:02:13 -0000
@@ -73,7 +73,7 @@
 		err(2, "stat");
 
 	if (*argv == NULL) {
-		(void)printf("is %s\n",
+		printf("is %s\n",
 		    sb.st_mode & S_IXUSR ? "y" :
 		    sb.st_mode & S_IXGRP ? "b" : "n");
 		return(sb.st_mode & (S_IXUSR | S_IXGRP) ? 0 : 1);
@@ -102,6 +102,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: biff [n | y | b]\n");
+	fprintf(stderr, "usage: biff [n | y | b]\n");
 	exit(2);
 }
Index: c89/c89.c
===================================================================
RCS file: /cvs/src/usr.bin/c89/c89.c,v
retrieving revision 1.2
diff -u -u -r1.2 c89.c
--- c89/c89.c	17 Jun 2003 04:29:25 -0000	1.2
+++ c89/c89.c	7 Nov 2004 20:02:13 -0000
@@ -89,7 +89,7 @@
 	/* Append argv[1..] at the end of Argv[]. */
 	for (i = 1; i <= argc; ++i)
 		Argv[Argc++] = argv[i];
-	(void)execv(CC, Argv);
+	execv(CC, Argv);
 	err(1, "execv(" CC ")");
 }
 
Index: calendar/calendar.c
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.3
diff -u -u -r1.3 calendar.c
--- calendar/calendar.c	2 Oct 2003 17:42:26 -0000	1.3
+++ calendar/calendar.c	7 Nov 2004 20:02:13 -0000
@@ -61,7 +61,7 @@
 {
 	int ch;
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	while ((ch = getopt(argc, argv, "-af:t:A:B:F:W:")) != -1)
 		switch (ch) {
@@ -111,18 +111,18 @@
 
 	/* use current time */
 	if (f_time <= 0) 
-	    (void)time(&f_time);
+	    time(&f_time);
 
 	settime(f_time);
 	
 	if (doall)
 		while ((pw = getpwent()) != NULL) {
-			(void)setegid(pw->pw_gid);
-			(void)initgroups(pw->pw_name, pw->pw_gid);
-			(void)seteuid(pw->pw_uid);
+			setegid(pw->pw_gid);
+			initgroups(pw->pw_name, pw->pw_gid);
+			seteuid(pw->pw_uid);
 			if (!chdir(pw->pw_dir))
 				cal();
-			(void)seteuid(0);
+			seteuid(0);
 		}
 	else
 		cal();
@@ -133,7 +133,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n",
 	    "usage: calendar [-a] [-A days] [-B days] [-F friday] "
 	    "[-f calendarfile]",
 	    "                [-t dd[.mm[.year]]] [-W days]");
Index: calendar/day.c
===================================================================
RCS file: /cvs/src/usr.bin/calendar/day.c,v
retrieving revision 1.3
diff -u -u -r1.3 day.c
--- calendar/day.c	2 Oct 2003 17:42:26 -0000	1.3
+++ calendar/day.c	7 Nov 2004 20:02:13 -0000
@@ -156,9 +156,9 @@
 	lbufp = setlocale(LC_TIME, NULL);
 	if (lbufp != NULL && (oldl = strdup(lbufp)) == NULL)
 		errx(1, "cannot allocate memory");
-	(void) setlocale(LC_TIME, "C");
+	setlocale(LC_TIME, "C");
 	header[5].iov_len = strftime(dayname, sizeof(dayname), "%A", tp);
-	(void) setlocale(LC_TIME, (oldl != NULL ? oldl : ""));
+	setlocale(LC_TIME, (oldl != NULL ? oldl : ""));
 	if (oldl != NULL)
 		free(oldl);
 
@@ -174,7 +174,7 @@
     int d, m, y;
     struct tm tm;
 
-    (void)time(&t);
+    time(&t);
     tp = localtime(&t);
 
     tm.tm_sec = 0;
Index: calendar/io.c
===================================================================
RCS file: /cvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.4
diff -u -u -r1.4 io.c
--- calendar/io.c	6 Jan 2004 15:29:09 -0000	1.4
+++ calendar/io.c	7 Nov 2004 20:02:13 -0000
@@ -102,7 +102,7 @@
 		if (buf[0] == '\0')
 			continue;
 		if (strncmp(buf, "LANG=", 5) == 0) {
-			(void) setlocale(LC_ALL, buf + 5);
+			setlocale(LC_ALL, buf + 5);
 			d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 			setnnames();
 			continue;
@@ -142,10 +142,10 @@
 				tm.tm_mon = month - 1;
 				tm.tm_mday = day;
 				tm.tm_year = tp->tm_year; /* unused */
-				(void)strftime(dbuf, sizeof(dbuf),
+				strftime(dbuf, sizeof(dbuf),
 					       d_first ? "%e %b" : "%b %e",
 					       &tm);
-				(void)fprintf(fp, "%s%c%s\n", dbuf,
+				fprintf(fp, "%s%c%s\n", dbuf,
 				    var ? '*' : ' ', p);
 			}
 		}
@@ -254,16 +254,16 @@
 		return (NULL);
 	switch (fork()) {
 	case -1:			/* error */
-		(void)close(pdes[0]);
-		(void)close(pdes[1]);
+		close(pdes[0]);
+		close(pdes[1]);
 		return (NULL);
 	case 0:
 		/* child -- stdin already setup, set stdout to pipe input */
 		if (pdes[1] != STDOUT_FILENO) {
-			(void)dup2(pdes[1], STDOUT_FILENO);
-			(void)close(pdes[1]);
+			dup2(pdes[1], STDOUT_FILENO);
+			close(pdes[1]);
 		}
-		(void)close(pdes[0]);
+		close(pdes[0]);
 		uid = geteuid();
 		if (setuid(getuid()) < 0) {
 			warnx("first setuid failed");
@@ -284,16 +284,16 @@
 		_exit(1);
 	}
 	/* parent -- set stdin to pipe output */
-	(void)dup2(pdes[0], STDIN_FILENO);
-	(void)close(pdes[0]);
-	(void)close(pdes[1]);
+	dup2(pdes[0], STDIN_FILENO);
+	close(pdes[0]);
+	close(pdes[1]);
 
 	/* not reading all calendar files, just set output to stdout */
 	if (!doall)
 		return (stdout);
 
 	/* set output to a temporary file, so if no output don't send mail */
-	(void)snprintf(path, sizeof(path), "%s/_calXXXXXX", _PATH_TMP);
+	snprintf(path, sizeof(path), "%s/_calXXXXXX", _PATH_TMP);
 	if ((fd = mkstemp(path)) < 0)
 		return (NULL);
 	return (fdopen(fd, "w+"));
@@ -310,23 +310,23 @@
 	if (!doall)
 		return;
 
-	(void)rewind(fp);
+	rewind(fp);
 	if (fstat(fileno(fp), &sbuf) || !sbuf.st_size)
 		goto done;
 	if (pipe(pdes) < 0)
 		goto done;
 	switch (fork()) {
 	case -1:			/* error */
-		(void)close(pdes[0]);
-		(void)close(pdes[1]);
+		close(pdes[0]);
+		close(pdes[1]);
 		goto done;
 	case 0:
 		/* child -- set stdin to pipe output */
 		if (pdes[0] != STDIN_FILENO) {
-			(void)dup2(pdes[0], STDIN_FILENO);
-			(void)close(pdes[0]);
+			dup2(pdes[0], STDIN_FILENO);
+			close(pdes[0]);
 		}
-		(void)close(pdes[1]);
+		close(pdes[1]);
 		uid = geteuid();
 		if (setuid(getuid()) < 0) {
 			warnx("setuid failed");
@@ -346,15 +346,15 @@
 		_exit(1);
 	}
 	/* parent -- write to pipe input */
-	(void)close(pdes[0]);
+	close(pdes[0]);
 
 	header[1].iov_base = header[3].iov_base = pw->pw_name;
 	header[1].iov_len = header[3].iov_len = strlen(pw->pw_name);
 	writev(pdes[1], header, 7);
 	while ((nread = read(fileno(fp), buf, sizeof(buf))) > 0)
-		(void)write(pdes[1], buf, nread);
-	(void)close(pdes[1]);
+		write(pdes[1], buf, nread);
+	close(pdes[1]);
 done:	(void)fclose(fp);
-	(void)unlink(path);
+	unlink(path);
 	while (wait(&status) >= 0);
 }
Index: cap_mkdb/cap_mkdb.c
===================================================================
RCS file: /cvs/src/usr.bin/cap_mkdb/cap_mkdb.c,v
retrieving revision 1.4
diff -u -u -r1.4 cap_mkdb.c
--- cap_mkdb/cap_mkdb.c	3 Nov 2003 19:31:28 -0000	1.4
+++ cap_mkdb/cap_mkdb.c	7 Nov 2004 20:02:14 -0000
@@ -92,7 +92,7 @@
 	 * The database file is the first argument if no name is specified.
 	 * Make arrangements to unlink it if exit badly.
 	 */
-	(void)snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv);
+	snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv);
 	if ((capname = strdup(buf)) == NULL)
 		errx(1, "strdup failed");
 	if ((capdbp = dbopen(capname,
@@ -114,7 +114,7 @@
 dounlink(void)
 {
 	if (capname != NULL)
-		(void)unlink(capname);
+		unlink(capname);
 }
 
 /*
@@ -232,13 +232,13 @@
 	}
 
 	if (verbose)
-		(void)printf("cap_mkdb: %d capability records\n", reccnt);
+		printf("cap_mkdb: %d capability records\n", reccnt);
 }
 
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: cap_mkdb [-v] [-f outfile] file [file ...]\n");
 	exit(1);
 }
Index: chflags/chflags.c
===================================================================
RCS file: /cvs/src/usr.bin/chflags/chflags.c,v
retrieving revision 1.3
diff -u -u -r1.3 chflags.c
--- chflags/chflags.c	2 Oct 2003 17:42:26 -0000	1.3
+++ chflags/chflags.c	7 Nov 2004 20:02:14 -0000
@@ -167,7 +167,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: chflags [-R [-H | -L | -P]] flags file ...\n");
 	exit(1);
 }
Index: chkey/chkey.c
===================================================================
RCS file: /cvs/src/usr.bin/chkey/chkey.c,v
retrieving revision 1.4
diff -u -u -r1.4 chkey.c
--- chkey/chkey.c	30 Aug 2004 18:06:49 -0000	1.4
+++ chkey/chkey.c	7 Nov 2004 20:02:14 -0000
@@ -100,9 +100,9 @@
 	}
 
 #ifdef YP
-	(void)yp_get_default_domain(&domain);
+	yp_get_default_domain(&domain);
 	if (yp_master(domain, PKMAP, &master) != 0) {
-		(void)fprintf(stderr, 
+		fprintf(stderr, 
 			"can't find master of publickey database\n");
 		exit(1);
 	}
@@ -110,18 +110,18 @@
 	uid = getuid() /*geteuid()*/;
 	if (uid == 0) {
 		if (host2netname(name, NULL, NULL) == 0) {
-			(void)fprintf(stderr,
+			fprintf(stderr,
 			"chkey: cannot convert hostname to netname\n");
 			exit(1);
 		}
 	} else {
 		if (user2netname(name, uid, NULL) == 0) {
-			(void)fprintf(stderr,
+			fprintf(stderr,
 			"chkey: cannot convert username to netname\n");
 			exit(1);
 		}
 	}
-	(void)printf("Generating new key for %s.\n", name);
+	printf("Generating new key for %s.\n", name);
 
 	if (!force) {
 		if (uid != 0) {
@@ -132,10 +132,10 @@
 #endif
 			if (pw == NULL) {
 #ifdef YPPASSWD
-				(void)fprintf(stderr, 
+				fprintf(stderr, 
 		"No NIS password entry found: can't change key.\n");
 #else
-				(void)fprintf(stderr,
+				fprintf(stderr,
 		"No password entry found: can't change key.\n");
 #endif
 				exit(1);
@@ -143,7 +143,7 @@
 		} else {
 			pw = getpwuid(0);
 			if (pw == NULL) {
-				(void)fprintf(stderr, 
+				fprintf(stderr, 
 				"No password entry found: can't change key.\n");
 				exit(1);
 			}
@@ -153,7 +153,7 @@
 #ifdef YPPASSWD
 	if (!force) {
 		if (strcmp(crypt(pass, pw->pw_passwd), pw->pw_passwd) != 0) {
-			(void)fprintf(stderr, "Invalid password.\n");
+			fprintf(stderr, "Invalid password.\n");
 			exit(1);
 		}
 	}
@@ -172,22 +172,22 @@
 		xdecrypt(crypt2, getpass("Retype password:"));
 		if (memcmp(crypt2, crypt2 + HEXKEYBYTES, KEYCHECKSUMSIZE) != 0 ||
 		    memcmp(crypt2, secret, HEXKEYBYTES) != 0) {	
-			(void)fprintf(stderr, "Password incorrect.\n");
+			fprintf(stderr, "Password incorrect.\n");
 			exit(1);
 		}
 	}
 
 #ifdef YP
-	(void)printf("Sending key change request to %s...\n", master);
+	printf("Sending key change request to %s...\n", master);
 #endif
 	status = setpublicmap(name, public, crypt1);
 	if (status != 0) {
 #ifdef YP
-		(void)fprintf(stderr,
+		fprintf(stderr,
 		"%s: unable to update NIS database (%u): %s\n",
 				self, status, yperr_string(status));
 #else
-		(void)fprintf(stderr,
+		fprintf(stderr,
 		"%s: unable to update publickey database\n", self);
 #endif
 		exit(1);
@@ -211,24 +211,24 @@
 
 			if (write(fd, secret, strlen(secret)) < 0 ||
 			    write(fd, &newline, sizeof(newline)) < 0) {
-				(void)fprintf(stderr, "%s: ", ROOTKEY);
+				fprintf(stderr, "%s: ", ROOTKEY);
 				perror("write");
 			}
 		}
 	}
 
 	if (key_setsecret(secret) < 0) {
-		(void)printf("Unable to login with new secret key.\n");
+		printf("Unable to login with new secret key.\n");
 		exit(1);
 	}
-	(void)printf("Done.\n");
+	printf("Done.\n");
 	exit(0);
 	/* NOTREACHED */
 }
 
 usage(char *name)
 {
-	(void)fprintf(stderr, "usage: %s [-f]\n", name);
+	fprintf(stderr, "usage: %s [-f]\n", name);
 	exit(1);
 	/* NOTREACHED */
 }
@@ -241,7 +241,7 @@
 {
 	char pkent[1024];
 	
-	(void)sprintf(pkent,"%s:%s", public, secret);
+	sprintf(pkent,"%s:%s", public, secret);
 #ifdef YP
 	return (yp_update(domain, PKMAP, YPOP_STORE,
 		name, strlen(name), pkent, strlen(pkent)));
@@ -261,7 +261,7 @@
 	static struct passwd pw;
 	char *p;
 
-	(void)sprintf(uidstr, "%d", uid);
+	sprintf(uidstr, "%d", uid);
 	if (yp_match(domain, "passwd.byuid", uidstr, strlen(uidstr), 
 			&val, &vallen) != 0) {
 		return (NULL);
Index: chpass/chpass.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.4
diff -u -u -r1.4 chpass.c
--- chpass/chpass.c	3 Nov 2003 19:31:28 -0000	1.4
+++ chpass/chpass.c	7 Nov 2004 20:02:14 -0000
@@ -253,14 +253,14 @@
 	if (op == EDITENTRY) {
 		display(tfd, pw);
 		edit(pw);
-		(void)unlink(tempname);
+		unlink(tempname);
 		tfd = pw_tmp();
 	}
 
 #ifdef YP
 	if (_use_yp) {
 		yp_submit(pw);
-		(void)unlink(tempname);
+		unlink(tempname);
 	} else {
 #endif /* YP */
 	pfd = pw_lock();
@@ -284,7 +284,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr,
+	fprintf(stderr,
 #ifdef YP
 		"usage: chpass [-o] [-l] [-y] [-d domain] [-h host] [-a list] [-p encpass] [-s shell] [-e mmm dd yy] [user]\n");
 #else
Index: chpass/edit.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/edit.c,v
retrieving revision 1.3
diff -u -u -r1.3 edit.c
--- chpass/edit.c	2 Oct 2003 17:42:26 -0000	1.3
+++ chpass/edit.c	7 Nov 2004 20:02:14 -0000
@@ -101,7 +101,7 @@
 	if (!(fp = fdopen(fd, "w")))
 		pw_error(tempname, 1, 1);
 
-	(void)fprintf(fp,
+	fprintf(fp,
 #ifdef YP
 	    "#Changing %s information for %s.\n", _use_yp ? "NIS" : "user database", pw->pw_name);
 	if (!uid && (!_use_yp || suser_override)) {
@@ -109,18 +109,18 @@
 	    "#Changing user database information for %s.\n", pw->pw_name);
 	if (!uid) {
 #endif /* YP */
-		(void)fprintf(fp, "Login: %s\n", pw->pw_name);
-		(void)fprintf(fp, "Password: %s\n", pw->pw_passwd);
-		(void)fprintf(fp, "Uid [#]: %lu\n", (unsigned long)pw->pw_uid);
-		(void)fprintf(fp, "Gid [# or name]: %lu\n",
+		fprintf(fp, "Login: %s\n", pw->pw_name);
+		fprintf(fp, "Password: %s\n", pw->pw_passwd);
+		fprintf(fp, "Uid [#]: %lu\n", (unsigned long)pw->pw_uid);
+		fprintf(fp, "Gid [# or name]: %lu\n",
 		    (unsigned long)pw->pw_gid);
-		(void)fprintf(fp, "Change [month day year]: %s\n",
+		fprintf(fp, "Change [month day year]: %s\n",
 		    ttoa(pw->pw_change));
-		(void)fprintf(fp, "Expire [month day year]: %s\n",
+		fprintf(fp, "Expire [month day year]: %s\n",
 		    ttoa(pw->pw_expire));
-		(void)fprintf(fp, "Class: %s\n", pw->pw_class);
-		(void)fprintf(fp, "Home directory: %s\n", pw->pw_dir);
-		(void)fprintf(fp, "Shell: %s\n",
+		fprintf(fp, "Class: %s\n", pw->pw_class);
+		fprintf(fp, "Home directory: %s\n", pw->pw_dir);
+		fprintf(fp, "Shell: %s\n",
 		    *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL);
 	}
 	/* Only admin can change "restricted" shells. */
@@ -137,7 +137,7 @@
 		 *	OR if root, then allow editing of shell.
 		 */
 #endif
-		(void)fprintf(fp, "Shell: %s\n",
+		fprintf(fp, "Shell: %s\n",
 		    *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL);
 	else
 	  list[E_SHELL].restricted = 1;
@@ -147,33 +147,33 @@
 	p = strdup(p ? p : "");
 	list[E_NAME].save = p;
 	if (!list[E_NAME].restricted || !uid)
-	  (void)fprintf(fp, "Full Name: %s\n", p);
+	  fprintf(fp, "Full Name: %s\n", p);
 
         p = strsep(&bp, ",");
 	p = strdup(p ? p : "");
 	list[E_LOCATE].save = p;
 	if (!list[E_LOCATE].restricted || !uid)
-	  (void)fprintf(fp, "Office Location: %s\n", p);
+	  fprintf(fp, "Office Location: %s\n", p);
 
         p = strsep(&bp, ",");
 	p = strdup(p ? p : "");
 	list[E_BPHONE].save = p;
 	if (!list[E_BPHONE].restricted || !uid)
-	  (void)fprintf(fp, "Office Phone: %s\n", p);
+	  fprintf(fp, "Office Phone: %s\n", p);
 
         p = strsep(&bp, ",");
 	p = strdup(p ? p : "");
 	list[E_HPHONE].save = p;
 	if (!list[E_HPHONE].restricted || !uid)
-	  (void)fprintf(fp, "Home Phone: %s\n", p);
+	  fprintf(fp, "Home Phone: %s\n", p);
 
 	bp = strdup(bp ? bp : "");
 	list[E_OTHER].save = bp;
 	if (!list[E_OTHER].restricted || !uid)
-	  (void)fprintf(fp, "Other information: %s\n", bp);
+	  fprintf(fp, "Other information: %s\n", bp);
 
-	(void)fchown(fd, getuid(), getgid());
-	(void)fclose(fp);
+	fchown(fd, getuid(), getgid());
+	fclose(fp);
 }
 
 int
@@ -235,7 +235,7 @@
 			}
 		}
 	}
-	(void)fclose(fp);
+	fclose(fp);
 
 	/* Build the gecos field. */
 	len = strlen(list[E_NAME].save) + strlen(list[E_BPHONE].save) +
@@ -243,7 +243,7 @@
 	    strlen(list[E_OTHER].save) + 5;
 	if (!(p = malloc(len)))
 		err(1, NULL);
-	(void)sprintf(pw->pw_gecos = p, "%s,%s,%s,%s,%s", list[E_NAME].save,
+	sprintf(pw->pw_gecos = p, "%s,%s,%s,%s,%s", list[E_NAME].save,
 	    list[E_LOCATE].save, list[E_BPHONE].save, list[E_HPHONE].save,
 	    list[E_OTHER].save);
 
Index: chpass/pw_copy.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/pw_copy.c,v
retrieving revision 1.3
diff -u -u -r1.3 pw_copy.c
--- chpass/pw_copy.c	2 Oct 2003 17:42:26 -0000	1.3
+++ chpass/pw_copy.c	7 Nov 2004 20:02:14 -0000
@@ -105,7 +105,7 @@
 			pw_error(NULL, 0, 1);
 		}
 		if (done) {
-			(void)fprintf(to, "%s", buf);
+			fprintf(to, "%s", buf);
 			if (ferror(to))
 				goto err;
 			continue;
@@ -114,7 +114,7 @@
 			if (*p != ' ' && *p != '\t')
 				break;
 		if (*p == '#' || *p == '\n') {
-			(void)fprintf(to, "%s", buf);
+			fprintf(to, "%s", buf);
 			if (ferror(to))
 				goto err;
 			continue;
@@ -126,7 +126,7 @@
 		*p = '\0';
 		if (strcmp(buf, pw->pw_name)) {
 			*p = ':';
-			(void)fprintf(to, "%s", buf);
+			fprintf(to, "%s", buf);
 			if (ferror(to))
 				goto err;
 			continue;
@@ -137,7 +137,7 @@
 			      _PATH_MASTERPASSWD);
 			pw_error(NULL, 0, 1);
 		}
-		(void)fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
+		fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
 		    pw->pw_name, pw->pw_passwd,
 		    pw->pw_fields & _PWF_UID ? uidstr : "",
 		    pw->pw_fields & _PWF_GID ? gidstr : "",
@@ -158,7 +158,7 @@
 			pw_error(NULL, 0, 1);
 		} else
 #endif /* YP */
-		(void)fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
+		fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
 		    pw->pw_name, pw->pw_passwd,
 		    pw->pw_fields & _PWF_UID ? uidstr : "",
 		    pw->pw_fields & _PWF_GID ? gidstr : "",
@@ -170,5 +170,5 @@
 
 	if (ferror(to))
 err:		pw_error(NULL, 1, 1);
-	(void)fclose(to);
+	fclose(to);
 }
Index: chpass/util.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/util.c,v
retrieving revision 1.3
diff -u -u -r1.3 util.c
--- chpass/util.c	2 Oct 2003 17:42:26 -0000	1.3
+++ chpass/util.c	7 Nov 2004 20:02:14 -0000
@@ -61,7 +61,7 @@
 
 	if (tval) {
 		tp = localtime(&tval);
-		(void)sprintf(tbuf, "%s %d, %d", months[tp->tm_mon],
+		sprintf(tbuf, "%s %d, %d", months[tp->tm_mon],
 		    tp->tm_mday, tp->tm_year + 1900);
 	}
 	else
@@ -83,7 +83,7 @@
 	}
 	if (!lt) {
 		unsetenv("TZ");
-		(void)time(&tval);
+		time(&tval);
 		lt = localtime(&tval);
 	}
 	if (!(t = strtok(p, " \t")))
Index: cksum/cksum.c
===================================================================
RCS file: /cvs/src/usr.bin/cksum/cksum.c,v
retrieving revision 1.5
diff -u -u -r1.5 cksum.c
--- cksum/cksum.c	30 Aug 2004 18:06:49 -0000	1.5
+++ cksum/cksum.c	7 Nov 2004 20:02:14 -0000
@@ -115,7 +115,7 @@
 			rval = 1;
 		} else
 			pfncn(fn, val, len);
-		(void)close(fd);
+		close(fd);
 	} while (*argv);
 	exit(rval);
 }
@@ -123,7 +123,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: cksum [-o 1 | 2 | 3] [file ...]\n");
-	(void)fprintf(stderr, "       sum [file ...]\n");
+	fprintf(stderr, "usage: cksum [-o 1 | 2 | 3] [file ...]\n");
+	fprintf(stderr, "       sum [file ...]\n");
 	exit(1);
 }
Index: cksum/print.c
===================================================================
RCS file: /cvs/src/usr.bin/cksum/print.c,v
retrieving revision 1.3
diff -u -u -r1.3 print.c
--- cksum/print.c	2 Oct 2003 17:42:26 -0000	1.3
+++ cksum/print.c	7 Nov 2004 20:02:14 -0000
@@ -42,26 +42,26 @@
 void
 pcrc(char *fn, u_int32_t val, u_int32_t len)
 {
-	(void)printf("%lu %lu", (u_long) val, (u_long) len);
+	printf("%lu %lu", (u_long) val, (u_long) len);
 	if (fn)
-		(void)printf(" %s", fn);
-	(void)printf("\n");
+		printf(" %s", fn);
+	printf("\n");
 }
 
 void
 psum1(char *fn, u_int32_t val, u_int32_t len)
 {
-	(void)printf("%lu %lu", (u_long) val, (u_long) (len + 1023) / 1024);
+	printf("%lu %lu", (u_long) val, (u_long) (len + 1023) / 1024);
 	if (fn)
-		(void)printf(" %s", fn);
-	(void)printf("\n");
+		printf(" %s", fn);
+	printf("\n");
 }
 
 void
 psum2(char *fn, u_int32_t val, u_int32_t len)
 {
-	(void)printf("%lu %lu", (u_long) val, (u_long) (len + 511) / 512);
+	printf("%lu %lu", (u_long) val, (u_long) (len + 511) / 512);
 	if (fn)
-		(void)printf(" %s", fn);
-	(void)printf("\n");
+		printf(" %s", fn);
+	printf("\n");
 }
Index: cmp/cmp.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/cmp.c,v
retrieving revision 1.3
diff -u -u -r1.3 cmp.c
--- cmp/cmp.c	2 Oct 2003 17:42:27 -0000	1.3
+++ cmp/cmp.c	7 Nov 2004 20:02:14 -0000
@@ -151,7 +151,7 @@
 	else {
 		if (zflag && sb1.st_size != sb2.st_size) {
 			if (!sflag)
-				(void) printf("%s %s differ: size\n",
+				printf("%s %s differ: size\n",
 				    file1, file2);
 			exit(DIFF_EXIT);
 		}
@@ -165,7 +165,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: cmp [-l | -s | -x] [-z] file1 file2 [skip1 [skip2]]\n");
 	exit(ERR_EXIT);
 }
Index: cmp/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- cmp/misc.c	2 Oct 2003 17:42:27 -0000	1.3
+++ cmp/misc.c	7 Nov 2004 20:02:14 -0000
@@ -56,7 +56,7 @@
 diffmsg(const char *file1, const char *file2, off_t byte, off_t line)
 {
 	if (!sflag)
-		(void)printf("%s %s differ: char %qd, line %qd\n",
+		printf("%s %s differ: char %qd, line %qd\n",
 		    file1, file2, byte, line);
 	exit(DIFF_EXIT);
 }
Index: cmp/regular.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/regular.c,v
retrieving revision 1.4
diff -u -u -r1.4 regular.c
--- cmp/regular.c	3 Nov 2003 19:31:28 -0000	1.4
+++ cmp/regular.c	7 Nov 2004 20:02:14 -0000
@@ -102,10 +102,10 @@
 		if ((ch = *p1) != *p2) {
 			if (xflag) {
 				dfound = 1;
-				(void)printf("%08qx %02x %02x\n", byte - 1, ch, *p2);
+				printf("%08qx %02x %02x\n", byte - 1, ch, *p2);
 			} else if (lflag) {
 				dfound = 1;
-				(void)printf("%6qd %3o %3o\n", byte, ch, *p2);
+				printf("%6qd %3o %3o\n", byte, ch, *p2);
 			} else
 				diffmsg(file1, file2, byte, line);
 				/* NOTREACHED */
Index: cmp/special.c
===================================================================
RCS file: /cvs/src/usr.bin/cmp/special.c,v
retrieving revision 1.3
diff -u -u -r1.3 special.c
--- cmp/special.c	2 Oct 2003 17:42:27 -0000	1.3
+++ cmp/special.c	7 Nov 2004 20:02:14 -0000
@@ -75,7 +75,7 @@
 		if (ch1 != ch2) {
 			if (lflag) {
 				dfound = 1;
-				(void)printf("%6qd %3o %3o\n", byte, ch1, ch2);
+				printf("%6qd %3o %3o\n", byte, ch1, ch2);
 			} else {
 				diffmsg(file1, file2, byte, line);
 				/* NOTREACHED */
Index: col/col.c
===================================================================
RCS file: /cvs/src/usr.bin/col/col.c,v
retrieving revision 1.4
diff -u -u -r1.4 col.c
--- col/col.c	3 Nov 2003 19:31:28 -0000	1.4
+++ col/col.c	7 Nov 2004 20:02:14 -0000
@@ -123,7 +123,7 @@
 	int nflushd_lines;		/* number of lines that were flushed */
 	int adjust, opt, warned;
 
-	(void)setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	max_bufd_lines = 128;
 	compress_spaces = 1;		/* compress spaces into tabs */
@@ -332,7 +332,7 @@
 		}
 		nblank_lines++;
 		if (l->l_line)
-			(void)free(l->l_line);
+			free(l->l_line);
 		free_line(l);
 	}
 	if (lines)
@@ -513,7 +513,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: col [-bfhpx] [-l nline]\n");
+	fprintf(stderr, "usage: col [-bfhpx] [-l nline]\n");
 	exit(1);
 }
 
Index: colrm/colrm.c
===================================================================
RCS file: /cvs/src/usr.bin/colrm/colrm.c,v
retrieving revision 1.4
diff -u -u -r1.4 colrm.c
--- colrm/colrm.c	3 Nov 2003 19:31:29 -0000	1.4
+++ colrm/colrm.c	7 Nov 2004 20:02:14 -0000
@@ -127,7 +127,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: colrm [start [stop]]\n");
+	fprintf(stderr, "usage: colrm [start [stop]]\n");
 	exit(1);
 }
 
Index: column/column.c
===================================================================
RCS file: /cvs/src/usr.bin/column/column.c,v
retrieving revision 1.4
diff -u -u -r1.4 column.c
--- column/column.c	3 Nov 2003 19:31:29 -0000	1.4
+++ column/column.c	7 Nov 2004 20:02:14 -0000
@@ -106,7 +106,7 @@
 	else for (; *argv; ++argv)
 		if ((fp = fopen(*argv, "r"))) {
 			input(fp);
-			(void)fclose(fp);
+			fclose(fp);
 		} else {
 			warn("%s", *argv);
 			eval = 1;
@@ -145,7 +145,7 @@
 			putchar('\n');
 		} else {
 			while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) {
-				(void)putchar('\t');
+				putchar('\t');
 				chcnt = cnt;
 			}
 			endcol += maxlength;
@@ -172,7 +172,7 @@
 			if ((base += numrows) >= entries)
 				break;
 			while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) {
-				(void)putchar('\t');
+				putchar('\t');
 				chcnt = cnt;
 			}
 			endcol += maxlength;
@@ -188,7 +188,7 @@
 	char **lp;
 
 	for (cnt = entries, lp = list; cnt--; ++lp)
-		(void)printf("%s\n", *lp);
+		printf("%s\n", *lp);
 }
 
 typedef struct _tbl {
@@ -239,9 +239,9 @@
 	}
 	for (cnt = 0, t = tbl; cnt < entries; ++cnt, ++t) {
 		for (coloff = 0; coloff < t->cols  - 1; ++coloff)
-			(void)printf("%s%*s", t->list[coloff],
+			printf("%s%*s", t->list[coloff],
 			    lens[coloff] - t->len[coloff] + 2, " ");
-		(void)printf("%s\n", t->list[coloff]);
+		printf("%s\n", t->list[coloff]);
 	}
 }
 
@@ -286,7 +286,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: column [-tx] [-c columns] [-s sep] [file ...]\n");
 	exit(1);
 }
Index: comm/comm.c
===================================================================
RCS file: /cvs/src/usr.bin/comm/comm.c,v
retrieving revision 1.3
diff -u -u -r1.3 comm.c
--- comm/comm.c	2 Oct 2003 17:42:27 -0000	1.3
+++ comm/comm.c	7 Nov 2004 20:02:14 -0000
@@ -70,7 +70,7 @@
 	flag1 = flag2 = flag3 = 1;
 	iflag = 0;
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	while ((ch = getopt(argc, argv, "123i")) != -1)
 		switch(ch) {
@@ -137,7 +137,7 @@
 		if (!comp) {
 			read1 = read2 = 1;
 			if (col3)
-				(void)printf("%s%s", col3, line1);
+				printf("%s%s", col3, line1);
 			continue;
 		}
 
@@ -146,12 +146,12 @@
 			read1 = 1;
 			read2 = 0;
 			if (col1)
-				(void)printf("%s%s", col1, line1);
+				printf("%s%s", col1, line1);
 		} else {
 			read1 = 0;
 			read2 = 1;
 			if (col2)
-				(void)printf("%s%s", col2, line2);
+				printf("%s%s", col2, line2);
 		}
 	}
 	exit(0);
@@ -162,7 +162,7 @@
 {
 
 	do {
-		(void)printf("%s%s", offset, buf);
+		printf("%s%s", offset, buf);
 	} while (fgets(buf, MAXLINELEN, fp));
 }
 
@@ -182,7 +182,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: comm [-123i] file1 file2\n");
+	fprintf(stderr, "usage: comm [-123i] file1 file2\n");
 	exit(1);
 }
 
Index: compress/compress.c
===================================================================
RCS file: /cvs/src/usr.bin/compress/compress.c,v
retrieving revision 1.4
diff -u -u -r1.4 compress.c
--- compress/compress.c	30 Aug 2004 18:06:49 -0000	1.4
+++ compress/compress.c	7 Nov 2004 20:02:14 -0000
@@ -113,10 +113,10 @@
 	if (argc == 0) {
 		switch(style) {
 		case COMPRESS:
-			(void)compress("/dev/stdin", "/dev/stdout", bits);
+			compress("/dev/stdin", "/dev/stdout", bits);
 			break;
 		case DECOMPRESS:
-			(void)decompress("/dev/stdin", "/dev/stdout", bits);
+			decompress("/dev/stdin", "/dev/stdout", bits);
 			break;
 		}
 		exit (eval);
@@ -241,7 +241,7 @@
 
 		if (!force && sb.st_size >= isb.st_size) {
 			if (verbose)
-		(void)fprintf(stderr, "%s: file would grow; left unmodified\n",
+		fprintf(stderr, "%s: file would grow; left unmodified\n",
 		    in);
 			eval = 2;
 			if (unlink(out))
@@ -255,12 +255,12 @@
 			cwarn("%s", in);
 
 		if (verbose) {
-			(void)fprintf(stderr, "%s: ", out);
+			fprintf(stderr, "%s: ", out);
 			if (isb.st_size > sb.st_size)
-				(void)fprintf(stderr, "%.0f%% compression\n",
+				fprintf(stderr, "%.0f%% compression\n",
 				    ((float)sb.st_size / isb.st_size) * 100.0);
 			else
-				(void)fprintf(stderr, "%.0f%% expansion\n",
+				fprintf(stderr, "%.0f%% expansion\n",
 				    ((float)isb.st_size / sb.st_size) * 100.0);
 		}
 	}
@@ -268,11 +268,11 @@
 
 err:	if (ofp) {
 		if (oreg)
-			(void)unlink(out);
-		(void)fclose(ofp);
+			unlink(out);
+		fclose(ofp);
 	}
 	if (ifp)
-		(void)fclose(ifp);
+		fclose(ifp);
 }
 
 void
@@ -333,11 +333,11 @@
 
 err:	if (ofp) {
 		if (oreg)
-			(void)unlink(out);
-		(void)fclose(ofp);
+			unlink(out);
+		fclose(ofp);
 	}
 	if (ifp)
-		(void)fclose(ifp);
+		fclose(ifp);
 }
 
 void
@@ -377,7 +377,7 @@
 
 	if (!isatty(fileno(stderr)))
 		return (0);
-	(void)fprintf(stderr, "overwrite %s? ", fname);
+	fprintf(stderr, "overwrite %s? ", fname);
 	first = ch = getchar();
 	while (ch != '\n' && ch != EOF)
 		ch = getchar();
@@ -388,10 +388,10 @@
 usage(int iscompress)
 {
 	if (iscompress)
-		(void)fprintf(stderr,
+		fprintf(stderr,
 		    "usage: compress [-cfv] [-b bits] [file ...]\n");
 	else
-		(void)fprintf(stderr,
+		fprintf(stderr,
 		    "usage: uncompress [-c] [-b bits] [file ...]\n");
 	exit(1);
 }
Index: compress/zopen.c
===================================================================
RCS file: /cvs/src/usr.bin/compress/zopen.c,v
retrieving revision 1.3
diff -u -u -r1.3 zopen.c
--- compress/zopen.c	2 Oct 2003 17:42:27 -0000	1.3
+++ compress/zopen.c	7 Nov 2004 20:02:14 -0000
@@ -329,13 +329,13 @@
 	zs = cookie;
 	if (zmode == 'w') {		/* Put out the final code. */
 		if (output(zs, (code_int) ent) == -1) {
-			(void)fclose(fp);
+			fclose(fp);
 			free(zs);
 			return (-1);
 		}
 		out_count++;
 		if (output(zs, (code_int) - 1) == -1) {
-			(void)fclose(fp);
+			fclose(fp);
 			free(zs);
 			return (-1);
 		}
Index: ctags/C.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/C.c,v
retrieving revision 1.2
diff -u -u -r1.2 C.c
--- ctags/C.c	17 Jun 2003 04:29:25 -0000	1.2
+++ ctags/C.c	7 Nov 2004 20:02:14 -0000
@@ -109,7 +109,7 @@
 		 */
 		case '"':
 		case '\'':
-			(void)skip_string(c);
+			skip_string(c);
 			break;
 
 		/*
@@ -122,7 +122,7 @@
 				skip_comment(c);
 				continue;
 			}
-			(void)ungetc(c, inf);
+			ungetc(c, inf);
 			c = '/';
 			goto storec;
 
@@ -200,7 +200,7 @@
 					;
 				if (c == EOF)
 					return;
-				(void)ungetc(c, inf);
+				ungetc(c, inf);
 				c = save;
 			}
 	storec:		if (!intoken(c)) {
@@ -304,12 +304,12 @@
 		if (c == '/' && (GETC(==, '*') || c == '/'))
 			skip_comment(c);
 		else {				/* don't ever "read" '/' */
-			(void)ungetc(c, inf);
+			ungetc(c, inf);
 			return (NO);
 		}
 	}
 	if (c != '{')
-		(void)skip_key('{');
+		skip_key('{');
 	return (YES);
 }
 
@@ -328,7 +328,7 @@
 	/* ignore leading whitespace */
 	while (GETC(!=, EOF) && (c == ' ' || c == '\t'))
 		;
-	(void)ungetc(c, inf);
+	ungetc(c, inf);
 
 	curline = lineno;
 	for (sp = tok;;) {		/* get next token */
@@ -376,7 +376,7 @@
 		if (*(sp - 1) != '\\')
 			return;
 	}
-	(void)skip_key('\n');
+	skip_key('\n');
 }
 
 /*
@@ -419,7 +419,7 @@
 				if (!iswhite(c))
 					break;
 			if (c != '{') {
-				(void)ungetc(c, inf);
+				ungetc(c, inf);
 				return (NO);
 			}
 	}
@@ -515,7 +515,7 @@
 				skip_comment(c);
 				break;
 			}
-			(void)ungetc(c, inf);
+			ungetc(c, inf);
 			c = '/';
 			goto norm;
 		case '\n':
Index: ctags/ctags.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/ctags.c,v
retrieving revision 1.4
diff -u -u -r1.4 ctags.c
--- ctags/ctags.c	3 Nov 2003 19:31:29 -0000	1.4
+++ ctags/ctags.c	7 Nov 2004 20:02:14 -0000
@@ -136,7 +136,7 @@
 		else {
 			curfile = argv[step];
 			find_entries(argv[step]);
-			(void)fclose(inf);
+			fclose(inf);
 		}
 
 	if (head) {
@@ -145,7 +145,7 @@
 		else {
 			if (uflag) {
 				for (step = 0; step < argc; step++) {
-					(void)sprintf(cmd,
+					sprintf(cmd,
 						"mv %s OTAGS; fgrep -v '\t%s\t' OTAGS >%s; rm OTAGS",
 							outfile, argv[step],
 							outfile);
@@ -156,9 +156,9 @@
 			if (!(outf = fopen(outfile, aflag ? "a" : "w")))
 				err(exit_val, "%s", outfile);
 			put_entries(head);
-			(void)fclose(outf);
+			fclose(outf);
 			if (uflag) {
-				(void)sprintf(cmd, "sort -o %s %s",
+				sprintf(cmd, "sort -o %s %s",
 						outfile, outfile);
 				system(cmd);
 			}
@@ -170,7 +170,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: ctags [-BFadtuwvx] [-f tagsfile] file ...\n");
+	fprintf(stderr, "usage: ctags [-BFadtuwvx] [-f tagsfile] file ...\n");
 	exit(1);
 }
 
@@ -245,7 +245,7 @@
 				 * for C references.  This may be wrong.
 				 */
 				toss_yysec();
-				(void)strcpy(lbuf, "%%$");
+				strcpy(lbuf, "%%$");
 				pfnote("yylex", lineno);
 				rewind(inf);
 			}
@@ -256,7 +256,7 @@
 			 * for C references.  This may be wrong.
 			 */
 			toss_yysec();
-			(void)strcpy(lbuf, "%%$");
+			strcpy(lbuf, "%%$");
 			pfnote("yyparse", lineno);
 			y_entries();
 		}
Index: ctags/fortran.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/fortran.c,v
retrieving revision 1.3
diff -u -u -r1.3 fortran.c
--- ctags/fortran.c	2 Oct 2003 17:42:27 -0000	1.3
+++ ctags/fortran.c	7 Nov 2004 20:02:14 -0000
@@ -122,7 +122,7 @@
 		if ((cp = lbp + 1))
 			continue;
 		*cp = EOS;
-		(void)strlcpy(tok, lbp, sizeof(tok));	/* possible trunc */
+		strlcpy(tok, lbp, sizeof(tok));	/* possible trunc */
 		getline();			/* process line for ex(1) */
 		pfnote(tok, lineno);
 		pfcnt = YES;
Index: ctags/lisp.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/lisp.c,v
retrieving revision 1.2
diff -u -u -r1.2 lisp.c
--- ctags/lisp.c	17 Jun 2003 04:29:25 -0000	1.2
+++ ctags/lisp.c	7 Nov 2004 20:02:14 -0000
@@ -96,7 +96,7 @@
 				continue;
 		savedc = *cp;
 		*cp = EOS;
-		(void)strlcpy(tok, lbp, sizeof(tok));	/* possible trunc */
+		strlcpy(tok, lbp, sizeof(tok));	/* possible trunc */
 		*cp = savedc;
 		getline();
 		pfnote(tok, lineno);
Index: ctags/print.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/print.c,v
retrieving revision 1.2
diff -u -u -r1.2 print.c
--- ctags/print.c	17 Jun 2003 04:29:25 -0000	1.2
+++ ctags/print.c	7 Nov 2004 20:02:14 -0000
@@ -55,7 +55,7 @@
 	char	*cp;
 
 	saveftell = ftell(inf);
-	(void)fseek(inf, lineftell, L_SET);
+	fseek(inf, lineftell, L_SET);
 	if (xflag)
 		for (cp = lbuf; GETC(!=, EOF) && c != '\n'; *cp++ = c)
 			continue;
@@ -85,7 +85,7 @@
 			*cp++ = c;
 	}
 	*cp = EOS;
-	(void)fseek(inf, saveftell, L_SET);
+	fseek(inf, saveftell, L_SET);
 }
 
 /*
Index: ctags/tree.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/tree.c,v
retrieving revision 1.2
diff -u -u -r1.2 tree.c
--- ctags/tree.c	17 Jun 2003 04:29:25 -0000	1.2
+++ ctags/tree.c	7 Nov 2004 20:02:14 -0000
@@ -71,7 +71,7 @@
 			fp = curfile;
 		else
 			++fp;
-		(void)snprintf(nbuf, sizeof(nbuf), "M%s", fp);
+		snprintf(nbuf, sizeof(nbuf), "M%s", fp);
 		fp = strrchr(nbuf, '.');
 		if (fp && !fp[2])
 			*fp = EOS;
Index: ctags/yacc.c
===================================================================
RCS file: /cvs/src/usr.bin/ctags/yacc.c,v
retrieving revision 1.2
diff -u -u -r1.2 yacc.c
--- ctags/yacc.c	17 Jun 2003 04:29:25 -0000	1.2
+++ ctags/yacc.c	7 Nov 2004 20:02:14 -0000
@@ -77,13 +77,13 @@
 		case '%':
 			if (GETC(==, '%'))
 				return;
-			(void)ungetc(c, inf);
+			ungetc(c, inf);
 			break;
 		case '/':
 			if (GETC(==, '*') || c == '/')
 				skip_comment(c);
 			else
-				(void)ungetc(c, inf);
+				ungetc(c, inf);
 			break;
 		case '|':
 		case ';':
@@ -109,7 +109,7 @@
 				in_rule = YES;
 			}
 			else
-				(void)ungetc(c, inf);
+				ungetc(c, inf);
 		}
 }
 
Index: cut/cut.c
===================================================================
RCS file: /cvs/src/usr.bin/cut/cut.c,v
retrieving revision 1.3
diff -u -u -r1.3 cut.c
--- cut/cut.c	2 Oct 2003 17:42:27 -0000	1.3
+++ cut/cut.c	7 Nov 2004 20:02:14 -0000
@@ -114,7 +114,7 @@
 			if (!(fp = fopen(*argv, "r")))
 				err(1, "%s", *argv);
 			fcn(fp, *argv);
-			(void)fclose(fp);
+			fclose(fp);
 		}
 	else
 		fcn(stdin, "stdin");
@@ -198,16 +198,16 @@
 			if (ch == '\n')
 				break;
 			if (*pos++)
-				(void)putchar(ch);
+				putchar(ch);
 		}
 		if (ch != '\n') {
 			if (autostop)
 				while ((ch = getc(fp)) != EOF && ch != '\n')
-					(void)putchar(ch);
+					putchar(ch);
 			else
 				while ((ch = getc(fp)) != EOF && ch != '\n');
 		}
-		(void)putchar('\n');
+		putchar('\n');
 	}
 }
 
@@ -239,7 +239,7 @@
 				isdelim = 1;
 			if (ch == '\n') {
 				if (!isdelim && !sflag)
-					(void)fwrite(lbuf, lbuflen, 1, stdout);
+					fwrite(lbuf, lbuflen, 1, stdout);
 				break;
 			}
 		}
@@ -250,9 +250,9 @@
 		for (field = maxval, p = lbuf; field; --field, ++pos) {
 			if (*pos) {
 				if (output++)
-					(void)putchar(sep);
+					putchar(sep);
 				while ((ch = *p++) != '\n' && ch != sep)
-					(void)putchar(ch);
+					putchar(ch);
 			} else {
 				while ((ch = *p++) != '\n' && ch != sep)
 					continue;
@@ -263,13 +263,13 @@
 		if (ch != '\n') {
 			if (autostop) {
 				if (output)
-					(void)putchar(sep);
+					putchar(sep);
 				for (; (ch = *p) != '\n'; ++p)
-					(void)putchar(ch);
+					putchar(ch);
 			} else
 				for (; (ch = *p) != '\n'; ++p);
 		}
-		(void)putchar('\n');
+		putchar('\n');
 	}
 	if (mlbuf != NULL)
 		free(mlbuf);
@@ -278,7 +278,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n",
 		"usage: cut -b list [-n] [file ...]",
 		"       cut -c list [file ...]",
 		"       cut -f list [-s] [-d delim] [file ...]");
Index: doscmd/int14.c
===================================================================
RCS file: /cvs/src/usr.bin/doscmd/int14.c,v
retrieving revision 1.2
diff -u -u -r1.2 int14.c
--- doscmd/int14.c	17 Jun 2003 04:29:26 -0000	1.2
+++ doscmd/int14.c	7 Nov 2004 20:02:14 -0000
@@ -339,7 +339,7 @@
     if (cdsp->fd > 0) {
 	debug(D_PORT, "Re-initialize serial port com%d\n", port);
 	_RegisterIO(cdsp->fd, 0, 0, 0);
-	(void)close(cdsp->fd);
+	close(cdsp->fd);
     } else {
 	debug(D_PORT, "Initialize serial port com%d\n", port);
     }
Index: doscmd/tty.c
===================================================================
RCS file: /cvs/src/usr.bin/doscmd/tty.c,v
retrieving revision 1.6
diff -u -u -r1.6 tty.c
--- doscmd/tty.c	26 Jan 2004 18:16:18 -0000	1.6
+++ doscmd/tty.c	7 Nov 2004 20:02:14 -0000
@@ -2207,7 +2207,7 @@
 
     if ((fd = open("vram", O_WRONLY | O_CREAT, 0644)) == -1)
 	err(1, "Can't open vram file");
-    (void)write(fd, (void *)vram, 256 * 1024);
+    write(fd, (void *)vram, 256 * 1024);
 
     return;
 }
Index: du/du.c
===================================================================
RCS file: /cvs/src/usr.bin/du/du.c,v
retrieving revision 1.6
diff -u -u -r1.6 du.c
--- du/du.c	4 Jul 2004 10:34:47 -0000	1.6
+++ du/du.c	7 Nov 2004 20:02:14 -0000
@@ -220,7 +220,7 @@
 		argv[1] = NULL;
 	}
 
-	(void) getbsize(&notused, &blocksize);
+	getbsize(&notused, &blocksize);
 	blocksize /= 512;
 
 	rval = 0;
@@ -243,10 +243,10 @@
 				
 				if (p->fts_level <= depth) {
 					if (hflag) {
-						(void) prthumanval(howmany(p->fts_number, blocksize));
-						(void) printf("\t%s\n", p->fts_path);
+						prthumanval(howmany(p->fts_number, blocksize));
+						printf("\t%s\n", p->fts_path);
 					} else {
-					(void) printf("%ld\t%s\n",
+					printf("%ld\t%s\n",
 					    howmany(p->fts_number, blocksize),
 					    p->fts_path);
 					}
@@ -269,11 +269,11 @@
 				
 				if (listall || p->fts_level == 0) {
 					if (hflag) {
-						(void) prthumanval(howmany(p->fts_statp->st_blocks,
+						prthumanval(howmany(p->fts_statp->st_blocks,
 							blocksize));
-						(void) printf("\t%s\n", p->fts_path);
+						printf("\t%s\n", p->fts_path);
 					} else {
-						(void) printf("%qd\t%s\n",
+						printf("%qd\t%s\n",
 							howmany(p->fts_statp->st_blocks, blocksize),
 							p->fts_path);
 					}
@@ -289,10 +289,10 @@
 
 	if (cflag) {
 		if (hflag) {
-			(void) prthumanval(howmany(savednumber, blocksize));
-			(void) printf("\ttotal\n");
+			prthumanval(howmany(savednumber, blocksize));
+			printf("\ttotal\n");
 		} else {
-			(void) printf("%ld\ttotal\n", howmany(savednumber, blocksize));
+			printf("%ld\ttotal\n", howmany(savednumber, blocksize));
 		}
 	}
 
@@ -469,17 +469,17 @@
 	unit = unit_adjust(&bytes);
 
 	if (bytes == 0)
-		(void)printf("  0B");
+		printf("  0B");
 	else if (bytes > 10)
-		(void)printf("%3.0f%c", bytes, "BKMGTPE"[unit]);
+		printf("%3.0f%c", bytes, "BKMGTPE"[unit]);
 	else
-		(void)printf("%3.1f%c", bytes, "BKMGTPE"[unit]);
+		printf("%3.1f%c", bytes, "BKMGTPE"[unit]);
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 		"usage: du [-H | -L | -P] [-a | -s | -d depth] [-c] [-h | -k] [-x] [-I mask] [file ...]\n");
 	exit(EX_USAGE);
 }
Index: env/env.c
===================================================================
RCS file: /cvs/src/usr.bin/env/env.c,v
retrieving revision 1.3
diff -u -u -r1.3 env.c
--- env/env.c	4 Oct 2003 20:36:43 -0000	1.3
+++ env/env.c	7 Nov 2004 20:02:14 -0000
@@ -66,20 +66,20 @@
 			usage();
 		}
 	for (argv += optind; *argv && (p = strchr(*argv, '=')); ++argv)
-		(void)setenv(*argv, ++p, 1);
+		setenv(*argv, ++p, 1);
 	if (*argv) {
 		execvp(*argv, argv);
 		err(errno == ENOENT ? 127 : 126, "%s", *argv);
 	}
 	for (ep = environ; *ep; ep++)
-		(void)printf("%s\n", *ep);
+		printf("%s\n", *ep);
 	exit(0);
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: env [-] [-i] [name=value ...] [utility [argument ...]]\n");
 	exit(1);
 }
Index: expand/expand.c
===================================================================
RCS file: /cvs/src/usr.bin/expand/expand.c,v
retrieving revision 1.3
diff -u -u -r1.3 expand.c
--- expand/expand.c	4 Oct 2003 20:36:44 -0000	1.3
+++ expand/expand.c	7 Nov 2004 20:02:14 -0000
@@ -175,6 +175,6 @@
 static void
 usage(void)
 {
-	(void)fprintf (stderr, "usage: expand [-t tablist] [file ...]\n");
+	fprintf (stderr, "usage: expand [-t tablist] [file ...]\n");
 	exit(1);
 }
Index: find/find.c
===================================================================
RCS file: /cvs/src/usr.bin/find/find.c,v
retrieving revision 1.3
diff -u -u -r1.3 find.c
--- find/find.c	4 Oct 2003 20:36:44 -0000	1.3
+++ find/find.c	7 Nov 2004 20:02:14 -0000
@@ -195,7 +195,7 @@
 		case FTS_DNR:
 		case FTS_ERR:
 		case FTS_NS:
-			(void)fflush(stdout);
+			fflush(stdout);
 			warnx("%s: %s",
 			    entry->fts_path, strerror(entry->fts_errno));
 			rval = 1;
@@ -207,7 +207,7 @@
 		}
 #define	BADCH	" \t\n\\'\""
 		if (isxargs && strpbrk(entry->fts_path, BADCH)) {
-			(void)fflush(stdout);
+			fflush(stdout);
 			warnx("%s: illegal path", entry->fts_path);
 			rval = 1;
 			continue;
Index: find/function.c
===================================================================
RCS file: /cvs/src/usr.bin/find/function.c,v
retrieving revision 1.3
diff -u -u -r1.3 function.c
--- find/function.c	4 Oct 2003 20:36:44 -0000	1.3
+++ find/function.c	7 Nov 2004 20:02:14 -0000
@@ -1055,7 +1055,7 @@
 int
 f_print(PLAN *plan, FTSENT *entry)
 {
-	(void)puts(entry->fts_path);
+	puts(entry->fts_path);
 	return 1;
 }
 
Index: find/ls.c
===================================================================
RCS file: /cvs/src/usr.bin/find/ls.c,v
retrieving revision 1.3
diff -u -u -r1.3 ls.c
--- find/ls.c	4 Oct 2003 20:36:44 -0000	1.3
+++ find/ls.c	7 Nov 2004 20:02:14 -0000
@@ -62,22 +62,22 @@
 {
 	char modep[15], *user_from_uid(), *group_from_gid();
 
-	(void)printf("%6lu %4qd ", (u_long) sb->st_ino, sb->st_blocks);
-	(void)strmode(sb->st_mode, modep);
-	(void)printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, UT_NAMESIZE,
+	printf("%6lu %4qd ", (u_long) sb->st_ino, sb->st_blocks);
+	strmode(sb->st_mode, modep);
+	printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, UT_NAMESIZE,
 	    user_from_uid(sb->st_uid, 0), UT_NAMESIZE,
 	    group_from_gid(sb->st_gid, 0));
 
 	if (S_ISCHR(sb->st_mode) || S_ISBLK(sb->st_mode))
-		(void)printf("%3d, %3d ", major(sb->st_rdev),
+		printf("%3d, %3d ", major(sb->st_rdev),
 		    minor(sb->st_rdev));
 	else
-		(void)printf("%8qd ", sb->st_size);
+		printf("%8qd ", sb->st_size);
 	printtime(sb->st_mtime);
-	(void)printf("%s", name);
+	printf("%s", name);
 	if (S_ISLNK(sb->st_mode))
 		printlink(accpath);
-	(void)putchar('\n');
+	putchar('\n');
 }
 
 static void
@@ -115,5 +115,5 @@
 		return;
 	}
 	path[lnklen] = '\0';
-	(void)printf(" -> %s", path);
+	printf(" -> %s", path);
 }
Index: find/main.c
===================================================================
RCS file: /cvs/src/usr.bin/find/main.c,v
retrieving revision 1.3
diff -u -u -r1.3 main.c
--- find/main.c	4 Oct 2003 20:36:44 -0000	1.3
+++ find/main.c	7 Nov 2004 20:02:14 -0000
@@ -74,9 +74,9 @@
 	register char **p, **start;
 	int Hflag, Lflag, ch;
 
-	(void)setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
-	(void)time(&now);	/* initialize the time-of-day */
+	time(&now);	/* initialize the time-of-day */
 
 	p = start = argv;
 	Hflag = Lflag = 0;
@@ -153,7 +153,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: find [-H | -L | -P] [-EXdsx] [-f file] [file ...] [expression]\n");
 	exit(1);
 }
Index: find/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/find/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- find/misc.c	4 Oct 2003 20:36:44 -0000	1.3
+++ find/misc.c	7 Nov 2004 20:02:14 -0000
@@ -84,11 +84,11 @@
 {
 	int ch, first, nl;
 
-	(void)fprintf(stderr, "\"%s", *argv);
+	fprintf(stderr, "\"%s", *argv);
 	while (*++argv)
-		(void)fprintf(stderr, " %s", *argv);
-	(void)fprintf(stderr, "\"? ");
-	(void)fflush(stderr);
+		fprintf(stderr, " %s", *argv);
+	fprintf(stderr, "\"? ");
+	fflush(stderr);
 
 	first = ch = getchar();
 	for (nl = 0;;) {
@@ -102,8 +102,8 @@
 	}
 
 	if (!nl) {
-		(void)fprintf(stderr, "\n");
-		(void)fflush(stderr);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
         return (first == 'y');
 }
Index: finger/finger.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/finger.c,v
retrieving revision 1.5
diff -u -u -r1.5 finger.c
--- finger/finger.c	3 Sep 2004 19:13:23 -0000	1.5
+++ finger/finger.c	7 Nov 2004 20:02:14 -0000
@@ -166,7 +166,7 @@
 		}
 	}
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 				/* remove this line to get remote host */
 	oflag = 1;		/* default to old "office" behavior */
Index: finger/lprint.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/lprint.c,v
retrieving revision 1.4
diff -u -u -r1.4 lprint.c
--- finger/lprint.c	3 Sep 2004 19:13:23 -0000	1.4
+++ finger/lprint.c	7 Nov 2004 20:02:14 -0000
@@ -88,7 +88,7 @@
 			    _PATH_FORWARD, "Mail forwarded to");
 			show_text(pn->dir, _PATH_PROJECT, "Project");
 			if (!show_text(pn->dir, _PATH_PLAN, "Plan"))
-				(void)printf("No Plan.\n");
+				printf("No Plan.\n");
 			show_text(pn->dir,
 			    _PATH_PUBKEY, "Public key");
 		}
@@ -221,8 +221,8 @@
 		}
 		if (*w->host) {
 			if (LINE_LEN < (cpr + 6 + strlen(w->host)))
-				(void)printf("\n   ");
-			(void)printf(" from %s", w->host);
+				printf("\n   ");
+			printf(" from %s", w->host);
 		}
 		putchar('\n');
 	}
@@ -300,7 +300,7 @@
 
 	lastc = '\0';
 
-	(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", directory, file_name);
+	snprintf(tbuf, sizeof(tbuf), "%s/%s", directory, file_name);
 	if ((fd = open(tbuf, O_RDONLY)) < 0 || fstat(fd, &sb) ||
 	    sb.st_size == 0)
 		return(0);
@@ -309,7 +309,7 @@
 	if (sb.st_size <= LINE_LEN - strlen(header) - 5) {
 		nr = read(fd, tbuf, sizeof(tbuf));
 		if (nr <= 0) {
-			(void)close(fd);
+			close(fd);
 			return(0);
 		}
 		for (p = tbuf, cnt = nr; cnt--; ++p)
@@ -317,28 +317,28 @@
 				break;
 		if (cnt <= 1) {
 			if (*header != '\0')
-				(void)printf("%s: ", header);
+				printf("%s: ", header);
 			for (p = tbuf, cnt = nr; cnt--; ++p)
 				if (*p != '\r')
 					vputc(lastc = *p);
 			if (lastc != '\n')
-				(void)putchar('\n');
-			(void)close(fd);
+				putchar('\n');
+			close(fd);
 			return(1);
 		}
 		else
-			(void)lseek(fd, 0L, SEEK_SET);
+			lseek(fd, 0L, SEEK_SET);
 	}
 	if ((fp = fdopen(fd, "r")) == NULL)
 		return(0);
 	if (*header != '\0')
-		(void)printf("%s:\n", header);
+		printf("%s:\n", header);
 	while ((ch = getc(fp)) != EOF)
 		if (ch != '\r')
 			vputc(lastc = ch);
 	if (lastc != '\n')
-		(void)putchar('\n');
-	(void)fclose(fp);
+		putchar('\n');
+	fclose(fp);
 	return(1);
 }
 
Index: finger/sprint.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/sprint.c,v
retrieving revision 1.3
diff -u -u -r1.3 sprint.c
--- finger/sprint.c	4 Oct 2003 20:36:44 -0000	1.3
+++ finger/sprint.c	7 Nov 2004 20:02:14 -0000
@@ -83,7 +83,7 @@
 	 */
 #define	MAXREALNAME	20
 #define MAXHOSTNAME     17      /* in reality, hosts are never longer than 16 */
-	(void)printf("%-*s %-*s%s  %s\n", UT_NAMESIZE, "Login", MAXREALNAME,
+	printf("%-*s %-*s%s  %s\n", UT_NAMESIZE, "Login", MAXREALNAME,
 	    "Name", " TTY  Idle  Login  Time ", (gflag) ? "" :
 	    oflag ? "Office  Phone" : "Where");
 
@@ -100,57 +100,57 @@
 			namelen = MAXREALNAME;
 			if (w->info == LOGGEDIN && !w->writable)
 				--namelen;	/* leave space before `*' */
-			(void)printf("%-*.*s %-*.*s", UT_NAMESIZE, UT_NAMESIZE,
+			printf("%-*.*s %-*.*s", UT_NAMESIZE, UT_NAMESIZE,
 				pn->name, MAXREALNAME, namelen,
 				pn->realname ? pn->realname : "");
 			if (!w->loginat) {
-				(void)printf("  *     *   No logins   ");
+				printf("  *     *   No logins   ");
 				goto office;
 			}
-			(void)putchar(w->info == LOGGEDIN && !w->writable ?
+			putchar(w->info == LOGGEDIN && !w->writable ?
 			    '*' : ' ');
 			if (*w->tty)
-				(void)printf("%-3.3s ",
+				printf("%-3.3s ",
 					     (strncmp(w->tty, "tty", 3)
 					      && strncmp(w->tty, "cua", 3))
 					     ? w->tty : w->tty + 3);
 			else
-				(void)printf("    ");
+				printf("    ");
 			if (w->info == LOGGEDIN) {
 				stimeprint(w);
-				(void)printf("  ");
+				printf("  ");
 			} else
-				(void)printf("    *  ");
+				printf("    *  ");
 			lc = localtime(&w->loginat);
 #define SECSPERDAY 86400
 #define DAYSPERWEEK 7
 #define DAYSPERNYEAR 365
 			if (now - w->loginat < SECSPERDAY * (DAYSPERWEEK - 1)) {
-				(void)strftime(p, sizeof(p), "%a", lc);
+				strftime(p, sizeof(p), "%a", lc);
 			} else {
-				(void)strftime(p, sizeof(p),
+				strftime(p, sizeof(p),
 					     d_first ? "%e %b" : "%b %e", lc);
 			}
-			(void)printf("%-6.6s", p);
+			printf("%-6.6s", p);
 			if (now - w->loginat >= SECSPERDAY * DAYSPERNYEAR / 2) {
-				(void)strftime(p, sizeof(p), "%Y", lc);
+				strftime(p, sizeof(p), "%Y", lc);
 			} else {
-				(void)strftime(p, sizeof(p), "%R", lc);
+				strftime(p, sizeof(p), "%R", lc);
 			}
-			(void)printf(" %-5.5s", p);
+			printf(" %-5.5s", p);
 office:
 			if (gflag)
 				goto no_gecos;
 			if (oflag) {
 				if (pn->office)
-					(void)printf(" %-7.7s", pn->office);
+					printf(" %-7.7s", pn->office);
 				else if (pn->officephone)
-					(void)printf(" %-7.7s", " ");
+					printf(" %-7.7s", " ");
 				if (pn->officephone)
-					(void)printf(" %-.9s",
+					printf(" %-.9s",
 					    prphone(pn->officephone));
 			} else
-				(void)printf(" %.*s", MAXHOSTNAME, w->host);
+				printf(" %.*s", MAXHOSTNAME, w->host);
 no_gecos:
 			putchar('\n');
 		}
@@ -166,12 +166,12 @@
 	if (!delta->tm_yday)
 		if (!delta->tm_hour)
 			if (!delta->tm_min)
-				(void)printf("     ");
+				printf("     ");
 			else
-				(void)printf("%5d", delta->tm_min);
+				printf("%5d", delta->tm_min);
 		else
-			(void)printf("%2d:%02d",
+			printf("%2d:%02d",
 			    delta->tm_hour, delta->tm_min);
 	else
-		(void)printf("%4dd", delta->tm_yday);
+		printf("%4dd", delta->tm_yday);
 }
Index: finger/util.c
===================================================================
RCS file: /cvs/src/usr.bin/finger/util.c,v
retrieving revision 1.3
diff -u -u -r1.3 util.c
--- finger/util.c	4 Oct 2003 20:36:44 -0000	1.3
+++ finger/util.c	7 Nov 2004 20:02:14 -0000
@@ -72,7 +72,7 @@
 	 * XXX
 	 * Why do we skip asterisks!?!?
 	 */
-	(void)strncpy(p = tbuf, pw->pw_gecos, sizeof(tbuf));
+	strncpy(p = tbuf, pw->pw_gecos, sizeof(tbuf));
 	tbuf[sizeof(tbuf) - 1] = '\0';
 	if (*p == '*')
 		++p;
@@ -83,7 +83,7 @@
 
 	for (t = name; t < &name[sizeof(name) - 1] && (*t = *p) != '\0'; ++p) {
 		if (*t == '&') { 
-			(void)strncpy(t, pw->pw_name, 
+			strncpy(t, pw->pw_name, 
 			    sizeof(name) - (t - name));
 			name[sizeof(name) - 1] = '\0';
 			while (t < &name[sizeof(name) - 1] && *++t)
@@ -310,7 +310,7 @@
 	struct stat sb;
 	time_t touched;
 
-	(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_DEV, w->tty);
+	snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_DEV, w->tty);
 	if (stat(tbuf, &sb) < 0) {
 		warn("%s", tbuf);
 		return;
@@ -344,7 +344,7 @@
 		err(1, "strdup failed");
 
 	/* why do we skip asterisks!?!? */
-	(void)strncpy(bp = tbuf, pw->pw_gecos, sizeof(tbuf));
+	strncpy(bp = tbuf, pw->pw_gecos, sizeof(tbuf));
 	tbuf[sizeof(tbuf) - 1] = '\0';
 	if (*bp == '*')
 		++bp;
@@ -354,7 +354,7 @@
 		return;
 	for (t = name; t < &name[sizeof(name) - 1] && (*t = *p) != '\0'; ++p) {
 		if (*t == '&') {
-			(void)strncpy(t, pw->pw_name, 
+			strncpy(t, pw->pw_name, 
 			    sizeof(name) - (t - name));
 			name[sizeof(name) - 1] = '\0';
 			if (islower(*t))
@@ -374,7 +374,7 @@
 	    strdup(p) : NULL;
 	pn->homephone = ((p = strsep(&bp, ",")) && *p) ?
 	    strdup(p) : NULL;
-	(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_MAILDIR, pw->pw_name);
+	snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_MAILDIR, pw->pw_name);
 	pn->mailrecv = -1;		/* -1 == not_valid */
 	if (stat(tbuf, &sb) < 0) {
 		if (errno != ENOENT) {
Index: fmt/fmt.c
===================================================================
RCS file: /cvs/src/usr.bin/fmt/fmt.c,v
retrieving revision 1.2
diff -u -u -r1.2 fmt.c
--- fmt/fmt.c	17 Jun 2003 04:29:26 -0000	1.2
+++ fmt/fmt.c	7 Nov 2004 20:02:14 -0000
@@ -252,7 +252,7 @@
   int ch;			/* used for |getopt| processing */
 
 
-  (void) setlocale(LC_CTYPE, "");
+  setlocale(LC_CTYPE, "");
 
   /* 1. Grok parameters. */
 
Index: fold/fold.c
===================================================================
RCS file: /cvs/src/usr.bin/fold/fold.c,v
retrieving revision 1.3
diff -u -u -r1.3 fold.c
--- fold/fold.c	4 Oct 2003 20:36:44 -0000	1.3
+++ fold/fold.c	7 Nov 2004 20:02:14 -0000
@@ -64,7 +64,7 @@
 	int rval, width;
 	char *p;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	width = -1;
 	while ((ch = getopt(argc, argv, "0123456789bsw:")) != -1)
@@ -113,7 +113,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: fold [-bs] [-w width] [file ...]\n");
+	fprintf(stderr, "usage: fold [-bs] [-w width] [file ...]\n");
 	exit(1);
 }
 
Index: from/from.c
===================================================================
RCS file: /cvs/src/usr.bin/from/from.c,v
retrieving revision 1.3
diff -u -u -r1.3 from.c
--- from/from.c	4 Oct 2003 20:36:44 -0000	1.3
+++ from/from.c	7 Nov 2004 20:02:14 -0000
@@ -85,14 +85,14 @@
 
 	if (!file) {
 		if (*argv) {
-			(void)snprintf(buf, sizeof(buf), "%s/%s", _PATH_MAILDIR, *argv);
+			snprintf(buf, sizeof(buf), "%s/%s", _PATH_MAILDIR, *argv);
 			file  = buf;
 		} else {
 			if (!(file = getenv("MAIL"))) {
 				if (!(pwd = getpwuid(getuid())))
 					errx(1, "no password file entry for you");
 				file = pwd->pw_name;
-				(void)snprintf(buf, sizeof(buf),
+				snprintf(buf, sizeof(buf),
 				    "%s/%s", _PATH_MAILDIR, file);
 				file = buf;
 			}
Index: fstat/fstat.c
===================================================================
RCS file: /cvs/src/usr.bin/fstat/fstat.c,v
retrieving revision 1.9
diff -u -u -r1.9 fstat.c
--- fstat/fstat.c	3 Sep 2004 20:37:58 -0000	1.9
+++ fstat/fstat.c	7 Nov 2004 20:02:14 -0000
@@ -495,18 +495,18 @@
 	}
 	PREFIX(i);
 	if (badtype) {
-		(void)printf(" -         -  %10s    -\n", badtype);
+		printf(" -         -  %10s    -\n", badtype);
 		return;
 	}
 	if (nflg)
-		(void)printf(" %2d,%-2d", major(fst.fsid), minor(fst.fsid));
+		printf(" %2d,%-2d", major(fst.fsid), minor(fst.fsid));
 	else
-		(void)printf(" %-8s", getmnton(vn.v_mount));
+		printf(" %-8s", getmnton(vn.v_mount));
 	if (nflg)
-		(void)sprintf(mode, "%o", fst.mode);
+		sprintf(mode, "%o", fst.mode);
 	else
 		strmode(fst.mode, mode);
-	(void)printf(" %6ld %10s", fst.fileid, mode);
+	printf(" %6ld %10s", fst.fileid, mode);
 	switch (vn.v_type) {
 	case VBLK:
 	case VCHR: {
@@ -843,7 +843,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
  "usage: fstat [-fmnv] [-p pid] [-u user] [-N system] [-M core] [file ...]\n");
 	exit(1);
 }
Index: ftp/cmds.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/cmds.c,v
retrieving revision 1.3
diff -u -u -r1.3 cmds.c
--- ftp/cmds.c	4 Oct 2003 20:36:44 -0000	1.3
+++ ftp/cmds.c	7 Nov 2004 20:02:14 -0000
@@ -120,7 +120,7 @@
 	else
 		comret = command("TYPE %s", p->t_mode);
 	if (comret == COMPLETE) {
-		(void)strcpy(typename, p->t_name);
+		strcpy(typename, p->t_name);
 		curtype = type = p->t_type;
 	}
 }
@@ -304,7 +304,7 @@
 	mname = argv[0];
 	mflag = 1;
 	oldintr = signal(SIGINT, mabort);
-	(void)setjmp(jabort);
+	setjmp(jabort);
 	if (proxy) {
 		char *cp, *tp2, tmpbuf[MAXPATHLEN];
 
@@ -349,7 +349,7 @@
 				}
 			}
 		}
-		(void)signal(SIGINT, oldintr);
+		signal(SIGINT, oldintr);
 		mflag = 0;
 		return;
 	}
@@ -401,7 +401,7 @@
 		}
 		globfree(&gl);
 	}
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 	mflag = 0;
 }
 
@@ -409,14 +409,14 @@
 reget(int argc, char **argv)
 {
 
-	(void)getit(argc, argv, 1, "r+w");
+	getit(argc, argv, 1, "r+w");
 }
 
 void
 get(int argc, char **argv)
 {
 
-	(void)getit(argc, argv, 0, restart_point ? "r+w" : "w" );
+	getit(argc, argv, 0, restart_point ? "r+w" : "w" );
 }
 
 /*
@@ -515,7 +515,7 @@
 
 	alarmtimer(0);
 	putchar('\n');
-	(void)fflush(stdout);
+	fflush(stdout);
 	if (mflag && fromatty) {
 		ointer = interactive;
 		oconf = confirmrest;
@@ -551,7 +551,7 @@
 	mname = argv[0];
 	mflag = 1;
 	oldintr = signal(SIGINT, mabort);
-	(void)setjmp(jabort);
+	setjmp(jabort);
 	while ((cp = remglob(argv, proxy, NULL)) != NULL) {
 		if (*cp == '\0') {
 			mflag = 0;
@@ -585,7 +585,7 @@
 			}
 		}
 	}
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 	mflag = 0;
 }
 
@@ -985,7 +985,7 @@
 		code = -1;
 		return;
 	}
-	(void)command("DELE %s", argv[1]);
+	command("DELE %s", argv[1]);
 }
 
 /*
@@ -1006,14 +1006,14 @@
 	mname = argv[0];
 	mflag = 1;
 	oldintr = signal(SIGINT, mabort);
-	(void)setjmp(jabort);
+	setjmp(jabort);
 	while ((cp = remglob(argv, 0, NULL)) != NULL) {
 		if (*cp == '\0') {
 			mflag = 0;
 			continue;
 		}
 		if (mflag && confirm(argv[0], cp)) {
-			(void)command("DELE %s", cp);
+			command("DELE %s", cp);
 			if (!mflag && fromatty) {
 				ointer = interactive;
 				interactive = 1;
@@ -1024,7 +1024,7 @@
 			}
 		}
 	}
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 	mflag = 0;
 }
 
@@ -1044,7 +1044,7 @@
 		return;
 	}
 	if (command("RNFR %s", argv[1]) == CONTINUE)
-		(void)command("RNTO %s", argv[2]);
+		command("RNTO %s", argv[2]);
 }
 
 /*
@@ -1120,7 +1120,7 @@
 	mname = argv[0];
 	mflag = 1;
 	oldintr = signal(SIGINT, mabort);
-	(void)setjmp(jabort);
+	setjmp(jabort);
 	for (i = 1; mflag && i < argc-1; ++i) {
 		*mode = (i == 1) ? 'w' : 'a';
 		recvrequest(dolist ? "LIST" : "NLST", dest, argv[i], mode,
@@ -1134,7 +1134,7 @@
 			interactive = ointer;
 		}
 	}
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 	mflag = 0;
 	if (dest != odest)			/* free up after globulize() */
 		free(dest);
@@ -1156,9 +1156,9 @@
 	old2 = signal (SIGQUIT, SIG_IGN);
 	if ((pid = fork()) == 0) {
 		for (pid = 3; pid < 20; pid++)
-			(void)close(pid);
-		(void)signal(SIGINT, SIG_DFL);
-		(void)signal(SIGQUIT, SIG_DFL);
+			close(pid);
+		signal(SIGINT, SIG_DFL);
+		signal(SIGQUIT, SIG_DFL);
 		shell = getenv("SHELL");
 		if (shell == NULL)
 			shell = _PATH_BSHELL;
@@ -1166,13 +1166,13 @@
 		if (namep == NULL)
 			namep = shell;
 		shellnam[0] = '-';
-		(void)strncpy(shellnam + 1, ++namep, sizeof(shellnam) - 2);
+		strncpy(shellnam + 1, ++namep, sizeof(shellnam) - 2);
 		shellnam[sizeof(shellnam) - 1] = '\0';
 		if (strcmp(namep, "sh") != 0)
 			shellnam[0] = '+';
 		if (debug) {
 			puts(shell);
-			(void)fflush(stdout);
+			fflush(stdout);
 		}
 		if (argc > 1) {
 			execl(shell, shellnam, "-c", altarg, (char *)0);
@@ -1187,8 +1187,8 @@
 	if (pid > 0)
 		while (wait(&wait_status) != pid)
 			;
-	(void)signal(SIGINT, old1);
-	(void)signal(SIGQUIT, old2);
+	signal(SIGINT, old1);
+	signal(SIGQUIT, old2);
 	if (pid == -1) {
 		warn("Try again later");
 		code = -1;
@@ -1208,7 +1208,7 @@
 	int n, aflag = 0;
 
 	if (argc < 2)
-		(void)another(&argc, &argv, "username");
+		another(&argc, &argv, "username");
 	if (argc < 2 || argc > 4) {
 		printf("usage: %s username [password] [account]\n", argv[0]);
 		code = -1;
@@ -1222,9 +1222,9 @@
 	}
 	if (n == CONTINUE) {
 		if (argc < 4) {
-			(void)fputs("Account: ", stdout);
-			(void)fflush(stdout);
-			(void)fgets(acct, sizeof(acct) - 1, stdin);
+			fputs("Account: ", stdout);
+			fflush(stdout);
+			fgets(acct, sizeof(acct) - 1, stdin);
 			acct[strlen(acct) - 1] = '\0';
 			argv[3] = acct; argc++;
 		}
@@ -1236,7 +1236,7 @@
 		return;
 	}
 	if (!aflag && argc == 4) {
-		(void)command("ACCT %s", argv[3]);
+		command("ACCT %s", argv[3]);
 	}
 	connected = -1;
 }
@@ -1256,7 +1256,7 @@
 	verbose = 1;
 	if (command("PWD") == ERROR && code == 500) {
 		puts("PWD command not recognized, trying XPWD.");
-		(void)command("XPWD");
+		command("XPWD");
 	}
 	verbose = oldverbose;
 }
@@ -1292,7 +1292,7 @@
 	if (command("MKD %s", argv[1]) == ERROR && code == 500) {
 		if (verbose)
 			puts("MKD command not recognized, trying XMKD.");
-		(void)command("XMKD %s", argv[1]);
+		command("XMKD %s", argv[1]);
 	}
 }
 
@@ -1312,7 +1312,7 @@
 	if (command("RMD %s", argv[1]) == ERROR && code == 500) {
 		if (verbose)
 			puts("RMD command not recognized, trying XRMD.");
-		(void)command("XRMD %s", argv[1]);
+		command("XRMD %s", argv[1]);
 	}
 }
 
@@ -1386,7 +1386,7 @@
 		code = -1;
 		return;
 	}
-	(void)command("SITE CHMOD %s %s", argv[1], argv[2]);
+	command("SITE CHMOD %s %s", argv[1], argv[2]);
 }
 
 void
@@ -1395,7 +1395,7 @@
 	int oldverbose = verbose;
 
 	verbose = 1;
-	(void)command(argc == 1 ? "SITE UMASK" : "SITE UMASK %s", argv[1]);
+	command(argc == 1 ? "SITE UMASK" : "SITE UMASK %s", argv[1]);
 	verbose = oldverbose;
 }
 
@@ -1405,7 +1405,7 @@
 	int oldverbose = verbose;
 
 	verbose = 1;
-	(void)command(argc == 1 ? "SITE IDLE" : "SITE IDLE %s", argv[1]);
+	command(argc == 1 ? "SITE IDLE" : "SITE IDLE %s", argv[1]);
 	verbose = oldverbose;
 }
 
@@ -1418,7 +1418,7 @@
 	int oldverbose = verbose;
 
 	verbose = 1;
-	(void)command(argc == 1 ? "HELP" : "HELP %s", argv[1]);
+	command(argc == 1 ? "HELP" : "HELP %s", argv[1]);
 	verbose = oldverbose;
 }
 
@@ -1448,9 +1448,9 @@
 
 	if (!connected)
 		return;
-	(void)command("QUIT");
+	command("QUIT");
 	if (cout) {
-		(void)fclose(cout);
+		fclose(cout);
 	}
 	cout = NULL;
 	connected = 0;
@@ -1474,7 +1474,7 @@
 		ap = argv[1];
 	else
 		ap = getpass("Account:");
-	(void)command("ACCT %s", ap);
+	command("ACCT %s", ap);
 }
 
 jmp_buf abortprox;
@@ -1512,19 +1512,19 @@
 	c = getcmd(argv[1]);
 	if (c == (struct cmd *) -1) {
 		puts("?Ambiguous command.");
-		(void)fflush(stdout);
+		fflush(stdout);
 		code = -1;
 		return;
 	}
 	if (c == 0) {
 		puts("?Invalid command.");
-		(void)fflush(stdout);
+		fflush(stdout);
 		code = -1;
 		return;
 	}
 	if (!c->c_proxy) {
 		puts("?Invalid proxy command.");
-		(void)fflush(stdout);
+		fflush(stdout);
 		code = -1;
 		return;
 	}
@@ -1536,9 +1536,9 @@
 	pswitch(1);
 	if (c->c_conn && !connected) {
 		puts("Not connected.");
-		(void)fflush(stdout);
+		fflush(stdout);
 		pswitch(0);
-		(void)signal(SIGINT, oldintr);
+		signal(SIGINT, oldintr);
 		code = -1;
 		return;
 	}
@@ -1553,7 +1553,7 @@
 		proxflag = 0;
 	}
 	pswitch(0);
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 }
 
 void
@@ -1581,13 +1581,13 @@
 	}
 	ntflag++;
 	code = ntflag;
-	(void)strncpy(ntin, argv[1], sizeof(ntin) - 1);
+	strncpy(ntin, argv[1], sizeof(ntin) - 1);
 	ntin[sizeof(ntin) - 1] = '\0';
 	if (argc == 2) {
 		ntout[0] = '\0';
 		return;
 	}
-	(void)strncpy(ntout, argv[2], sizeof(ntout) - 1);
+	strncpy(ntout, argv[2], sizeof(ntout) - 1);
 	ntout[sizeof(ntout) - 1] = '\0';
 }
 
@@ -1645,10 +1645,10 @@
 		cp = strchr(altarg, ' ');
 	}
 	*cp = '\0';
-	(void)strncpy(mapin, altarg, MAXPATHLEN - 1);
+	strncpy(mapin, altarg, MAXPATHLEN - 1);
 	while (*++cp == ' ')
 		continue;
-	(void)strncpy(mapout, cp, MAXPATHLEN - 1);
+	strncpy(mapout, cp, MAXPATHLEN - 1);
 }
 
 char *
@@ -1905,7 +1905,7 @@
 syst(int argc, char **argv)
 {
 
-	(void)command("SYST");
+	command("SYST");
 }
 
 void
@@ -1927,7 +1927,7 @@
 	if (interactive)
 		puts(
 "Enter macro line by line, terminating it with a null line.");
-	(void)strncpy(macros[macnum].mac_name, argv[1],
+	strncpy(macros[macnum].mac_name, argv[1],
 	    sizeof(macros[macnum].mac_name) - 1);
 	macros[macnum].mac_name[sizeof(macros[macnum].mac_name) - 1] = '\0';
 	if (macnum == 0)
@@ -2022,7 +2022,7 @@
 rmtstatus(int argc, char **argv)
 {
 
-	(void)command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
+	command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }
 
 /*
@@ -2061,13 +2061,13 @@
 		p = PAGER;
 	if ((pager = malloc(strlen(p) + 2)) == NULL)
 		errx(1, "Can't allocate memory for $PAGER");
-	(void)sprintf(pager, "|%s", p);
+	sprintf(pager, "|%s", p);
 
 	ohash = hash;
 	overbose = verbose;
 	hash = verbose = 0;
 	recvrequest("RETR", pager, argv[1], "r+w", 1, 0);
-	(void)free(pager);
+	free(pager);
 	hash = ohash;
 	verbose = overbose;
 	if (oldargv1 != argv[1])	/* free up after globulize() */
Index: ftp/complete.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/complete.c,v
retrieving revision 1.3
diff -u -u -r1.3 complete.c
--- ftp/complete.c	4 Oct 2003 20:36:44 -0000	1.3
+++ ftp/complete.c	7 Nov 2004 20:02:14 -0000
@@ -112,7 +112,7 @@
 				matchlen = j;
 		}
 		if (matchlen > wordlen) {
-			(void)strncpy(insertstr, lastmatch, matchlen);
+			strncpy(insertstr, lastmatch, matchlen);
 			insertstr[matchlen] = '\0';
 			if (el_insertstr(el, insertstr + wordlen) == -1)
 				return (CC_ERROR);
@@ -178,7 +178,7 @@
 			dir[0] = '/';
 			dir[1] = '\0';
 		} else {
-			(void)strncpy(dir, word, file - word);
+			strncpy(dir, word, file - word);
 			dir[file - word] = '\0';
 		}
 		file++;
@@ -234,7 +234,7 @@
 		cp = file;
 		while (*cp == '/' && cp > word)
 			cp--;
-		(void)strncpy(dir, word, cp - word + 1);
+		strncpy(dir, word, cp - word + 1);
 		dir[cp - word + 1] = '\0';
 		file++;
 	}
@@ -271,7 +271,7 @@
 			printf("\n%s\n", emesg);
 			return (CC_REDISPLAY);
 		}
-		(void)strcpy(lastdir, dir);
+		strcpy(lastdir, dir);
 		dirchange = 0;
 	}
 
@@ -306,7 +306,7 @@
 	len = lf->lastchar - lf->buffer;
 	if (len >= sizeof(line))
 		return (CC_ERROR);
-	(void)strncpy(line, lf->buffer, len);
+	strncpy(line, lf->buffer, len);
 	line[len] = '\0';
 	cursor_pos = line + (lf->cursor - lf->buffer);
 	lastc_argc = cursor_argc;	/* remember last cursor pos */
@@ -322,7 +322,7 @@
 	    && strncmp(word, margv[cursor_argc], cursor_argo) == 0)
 		dolist = 1;
 	else
-	    (void)strncpy(word, margv[cursor_argc], cursor_argo);
+	    strncpy(word, margv[cursor_argc], cursor_argo);
 	word[cursor_argo] = '\0';
 
 	if (cursor_argc == 0)
Index: ftp/domacro.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/domacro.c,v
retrieving revision 1.3
diff -u -u -r1.3 domacro.c
--- ftp/domacro.c	4 Oct 2003 20:36:44 -0000	1.3
+++ ftp/domacro.c	7 Nov 2004 20:02:14 -0000
@@ -70,7 +70,7 @@
 		code = -1;
 		return;
 	}
-	(void)strcpy(line2, line);
+	strcpy(line2, line);
 TOP:
 	cp1 = macros[i].mac_start;
 	while (cp1 != macros[i].mac_end) {
@@ -91,7 +91,7 @@
 				    }
 				    cp1--;
 				    if (argc - 2 >= j) {
-					(void)strcpy(cp2, argv[j+1]);
+					strcpy(cp2, argv[j+1]);
 					cp2 += strlen(argv[j+1]);
 				    }
 				    break;
@@ -100,7 +100,7 @@
 					loopflg = 1;
 					cp1++;
 					if (count < argc) {
-					   (void)strcpy(cp2, argv[count]);
+					   strcpy(cp2, argv[count]);
 					   cp2 += strlen(argv[count]);
 					}
 					break;
@@ -134,9 +134,9 @@
 				puts(line);
 			(*c->c_handler)(margc, margv);
 			if (bell && c->c_bell) {
-				(void)putchar('\007');
+				putchar('\007');
 			}
-			(void)strcpy(line, line2);
+			strcpy(line, line2);
 			makeargv();
 			argc = margc;
 			argv = margv;
Index: ftp/fetch.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.3
diff -u -u -r1.3 fetch.c
--- ftp/fetch.c	4 Oct 2003 20:36:44 -0000	1.3
+++ ftp/fetch.c	7 Nov 2004 20:02:14 -0000
@@ -110,9 +110,9 @@
 	res0 = NULL;
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-	(void)&savefile;
-	(void)&proxy;
-	(void)&res0;
+	&savefile;
+	&proxy;
+	&res0;
 #endif
 
 	line = strdup(origline);
@@ -238,7 +238,7 @@
 	      {
 		res = res->ai_next;
 		if (res) {
-			(void)close(s);
+			close(s);
 			continue;
 		}
 		getnameinfo(bindres->ai_addr, bindres->ai_addrlen,
@@ -253,7 +253,7 @@
 	if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
 		res = res->ai_next;
 		if (res) {
-			(void)close(s);
+			close(s);
 			continue;
 		}
 		warn("Can't connect to %s", host);
@@ -359,7 +359,7 @@
 	oldintr = NULL;
 	if (setjmp(httpabort)) {
 		if (oldintr)
-			(void)signal(SIGINT, oldintr);
+			signal(SIGINT, oldintr);
 		goto cleanup_url_get;
 	}
 	oldintr = signal(SIGINT, aborthttp);
@@ -382,17 +382,17 @@
 		}
 		if (hash && !progress) {
 			while (bytes >= hashbytes) {
-				(void)putchar('#');
+				putchar('#');
 				hashbytes += mark;
 			}
-			(void)fflush(stdout);
+			fflush(stdout);
 		}
 	}
 	if (hash && !progress && bytes > 0) {
 		if (bytes < mark)
-			(void)putchar('#');
-		(void)putchar('\n');
-		(void)fflush(stdout);
+			putchar('#');
+		putchar('\n');
+		fflush(stdout);
 	}
 	if (len != 0) {
 		warn("Reading from socket");
@@ -401,7 +401,7 @@
 	progressmeter(1);
 	if (verbose)
 		puts("Successfully retrieved file.");
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 
 	close(s);
 	close(out);
@@ -438,7 +438,7 @@
 
 	alarmtimer(0);
 	puts("\nhttp fetch aborted.");
-	(void)fflush(stdout);
+	fflush(stdout);
 	longjmp(httpabort, 1);
 }
 
@@ -476,8 +476,8 @@
 			disconnect(0, NULL);
 		return (argpos + 1);
 	}
-	(void)signal(SIGINT, (sig_t)intr);
-	(void)signal(SIGPIPE, (sig_t)lostpeer);
+	signal(SIGINT, (sig_t)intr);
+	signal(SIGPIPE, (sig_t)lostpeer);
 
 	ftpproxy = getenv(FTP_PROXY);
 	httpproxy = getenv(HTTP_PROXY);
@@ -598,7 +598,7 @@
 		if (strcmp(host, lasthost) != 0) {
 			int oautologin;
 
-			(void)strcpy(lasthost, host);
+			strcpy(lasthost, host);
 			if (connected)
 				disconnect(0, NULL);
 			xargv[0] = __progname;
Index: ftp/ftp.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.6
diff -u -u -r1.6 ftp.c
--- ftp/ftp.c	19 Jun 2004 18:55:48 -0000	1.6
+++ ftp/ftp.c	7 Nov 2004 20:02:14 -0000
@@ -124,7 +124,7 @@
 
 	res = res0;
 	if (res->ai_canonname)
-		(void) strncpy(hostnamebuf, res->ai_canonname,
+		strncpy(hostnamebuf, res->ai_canonname,
 			       sizeof(hostnamebuf));
 	hostname = hostnamebuf;
 	while (1) {
@@ -161,7 +161,7 @@
 		      {
 			res = res->ai_next;
 			if (res) {
-				(void)close(s);
+				close(s);
 				continue;
 			}
 			warn("bind");
@@ -182,7 +182,7 @@
 				    hname, sizeof(hname) - 1, NULL, 0,
 				    NI_NUMERICHOST);
 			printf("Trying %s...\n", hname);
-			(void)close(s);
+			close(s);
 			continue;
 		}
 		warn("connect");
@@ -210,9 +210,9 @@
 	if (cin == NULL || cout == NULL) {
 		warnx("fdopen failed.");
 		if (cin)
-			(void)fclose(cin);
+			fclose(cin);
 		if (cout)
-			(void)fclose(cout);
+			fclose(cout);
 		code = -1;
 		goto bad;
 	}
@@ -220,9 +220,9 @@
 		printf("Connected to %s.\n", hostname);
 	if (getreply(0) > 2) { 	/* read startup message from server */
 		if (cin)
-			(void)fclose(cin);
+			fclose(cin);
 		if (cout)
-			(void)fclose(cout);
+			fclose(cout);
 		code = -1;
 		goto bad;
 	}
@@ -239,7 +239,7 @@
 
 	return (hostname);
 bad:
-	(void)close(s);
+	close(s);
 	return ((char *)0);
 }
 
@@ -249,7 +249,7 @@
 
 	alarmtimer(0);
 	putchar('\n');
-	(void)fflush(stdout);
+	fflush(stdout);
 	abrtflag++;
 	if (ptflag)
 		longjmp(ptabort, 1);
@@ -274,7 +274,7 @@
 			vprintf(fmt, ap);
 		va_end(ap);
 		putchar('\n');
-		(void)fflush(stdout);
+		fflush(stdout);
 	}
 	if (cout == NULL) {
 		warnx("No control connection for command.");
@@ -286,12 +286,12 @@
 	vfprintf(cout, fmt, ap);
 	va_end(ap);
 	fputs("\r\n", cout);
-	(void)fflush(cout);
+	fflush(cout);
 	cpend = 1;
 	r = getreply(!strcmp(fmt, "QUIT"));
 	if (abrtflag && oldintr != SIG_IGN)
 		(*oldintr)(SIGINT);
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 	return (r);
 }
 
@@ -319,13 +319,13 @@
 				case WONT:
 					c = getc(cin);
 					fprintf(cout, "%c%c%c", IAC, DONT, c);
-					(void)fflush(cout);
+					fflush(cout);
 					break;
 				case DO:
 				case DONT:
 					c = getc(cin);
 					fprintf(cout, "%c%c%c", IAC, WONT, c);
-					(void)fflush(cout);
+					fflush(cout);
 					break;
 				default:
 					break;
@@ -335,7 +335,7 @@
 			dig++;
 			if (c == EOF) {
 				if (expecteof) {
-					(void)signal(SIGINT, oldintr);
+					signal(SIGINT, oldintr);
 					code = 221;
 					return (0);
 				}
@@ -343,7 +343,7 @@
 				if (verbose) {
 					puts(
 "421 Service not available, remote server has closed connection.");
-					(void)fflush(stdout);
+					fflush(stdout);
 				}
 				code = 421;
 				return (4);
@@ -353,7 +353,7 @@
 				if (proxflag &&
 				   (dig == 1 || (dig == 5 && verbose == 0)))
 					printf("%s:", hostname);
-				(void)putchar(c);
+				putchar(c);
 			}
 			if (dig < 4 && isdigit((unsigned char)c))
 				code = code * 10 + (c - '0');
@@ -399,8 +399,8 @@
 				*cp++ = c;
 		}
 		if (verbose > 0 || (verbose > -1 && n == '5')) {
-			(void)putchar(c);
-			(void)fflush (stdout);
+			putchar(c);
+			fflush (stdout);
 		}
 		if (line == 0) {
 			size_t len = cp - current_line;
@@ -408,7 +408,7 @@
 			if (len > sizeof(reply_string))
 				len = sizeof(reply_string);
 
-			(void)strncpy(reply_string, current_line, len);
+			strncpy(reply_string, current_line, len);
 			reply_string[len] = '\0';
 		}
 		if (continuation && code != originalcode) {
@@ -419,7 +419,7 @@
 		*cp = '\0';
 		if (n != '1')
 			cpend = 0;
-		(void)signal(SIGINT, oldintr);
+		signal(SIGINT, oldintr);
 		if (code == 421 || originalcode == 421)
 			lostpeer();
 		if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
@@ -448,7 +448,7 @@
 	mflag = 0;
 	abrtflag = 0;
 	puts("\nsend aborted\nwaiting for remote to finish abort.");
-	(void)fflush(stdout);
+	fflush(stdout);
 	longjmp(sendabort, 1);
 }
 
@@ -468,13 +468,13 @@
 	static char *buf;
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-	(void)&fin;
-	(void)&dout;
-	(void)&closefunc;
-	(void)&oldinti;
-	(void)&oldintr;
-	(void)&oldintp;
-	(void)&lmode;
+	&fin;
+	&dout;
+	&closefunc;
+	&oldinti;
+	&oldintr;
+	&oldintp;
+	&lmode;
 #endif
 
 	hashbytes = mark;
@@ -502,18 +502,18 @@
 	lmode = "w";
 	if (setjmp(sendabort)) {
 		while (cpend) {
-			(void)getreply(0);
+			getreply(0);
 		}
 		if (data >= 0) {
-			(void)close(data);
+			close(data);
 			data = -1;
 		}
 		if (oldintr)
-			(void)signal(SIGINT, oldintr);
+			signal(SIGINT, oldintr);
 		if (oldintp)
-			(void)signal(SIGPIPE, oldintp);
+			signal(SIGPIPE, oldintp);
 		if (oldinti)
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINFO, oldinti);
 		code = -1;
 		goto cleanupsend;
 	}
@@ -527,9 +527,9 @@
 		fin = popen(local + 1, "r");
 		if (fin == NULL) {
 			warn("%s", local + 1);
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGPIPE, oldintp);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGPIPE, oldintp);
+			signal(SIGINFO, oldinti);
 			code = -1;
 			goto cleanupsend;
 		}
@@ -539,16 +539,16 @@
 		fin = fopen(local, "r");
 		if (fin == NULL) {
 			warn("local: %s", local);
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			code = -1;
 			goto cleanupsend;
 		}
 		closefunc = fclose;
 		if (fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode)) {
 			printf("%s: not a plain file.\n", local);
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			fclose(fin);
 			code = -1;
 			goto cleanupsend;
@@ -556,10 +556,10 @@
 		filesize = st.st_size;
 	}
 	if (initconn()) {
-		(void)signal(SIGINT, oldintr);
-		(void)signal(SIGINFO, oldinti);
+		signal(SIGINT, oldintr);
+		signal(SIGINFO, oldinti);
 		if (oldintp)
-			(void)signal(SIGPIPE, oldintp);
+			signal(SIGPIPE, oldintp);
 		code = -1;
 		if (closefunc != NULL)
 			(*closefunc)(fin);
@@ -569,7 +569,7 @@
 		st.st_blksize = BUFSIZ;
 	if (st.st_blksize > bufsize) {
 		if (buf)
-			(void)free(buf);
+			free(buf);
 		buf = malloc((unsigned)st.st_blksize);
 		if (buf == NULL) {
 			warn("malloc");
@@ -611,20 +611,20 @@
 	}
 	if (remote) {
 		if (command("%s %s", cmd, remote) != PRELIM) {
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			if (oldintp)
-				(void)signal(SIGPIPE, oldintp);
+				signal(SIGPIPE, oldintp);
 			if (closefunc != NULL)
 				(*closefunc)(fin);
 			goto cleanupsend;
 		}
 	} else
 		if (command("%s", cmd) != PRELIM) {
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			if (oldintp)
-				(void)signal(SIGPIPE, oldintp);
+				signal(SIGPIPE, oldintp);
 			if (closefunc != NULL)
 				(*closefunc)(fin);
 			goto cleanupsend;
@@ -646,17 +646,17 @@
 					break;
 			if (hash && (!progress || filesize < 0) ) {
 				while (bytes >= hashbytes) {
-					(void)putchar('#');
+					putchar('#');
 					hashbytes += mark;
 				}
-				(void)fflush(stdout);
+				fflush(stdout);
 			}
 		}
 		if (hash && (!progress || filesize < 0) && bytes > 0) {
 			if (bytes < mark)
-				(void)putchar('#');
-			(void)putchar('\n');
-			(void)fflush(stdout);
+				putchar('#');
+			putchar('\n');
+			fflush(stdout);
 		}
 		if (c < 0)
 			warn("local: %s", local);
@@ -672,29 +672,29 @@
 			if (c == '\n') {
 				while (hash && (!progress || filesize < 0) &&
 				    (bytes >= hashbytes)) {
-					(void)putchar('#');
-					(void)fflush(stdout);
+					putchar('#');
+					fflush(stdout);
 					hashbytes += mark;
 				}
 				if (ferror(dout))
 					break;
-				(void)putc('\r', dout);
+				putc('\r', dout);
 				bytes++;
 			}
-			(void)putc(c, dout);
+			putc(c, dout);
 			bytes++;
 #if 0	/* this violates RFC */
 			if (c == '\r') {
-				(void)putc('\0', dout);
+				putc('\0', dout);
 				bytes++;
 			}
 #endif
 		}
 		if (hash && (!progress || filesize < 0)) {
 			if (bytes < hashbytes)
-				(void)putchar('#');
-			(void)putchar('\n');
-			(void)fflush(stdout);
+				putchar('#');
+			putchar('\n');
+			fflush(stdout);
 		}
 		if (ferror(fin))
 			warn("local: %s", local);
@@ -708,31 +708,31 @@
 	progressmeter(1);
 	if (closefunc != NULL)
 		(*closefunc)(fin);
-	(void)fclose(dout);
-	(void)getreply(0);
-	(void)signal(SIGINT, oldintr);
-	(void)signal(SIGINFO, oldinti);
+	fclose(dout);
+	getreply(0);
+	signal(SIGINT, oldintr);
+	signal(SIGINFO, oldinti);
 	if (oldintp)
-		(void)signal(SIGPIPE, oldintp);
+		signal(SIGPIPE, oldintp);
 	if (bytes > 0)
 		ptransfer(0);
 	goto cleanupsend;
 abort:
-	(void)signal(SIGINT, oldintr);
-	(void)signal(SIGINFO, oldinti);
+	signal(SIGINT, oldintr);
+	signal(SIGINFO, oldinti);
 	if (oldintp)
-		(void)signal(SIGPIPE, oldintp);
+		signal(SIGPIPE, oldintp);
 	if (!cpend) {
 		code = -1;
 		return;
 	}
 	if (data >= 0) {
-		(void)close(data);
+		close(data);
 		data = -1;
 	}
 	if (dout)
-		(void)fclose(dout);
-	(void)getreply(0);
+		fclose(dout);
+	getreply(0);
 	code = -1;
 	if (closefunc != NULL && fin != NULL)
 		(*closefunc)(fin);
@@ -753,7 +753,7 @@
 	mflag = 0;
 	abrtflag = 0;
 	puts("\nreceive aborted\nwaiting for remote to finish abort.");
-	(void)fflush(stdout);
+	fflush(stdout);
 	longjmp(recvabort, 1);
 }
 
@@ -776,13 +776,13 @@
 	int opreserve;
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-	(void)&local;
-	(void)&fout;
-	(void)&din;
-	(void)&closefunc;
-	(void)&oldinti;
-	(void)&oldintr;
-	(void)&oldintp;
+	&local;
+	&fout;
+	&din;
+	&closefunc;
+	&oldinti;
+	&oldintr;
+	&oldintp;
 #endif
 
 	fout = NULL;
@@ -812,16 +812,16 @@
 	tcrflag = !crflag && is_retr;
 	if (setjmp(recvabort)) {
 		while (cpend) {
-			(void)getreply(0);
+			getreply(0);
 		}
 		if (data >= 0) {
-			(void)close(data);
+			close(data);
 			data = -1;
 		}
 		if (oldintr)
-			(void)signal(SIGINT, oldintr);
+			signal(SIGINT, oldintr);
 		if (oldinti)
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINFO, oldinti);
 		progress = oprogress;
 		preserve = opreserve;
 		code = -1;
@@ -835,8 +835,8 @@
 
 			if (errno != ENOENT && errno != EACCES) {
 				warn("local: %s", local);
-				(void)signal(SIGINT, oldintr);
-				(void)signal(SIGINFO, oldinti);
+				signal(SIGINT, oldintr);
+				signal(SIGINFO, oldinti);
 				code = -1;
 				return;
 			}
@@ -847,30 +847,30 @@
 				*dir = '/';
 			if (d < 0) {
 				warn("local: %s", local);
-				(void)signal(SIGINT, oldintr);
-				(void)signal(SIGINFO, oldinti);
+				signal(SIGINT, oldintr);
+				signal(SIGINFO, oldinti);
 				code = -1;
 				return;
 			}
 			if (!runique && errno == EACCES &&
 			    chmod(local, 0600) < 0) {
 				warn("local: %s", local);
-				(void)signal(SIGINT, oldintr);
-				(void)signal(SIGINFO, oldinti);
+				signal(SIGINT, oldintr);
+				signal(SIGINFO, oldinti);
 				code = -1;
 				return;
 			}
 			if (runique && errno == EACCES &&
 			   (local = gunique(local)) == NULL) {
-				(void)signal(SIGINT, oldintr);
-				(void)signal(SIGINFO, oldinti);
+				signal(SIGINT, oldintr);
+				signal(SIGINFO, oldinti);
 				code = -1;
 				return;
 			}
 		}
 		else if (runique && (local = gunique(local)) == NULL) {
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			code = -1;
 			return;
 		}
@@ -884,8 +884,8 @@
 		filesize = remotesize(remote, 0);
 	}
 	if (initconn()) {
-		(void)signal(SIGINT, oldintr);
-		(void)signal(SIGINFO, oldinti);
+		signal(SIGINT, oldintr);
+		signal(SIGINFO, oldinti);
 		code = -1;
 		return;
 	}
@@ -896,14 +896,14 @@
 		return;
 	if (remote) {
 		if (command("%s %s", cmd, remote) != PRELIM) {
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			return;
 		}
 	} else {
 		if (command("%s", cmd) != PRELIM) {
-			(void)signal(SIGINT, oldintr);
-			(void)signal(SIGINFO, oldinti);
+			signal(SIGINT, oldintr);
+			signal(SIGINFO, oldinti);
 			return;
 		}
 	}
@@ -936,7 +936,7 @@
 		st.st_blksize = BUFSIZ;
 	if (st.st_blksize > bufsize) {
 		if (buf)
-			(void)free(buf);
+			free(buf);
 		buf = malloc((unsigned)st.st_blksize);
 		if (buf == NULL) {
 			warn("malloc");
@@ -970,17 +970,17 @@
 			bytes += c;
 			if (hash && (!progress || filesize < 0)) {
 				while (bytes >= hashbytes) {
-					(void)putchar('#');
+					putchar('#');
 					hashbytes += mark;
 				}
-				(void)fflush(stdout);
+				fflush(stdout);
 			}
 		}
 		if (hash && (!progress || filesize < 0) && bytes > 0) {
 			if (bytes < mark)
-				(void)putchar('#');
-			(void)putchar('\n');
-			(void)fflush(stdout);
+				putchar('#');
+			putchar('\n');
+			fflush(stdout);
 		}
 		if (c < 0) {
 			if (errno != EPIPE)
@@ -1025,15 +1025,15 @@
 			while (c == '\r') {
 				while (hash && (!progress || filesize < 0) &&
 				    (bytes >= hashbytes)) {
-					(void)putchar('#');
-					(void)fflush(stdout);
+					putchar('#');
+					fflush(stdout);
 					hashbytes += mark;
 				}
 				bytes++;
 				if ((c = getc(din)) != '\n' || tcrflag) {
 					if (ferror(fout))
 						goto break2;
-					(void)putc('\r', fout);
+					putc('\r', fout);
 					if (c == '\0') {
 						bytes++;
 						goto contin2;
@@ -1042,7 +1042,7 @@
 						goto contin2;
 				}
 			}
-			(void)putc(c, fout);
+			putc(c, fout);
 			bytes++;
 	contin2:	;
 		}
@@ -1054,9 +1054,9 @@
 		}
 		if (hash && (!progress || filesize < 0)) {
 			if (bytes < hashbytes)
-				(void)putchar('#');
-			(void)putchar('\n');
-			(void)fflush(stdout);
+				putchar('#');
+			putchar('\n');
+			fflush(stdout);
 		}
 		if (ferror(din)) {
 			if (errno != EPIPE)
@@ -1072,19 +1072,19 @@
 	preserve = opreserve;
 	if (closefunc != NULL)
 		(*closefunc)(fout);
-	(void)signal(SIGINT, oldintr);
-	(void)signal(SIGINFO, oldinti);
+	signal(SIGINT, oldintr);
+	signal(SIGINFO, oldinti);
 	if (oldintp)
-		(void)signal(SIGPIPE, oldintp);
-	(void)fclose(din);
-	(void)getreply(0);
+		signal(SIGPIPE, oldintp);
+	fclose(din);
+	getreply(0);
 	if (bytes >= 0 && is_retr) {
 		if (bytes > 0)
 			ptransfer(0);
 		if (preserve && (closefunc == fclose)) {
 			mtime = remotemodtime(remote, 0);
 			if (mtime != -1) {
-				(void)gettimeofday(&tval[0],
+				gettimeofday(&tval[0],
 				    (struct timezone *)0);
 				tval[1].tv_sec = mtime;
 				tval[1].tv_usec = 0;
@@ -1105,29 +1105,29 @@
 	progress = oprogress;
 	preserve = opreserve;
 	if (oldintp)
-		(void)signal(SIGPIPE, oldintp);
-	(void)signal(SIGINT, SIG_IGN);
+		signal(SIGPIPE, oldintp);
+	signal(SIGINT, SIG_IGN);
 	if (!cpend) {
 		code = -1;
-		(void)signal(SIGINT, oldintr);
-		(void)signal(SIGINFO, oldinti);
+		signal(SIGINT, oldintr);
+		signal(SIGINFO, oldinti);
 		return;
 	}
 
 	abort_remote(din);
 	code = -1;
 	if (data >= 0) {
-		(void)close(data);
+		close(data);
 		data = -1;
 	}
 	if (closefunc != NULL && fout != NULL)
 		(*closefunc)(fout);
 	if (din)
-		(void)fclose(din);
+		fclose(din);
 	if (bytes > 0)
 		ptransfer(0);
-	(void)signal(SIGINT, oldintr);
-	(void)signal(SIGINFO, oldinti);
+	signal(SIGINT, oldintr);
+	signal(SIGINFO, oldinti);
 }
 
 /*
@@ -1156,7 +1156,7 @@
 
 	if (passivemode) {
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-		(void)&pasvcmd;
+		&pasvcmd;
 #endif
 		data_addr = myctladdr;
 		data = socket(data_addr.su_family, SOCK_STREAM, 0);
@@ -1367,7 +1367,7 @@
 	if (sendport)
 		data_addr.su_port = 0;	/* let system pick one */
 	if (data != -1)
-		(void)close(data);
+		close(data);
 	data = socket(data_addr.su_family, SOCK_STREAM, 0);
 	if (data < 0) {
 		warn("socket");
@@ -1511,7 +1511,7 @@
 #endif
 	return (0);
 bad:
-	(void)close(data), data = -1;
+	close(data), data = -1;
 	if (tmpno)
 		sendport = 1;
 	return (1);
@@ -1531,10 +1531,10 @@
 	s = accept(data, (struct sockaddr *) &from, &fromlen);
 	if (s < 0) {
 		warn("accept");
-		(void)close(data), data = -1;
+		close(data), data = -1;
 		return (NULL);
 	}
-	(void)close(data);
+	close(data);
 	data = s;
 #ifdef IP_TOS
 	if (data_addr.su_family == AF_INET)
@@ -1607,7 +1607,7 @@
 	ip->connect = connected;
 	connected = op->connect;
 	if (hostname) {
-		(void)strncpy(ip->name, hostname, sizeof(ip->name) - 1);
+		strncpy(ip->name, hostname, sizeof(ip->name) - 1);
 		ip->name[sizeof(ip->name) - 1] = '\0';
 	} else
 		ip->name[0] = '\0';
@@ -1634,21 +1634,21 @@
 	mcase = op->mcse;
 	ip->ntflg = ntflag;
 	ntflag = op->ntflg;
-	(void)strncpy(ip->nti, ntin, sizeof(ip->nti) - 1);
+	strncpy(ip->nti, ntin, sizeof(ip->nti) - 1);
 	(ip->nti)[sizeof(ip->nti) - 1] = '\0';
-	(void)strcpy(ntin, op->nti);
-	(void)strncpy(ip->nto, ntout, sizeof(ip->nto) - 1);
+	strcpy(ntin, op->nti);
+	strncpy(ip->nto, ntout, sizeof(ip->nto) - 1);
 	(ip->nto)[sizeof(ip->nto) - 1] = '\0';
-	(void)strcpy(ntout, op->nto);
+	strcpy(ntout, op->nto);
 	ip->mapflg = mapflag;
 	mapflag = op->mapflg;
-	(void)strncpy(ip->mi, mapin, sizeof(ip->mi) - 1);
+	strncpy(ip->mi, mapin, sizeof(ip->mi) - 1);
 	(ip->mi)[sizeof(ip->mi) - 1] = '\0';
-	(void)strcpy(mapin, op->mi);
-	(void)strncpy(ip->mo, mapout, sizeof(ip->mo) - 1);
+	strcpy(mapin, op->mi);
+	strncpy(ip->mo, mapout, sizeof(ip->mo) - 1);
 	(ip->mo)[sizeof(ip->mo) - 1] = '\0';
-	(void)strcpy(mapout, op->mo);
-	(void)signal(SIGINT, oldintr);
+	strcpy(mapout, op->mo);
+	signal(SIGINT, oldintr);
 	if (abrtflag) {
 		abrtflag = 0;
 		(*oldintr)(SIGINT);
@@ -1661,7 +1661,7 @@
 
 	alarmtimer(0);
 	putchar('\n');
-	(void)fflush(stdout);
+	fflush(stdout);
 	ptabflg++;
 	mflag = 0;
 	abrtflag = 0;
@@ -1678,8 +1678,8 @@
 	fd_set mask;
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-	(void)&oldintr;
-	(void)&cmd2;
+	&oldintr;
+	&cmd2;
 #endif
 
 	oldintr = NULL;
@@ -1719,7 +1719,7 @@
 		goto abort;
 	oldintr = signal(SIGINT, abortpt);
 	if (command("%s %s", cmd, remote) != PRELIM) {
-		(void)signal(SIGINT, oldintr);
+		signal(SIGINT, oldintr);
 		pswitch(1);
 		return;
 	}
@@ -1729,16 +1729,16 @@
 	if (command("%s %s", cmd2, local) != PRELIM)
 		goto abort;
 	ptflag++;
-	(void)getreply(0);
+	getreply(0);
 	pswitch(0);
-	(void)getreply(0);
-	(void)signal(SIGINT, oldintr);
+	getreply(0);
+	signal(SIGINT, oldintr);
 	pswitch(1);
 	ptflag = 0;
 	printf("local: %s remote: %s\n", local, remote);
 	return;
 abort:
-	(void)signal(SIGINT, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
 	ptflag = 0;
 	if (strcmp(cmd, "RETR") && !proxy)
 		pswitch(1);
@@ -1753,7 +1753,7 @@
 		pswitch(1);
 		if (ptabflg)
 			code = -1;
-		(void)signal(SIGINT, oldintr);
+		signal(SIGINT, oldintr);
 		return;
 	}
 	if (cpend)
@@ -1767,7 +1767,7 @@
 			pswitch(1);
 			if (ptabflg)
 				code = -1;
-			(void)signal(SIGINT, oldintr);
+			signal(SIGINT, oldintr);
 			return;
 		}
 	}
@@ -1785,15 +1785,15 @@
 				code = -1;
 			lostpeer();
 		}
-		(void)getreply(0);
-		(void)getreply(0);
+		getreply(0);
+		getreply(0);
 	}
 	if (proxy)
 		pswitch(0);
 	pswitch(1);
 	if (ptabflg)
 		code = -1;
-	(void)signal(SIGINT, oldintr);
+	signal(SIGINT, oldintr);
 }
 
 void
@@ -1811,7 +1811,7 @@
 			lostpeer();
 		}
 		else if (nfnd) {
-			(void)getreply(0);
+			getreply(0);
 		}
 	}
 }
@@ -1833,7 +1833,7 @@
 		warn("local: %s", local);
 		return ((char *) 0);
 	}
-	(void)strcpy(new, local);
+	strcpy(new, local);
 	cp = new + strlen(new);
 	*cp++ = '.';
 	while (!d) {
@@ -1883,7 +1883,7 @@
 	if (send(fileno(cout), buf, 3, MSG_OOB) != 3)
 		warn("abort");
 	fprintf(cout, "%cABOR\r\n", DM);
-	(void)fflush(cout);
+	fflush(cout);
 	FD_ZERO(&mask);
 	FD_SET(fileno(cin), &mask);
 	if (din) {
@@ -1903,9 +1903,9 @@
 	}
 	if (getreply(0) == ERROR && code == 552) {
 		/* 552 needed for nic style abort */
-		(void)getreply(0);
+		getreply(0);
 	}
-	(void)getreply(0);
+	getreply(0);
 }
 
 void
Index: ftp/main.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.3
diff -u -u -r1.3 main.c
--- ftp/main.c	4 Oct 2003 20:36:45 -0000	1.3
+++ ftp/main.c	7 Nov 2004 20:02:14 -0000
@@ -76,7 +76,7 @@
 	int dumbterm;
 	char *src_addr = NULL;
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	ftpport = "ftp";
 	httpport = "http";
@@ -251,15 +251,15 @@
 		pw = getpwuid(getuid());
 	if (pw != NULL) {
 		home = homedir;
-		(void)strcpy(home, pw->pw_dir);
+		strcpy(home, pw->pw_dir);
 	}
 
 	setttywidth(0);
-	(void)signal(SIGWINCH, setttywidth);
+	signal(SIGWINCH, setttywidth);
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-	(void)&argc;
-	(void)&argv;
+	&argc;
+	&argv;
 #endif
 
 	if (argc > 0) {
@@ -272,12 +272,12 @@
 			char *xargv[4], **xargp = xargv;
 
 #ifdef __GNUC__			/* XXX: to shut up gcc warnings */
-			(void)&xargp;
+			&xargp;
 #endif
 			if (setjmp(toplevel))
 				exit(0);
-			(void)signal(SIGINT, (sig_t)intr);
-			(void)signal(SIGPIPE, (sig_t)lostpeer);
+			signal(SIGINT, (sig_t)intr);
+			signal(SIGPIPE, (sig_t)lostpeer);
 			*xargp++ = __progname;
 			*xargp++ = argv[0];		/* host */
 			if (argc > 1)
@@ -291,8 +291,8 @@
 #endif /* !SMALL */
 	top = setjmp(toplevel) == 0;
 	if (top) {
-		(void)signal(SIGINT, (sig_t)intr);
-		(void)signal(SIGPIPE, (sig_t)lostpeer);
+		signal(SIGINT, (sig_t)intr);
+		signal(SIGPIPE, (sig_t)lostpeer);
 	}
 	for (;;) {
 		cmdscanner(top);
@@ -315,13 +315,13 @@
 	alarmtimer(0);
 	if (connected) {
 		if (cout != NULL) {
-			(void)shutdown(fileno(cout), 1+1);
-			(void)fclose(cout);
+			shutdown(fileno(cout), 1+1);
+			fclose(cout);
 			cout = NULL;
 		}
 		if (data >= 0) {
-			(void)shutdown(data, 1+1);
-			(void)close(data);
+			shutdown(data, 1+1);
+			close(data);
 			data = -1;
 		}
 		connected = 0;
@@ -329,8 +329,8 @@
 	pswitch(1);
 	if (connected) {
 		if (cout != NULL) {
-			(void)shutdown(fileno(cout), 1+1);
-			(void)fclose(cout);
+			shutdown(fileno(cout), 1+1);
+			fclose(cout);
 			cout = NULL;
 		}
 		connected = 0;
@@ -362,14 +362,14 @@
 	    && !editing
 #endif /* !SMALL */
 	    )
-		(void)putchar('\n');
+		putchar('\n');
 	for (;;) {
 #ifndef SMALL
 		if (!editing) {
 #endif /* !SMALL */
 			if (fromatty) {
 				fputs(prompt(), stdout);
-				(void)fflush(stdout);
+				fflush(stdout);
 			}
 			if (fgets(line, sizeof(line), stdin) == NULL)
 				quit(0, 0);
@@ -433,12 +433,12 @@
 		confirmrest = 0;
 		(*c->c_handler)(margc, margv);
 		if (bell && c->c_bell)
-			(void)putchar('\007');
+			putchar('\007');
 		if (c->c_handler != help)
 			break;
 	}
-	(void)signal(SIGINT, (sig_t)intr);
-	(void)signal(SIGPIPE, (sig_t)lostpeer);
+	signal(SIGINT, (sig_t)intr);
+	signal(SIGPIPE, (sig_t)lostpeer);
 }
 
 struct cmd *
@@ -692,7 +692,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: %s [-46adeginptUvV] [-P port] [-s src_addr] [host [port]]\n"
 	    "       %s host:path[/]\n"
 	    "       %s ftp://host[:port]/path[/]\n"
Index: ftp/ruserpass.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/ruserpass.c,v
retrieving revision 1.3
diff -u -u -r1.3 ruserpass.c
--- ftp/ruserpass.c	4 Oct 2003 20:36:45 -0000	1.3
+++ ftp/ruserpass.c	7 Nov 2004 20:02:14 -0000
@@ -93,7 +93,7 @@
 	if (hdir == NULL)
 		hdir = ".";
 	if (strlen(hdir) + sizeof(".netrc") < sizeof(buf)) {
-		(void)snprintf(buf, sizeof buf, "%s/.netrc", hdir);
+		snprintf(buf, sizeof buf, "%s/.netrc", hdir);
 	} else {
 		warnx("%s/.netrc: %s", hdir, strerror(ENAMETOOLONG));
 		return (0);
@@ -184,7 +184,7 @@
 			break;
 		case MACDEF:
 			if (proxy) {
-				(void)fclose(cfile);
+				fclose(cfile);
 				return (0);
 			}
 			while ((c=getc(cfile)) != EOF)
@@ -255,10 +255,10 @@
 		goto done;
 	}
 done:
-	(void)fclose(cfile);
+	fclose(cfile);
 	return (0);
 bad:
-	(void)fclose(cfile);
+	fclose(cfile);
 	return (-1);
 }
 
Index: ftp/util.c
===================================================================
RCS file: /cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.3
diff -u -u -r1.3 util.c
--- ftp/util.c	4 Oct 2003 20:36:45 -0000	1.3
+++ ftp/util.c	7 Nov 2004 20:02:14 -0000
@@ -86,7 +86,7 @@
 		return;
 	}
 	if (argc < 2)
-		(void)another(&argc, &argv, "to");
+		another(&argc, &argv, "to");
 	if (argc < 2 || argc > 3) {
 		printf("usage: %s host-name [port]\n", argv[0]);
 		code = -1;
@@ -122,14 +122,14 @@
 		/*
 		 * Set up defaults for FTP.
 		 */
-		(void)strcpy(typename, "ascii"), type = TYPE_A;
+		strcpy(typename, "ascii"), type = TYPE_A;
 		curtype = TYPE_A;
-		(void)strcpy(formname, "non-print"), form = FORM_N;
-		(void)strcpy(modename, "stream"), mode = MODE_S;
-		(void)strcpy(structname, "file"), stru = STRU_F;
-		(void)strcpy(bytename, "8"), bytesize = 8;
+		strcpy(formname, "non-print"), form = FORM_N;
+		strcpy(modename, "stream"), mode = MODE_S;
+		strcpy(structname, "file"), stru = STRU_F;
+		strcpy(bytename, "8"), bytesize = 8;
 		if (autologin)
-			(void)login(argv[1], NULL, NULL);
+			login(argv[1], NULL, NULL);
 
 		overbose = verbose;
 		if (debug == 0)
@@ -163,7 +163,7 @@
 			 * for text files unless changed by the user.
 			 */
 			type = 0;
-			(void)strcpy(typename, "binary");
+			strcpy(typename, "binary");
 			if (overbose)
 			    printf("Using %s mode to transfer files.\n",
 				typename);
@@ -277,7 +277,7 @@
 	connected = -1;
 	for (n = 0; n < macnum; ++n) {
 		if (!strcmp("init", macros[n].mac_name)) {
-			(void)strcpy(line, "$init");
+			strcpy(line, "$init");
 			makeargv();
 			domacro(margc, margv);
 			break;
@@ -335,7 +335,7 @@
                         args = NULL;
                 else {
                         if (ftemp) {
-                                (void)fclose(ftemp);
+                                fclose(ftemp);
                                 ftemp = NULL;
                         }
                 }
@@ -349,7 +349,7 @@
                 return (cp);
         }
         if (ftemp == NULL) {
-                (void)snprintf(temp, sizeof(temp), "%s/%s", tmpdir, TMPFILE);
+                snprintf(temp, sizeof(temp), "%s/%s", tmpdir, TMPFILE);
                 if ((fd = mkstemp(temp)) < 0) {
                         warn("unable to create temporary file %s", temp);
                         return (NULL);
@@ -372,7 +372,7 @@
                 verbose = oldverbose;
 		hash = oldhash;
                 ftemp = fopen(temp, "r");
-                (void)unlink(temp);
+                unlink(temp);
                 if (ftemp == NULL) {
 			if (errbuf == NULL)
 				puts("can't find list of remote files, oops.");
@@ -383,7 +383,7 @@
                 }
         }
         if (fgets(buf, sizeof(buf), ftemp) == NULL) {
-                (void)fclose(ftemp);
+                fclose(ftemp);
 		ftemp = NULL;
                 return (NULL);
         }
@@ -400,7 +400,7 @@
 	if (!interactive || confirmrest)
 		return (1);
 	printf("%s %s? ", cmd, file);
-	(void)fflush(stdout);
+	fflush(stdout);
 	if (fgets(line, sizeof(line), stdin) == NULL)
 		return (0);
 	switch (tolower((unsigned char)*line)) {
@@ -593,11 +593,11 @@
 	len = 0;
 
 	if (flag == -1) {
-		(void)gettimeofday(&start, (struct timezone *)0);
+		gettimeofday(&start, (struct timezone *)0);
 		lastupdate = start;
 		lastsize = restart_point;
 	}
-	(void)gettimeofday(&now, (struct timezone *)0);
+	gettimeofday(&now, (struct timezone *)0);
 	if (!progress || filesize <= 0)
 		return;
 	cursize = bytes + restart_point;
@@ -666,14 +666,14 @@
 			    "%02d:%02d ETA", i / 60, i % 60);
 		}
 	}
-	(void)write(STDOUT_FILENO, buf, len);
+	write(STDOUT_FILENO, buf, len);
 
 	if (flag == -1) {
-		(void)signal(SIGALRM, updateprogressmeter);
+		signal(SIGALRM, updateprogressmeter);
 		alarmtimer(1);		/* set alarm timer for 1 Hz */
 	} else if (flag == 1) {
 		alarmtimer(0);
-		(void)putchar('\n');
+		putchar('\n');
 	}
 	fflush(stdout);
 }
@@ -698,7 +698,7 @@
 	if (!verbose && !siginfo)
 		return;
 
-	(void)gettimeofday(&now, (struct timezone *)0);
+	gettimeofday(&now, (struct timezone *)0);
 	timersub(&now, &start, &td);
 	elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
 	bs = bytes / (elapsed == 0.0 ? 1 : elapsed);
@@ -721,7 +721,7 @@
 		    "  ETA: %02d:%02d:%02d\n", hh, remaining / 60,
 		    remaining % 60);
 	}
-	(void)write(siginfo ? STDERR_FILENO : STDOUT_FILENO, buf, len);
+	write(siginfo ? STDERR_FILENO : STDOUT_FILENO, buf, len);
 }
 
 /*
@@ -759,7 +759,7 @@
 			w = strlen(p);
 			while (w < width) {
 				w = (w + 8) &~ 7;
-				(void)putchar('\t');
+				putchar('\t');
 			}
 		}
 	}
Index: gcore/gcore.c
===================================================================
RCS file: /cvs/src/usr.bin/gcore/gcore.c,v
retrieving revision 1.6
diff -u -u -r1.6 gcore.c
--- gcore/gcore.c	21 Nov 2003 22:46:14 -0000	1.6
+++ gcore/gcore.c	7 Nov 2004 20:02:14 -0000
@@ -177,7 +177,7 @@
 		errx(1, "Invalid executable file");
 
 	if (corefile == NULL) {
-		(void)snprintf(fname, sizeof(fname), "core.%d", pid);
+		snprintf(fname, sizeof(fname), "core.%d", pid);
 		corefile = fname;
 	}
 	fd = open(corefile, O_RDWR|O_CREAT|O_TRUNC, DEFFILEMODE);
@@ -198,7 +198,7 @@
 	else
 		elf_coredump(fd, pid);
 
-	(void)close(fd);
+	close(fd);
 	exit(0);
 }
 
@@ -314,6 +314,6 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: gcore [-s] [-c core] [executable] pid\n");
+	fprintf(stderr, "usage: gcore [-s] [-c core] [executable] pid\n");
 	exit(1);
 }
Index: gcore/md-sparc.c
===================================================================
RCS file: /cvs/src/usr.bin/gcore/md-sparc.c,v
retrieving revision 1.4
diff -u -u -r1.4 md-sparc.c
--- gcore/md-sparc.c	21 Nov 2003 22:46:14 -0000	1.4
+++ gcore/md-sparc.c	7 Nov 2004 20:02:14 -0000
@@ -63,11 +63,11 @@
 {
 	char buffer[NBPG];
 
-	(void)lseek(fd, (off_t)-NBPG, SEEK_END);
+	lseek(fd, (off_t)-NBPG, SEEK_END);
 	for (; ssize > 0; ssize -= NBPG) {
-		(void)read(fd, buffer, NBPG);
-		(void)write(fd, buffer, NBPG);
-		(void)lseek(fd, (off_t)-2 * NBPG, SEEK_CUR);
+		read(fd, buffer, NBPG);
+		write(fd, buffer, NBPG);
+		lseek(fd, (off_t)-2 * NBPG, SEEK_CUR);
 	}
 }
 
@@ -107,7 +107,7 @@
 	off += offsetof(struct md_coredump, md_tf);
 	if (lseek(fd, off, SEEK_SET) == -1)
 		err(1, "lseek");
-	(void)write(fd, &tf, sizeof(tf));
+	write(fd, &tf, sizeof(tf));
 
 	if (ki->kp_proc.p_md.md_fpstate != 0) {
 		/*
@@ -121,7 +121,7 @@
 			errx(1, "kvm_read: %s (fpu state)", kvm_geterr(kd));
 		if (cc != sizeof(fs))
 			errx(1, "cannot read fpu state");
-		(void)write(fd, (char *)&fs, sizeof(fs));
+		write(fd, (char *)&fs, sizeof(fs));
 	}
 	/*
 	 * Read pcb.
@@ -165,16 +165,16 @@
 			ssize += NBPG;
 			s += NBPG;
 			++ki->kp_eproc.e_vm.vm_ssize;
-			(void)lseek(fd,
+			lseek(fd,
 			    (off_t)offsetof(struct user, u_kproc.kp_eproc.e_vm),
 			    SEEK_SET);
-			(void)write(fd,
+			write(fd,
 			    &ki->kp_eproc.e_vm, sizeof(ki->kp_eproc.e_vm));
 		}
 		if (lseek(fd, off + s, SEEK_SET) == -1)
 			errx(1, "cannot copy pcb windows to stack");
 
-		(void)write(fd, rw, sizeof(*rw));
+		write(fd, rw, sizeof(*rw));
 		sp = rw->rw_in[6];
 	}
 }
Index: gprof/aout.c
===================================================================
RCS file: /cvs/src/usr.bin/gprof/aout.c,v
retrieving revision 1.1
diff -u -u -r1.1 aout.c
--- gprof/aout.c	17 Jun 2003 02:56:09 -0000	1.1
+++ gprof/aout.c	7 Nov 2004 20:02:14 -0000
@@ -150,7 +150,7 @@
 		  xbuf.a_text );
 	return;
     }
-    (void) fseek( nfile , N_TXTOFF( xbuf ) , 0 );
+    fseek( nfile , N_TXTOFF( xbuf ) , 0 );
     if ( fread( textspace , 1 , xbuf.a_text , nfile ) != xbuf.a_text ) {
 	warnx("couldn't read text space: can't do -c");
 	free( textspace );
Index: gzip/gzip.c
===================================================================
RCS file: /cvs/src/usr.bin/gzip/gzip.c,v
retrieving revision 1.3
diff -u -u -r1.3 gzip.c
--- gzip/gzip.c	30 Oct 2004 18:48:31 -0000	1.3
+++ gzip/gzip.c	7 Nov 2004 20:02:14 -0000
@@ -983,8 +983,8 @@
 	if (sbp == NULL) {
 		mode_t mask = umask(022);
 
-		(void)chmod(file, DEFFILEMODE & ~mask);
-		(void)umask(mask);
+		chmod(file, DEFFILEMODE & ~mask);
+		umask(mask);
 		return; 
 	}
 
@@ -1049,7 +1049,7 @@
 
 			fprintf(stderr, "%s already exists -- do you wish to "
 					"overwrite (y or n)? " , outfile);
-			(void)fgets(ans, sizeof(ans) - 1, stdin);
+			fgets(ans, sizeof(ans) - 1, stdin);
 			if (ans[0] != 'y' && ans[0] != 'Y') {
 				fprintf(stderr, "\tnot overwritting\n");
 				ok = 0;
@@ -1167,7 +1167,7 @@
 
 	insize = gz_compress(in, out, &size, basename(file), (uint32_t)isb.st_mtime);
 
-	(void)close(in);
+	close(in);
 
 	/*
 	 * If there was an error, insize will be -1.
@@ -1366,7 +1366,7 @@
 		if (ferror(in) | fclose(in)) {
 			maybe_warn("failed infile fclose");
 			unlink(outfile);
-			(void)fclose(out);
+			fclose(out);
 		}
 		if (fclose(out) != 0) {
 			maybe_warn("failed outfile fclose");
@@ -1692,7 +1692,7 @@
 			handle_file(entry->fts_name, entry->fts_statp);
 		}
 	}
-	(void)fts_close(fts);
+	fts_close(fts);
 }
 #endif
 
Index: head/head.c
===================================================================
RCS file: /cvs/src/usr.bin/head/head.c,v
retrieving revision 1.3
diff -u -u -r1.3 head.c
--- head/head.c	4 Oct 2003 20:36:45 -0000	1.3
+++ head/head.c	7 Nov 2004 20:02:15 -0000
@@ -96,7 +96,7 @@
 				continue;
 			}
 			if (argc > 1) {
-				(void)printf("%s==> %s <==\n",
+				printf("%s==> %s <==\n",
 				    first ? "" : "\n", *argv);
 				first = 0;
 			}
@@ -104,7 +104,7 @@
 				head(fp, linecnt);
 			else
 				head_bytes(fp, bytecnt);
-			(void)fclose(fp);
+			fclose(fp);
 		}
 	} else if (bytecnt == -1)
 		head(stdin, linecnt);
@@ -161,7 +161,7 @@
 			err(1, NULL);
 		ap[0] = '-';
 		ap[1] = 'n';
-		(void)strcpy(ap + 2, *argv + 1);
+		strcpy(ap + 2, *argv + 1);
 		*argv = ap;
 	}
 }
@@ -170,6 +170,6 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: head [-n lines | -c bytes] [file ...]\n");
+	fprintf(stderr, "usage: head [-n lines | -c bytes] [file ...]\n");
 	exit(1);
 }
Index: hexdump/conv.c
===================================================================
RCS file: /cvs/src/usr.bin/hexdump/conv.c,v
retrieving revision 1.3
diff -u -u -r1.3 conv.c
--- hexdump/conv.c	4 Oct 2003 20:36:45 -0000	1.3
+++ hexdump/conv.c	7 Nov 2004 20:02:15 -0000
@@ -78,12 +78,12 @@
 	}
 	if (isprint(*p)) {
 		*pr->cchar = 'c';
-		(void)printf(pr->fmt, *p);
+		printf(pr->fmt, *p);
 	} else {
-		(void)sprintf(buf, "%03o", (int)*p);
+		sprintf(buf, "%03o", (int)*p);
 		str = buf;
 strpr:		*pr->cchar = 's';
-		(void)printf(pr->fmt, str);
+		printf(pr->fmt, str);
 	}
 }
 
@@ -101,20 +101,20 @@
 	if (*p <= 0x1f) {
 		*pr->cchar = 's';
 		if (odmode && *p == 0x0a)
-			(void)printf(pr->fmt, "nl");
+			printf(pr->fmt, "nl");
 		else
-			(void)printf(pr->fmt, list[*p]);
+			printf(pr->fmt, list[*p]);
 	} else if (*p == 0x7f) {
 		*pr->cchar = 's';
-		(void)printf(pr->fmt, "del");
+		printf(pr->fmt, "del");
 	} else if (odmode && *p == 0x20) {	/* od replaced space with sp */
 		*pr->cchar = 's';
-		(void)printf(pr->fmt, " sp");
+		printf(pr->fmt, " sp");
 	} else if (isprint(*p)) {
 		*pr->cchar = 'c';
-		(void)printf(pr->fmt, *p);
+		printf(pr->fmt, *p);
 	} else {
 		*pr->cchar = 'x';
-		(void)printf(pr->fmt, (int)*p);
+		printf(pr->fmt, (int)*p);
 	}
 }
Index: hexdump/display.c
===================================================================
RCS file: /cvs/src/usr.bin/hexdump/display.c,v
retrieving revision 1.4
diff -u -u -r1.4 display.c
--- hexdump/display.c	30 Aug 2004 18:06:49 -0000	1.4
+++ hexdump/display.c	7 Nov 2004 20:02:15 -0000
@@ -99,10 +99,10 @@
 		for (pr = endfu->nextpr; pr; pr = pr->nextpr)
 			switch(pr->flags) {
 			case F_ADDRESS:
-				(void)printf(pr->fmt, (quad_t)eaddress);
+				printf(pr->fmt, (quad_t)eaddress);
 				break;
 			case F_TEXT:
-				(void)printf("%s", pr->fmt);
+				printf("%s", pr->fmt);
 				break;
 			}
 	}
@@ -123,31 +123,31 @@
 
 	switch(pr->flags) {
 	case F_ADDRESS:
-		(void)printf(pr->fmt, (quad_t)address);
+		printf(pr->fmt, (quad_t)address);
 		break;
 	case F_BPAD:
-		(void)printf(pr->fmt, "");
+		printf(pr->fmt, "");
 		break;
 	case F_C:
 		conv_c(pr, bp);
 		break;
 	case F_CHAR:
-		(void)printf(pr->fmt, *bp);
+		printf(pr->fmt, *bp);
 		break;
 	case F_DBL:
 		switch(pr->bcnt) {
 		case 4:
 			bcopy(bp, &f4, sizeof(f4));
-			(void)printf(pr->fmt, f4);
+			printf(pr->fmt, f4);
 			break;
 		case 8:
 			bcopy(bp, &f8, sizeof(f8));
-			(void)printf(pr->fmt, f8);
+			printf(pr->fmt, f8);
 			break;
 		default:
 			if (pr->bcnt == sizeof(long double)) {
 				bcopy(bp, &ldbl, sizeof(ldbl));
-				(void)printf(pr->fmt, ldbl);
+				printf(pr->fmt, ldbl);
 			}
 			break;
 		}
@@ -155,30 +155,30 @@
 	case F_INT:
 		switch(pr->bcnt) {
 		case 1:
-			(void)printf(pr->fmt, (quad_t)(signed char)*bp);
+			printf(pr->fmt, (quad_t)(signed char)*bp);
 			break;
 		case 2:
 			bcopy(bp, &s2, sizeof(s2));
-			(void)printf(pr->fmt, (quad_t)s2);
+			printf(pr->fmt, (quad_t)s2);
 			break;
 		case 4:
 			bcopy(bp, &s4, sizeof(s4));
-			(void)printf(pr->fmt, (quad_t)s4);
+			printf(pr->fmt, (quad_t)s4);
 			break;
 		case 8:
 			bcopy(bp, &s8, sizeof(s8));
-			(void)printf(pr->fmt, s8);
+			printf(pr->fmt, s8);
 			break;
 		}
 		break;
 	case F_P:
-		(void)printf(pr->fmt, isprint(*bp) ? *bp : '.');
+		printf(pr->fmt, isprint(*bp) ? *bp : '.');
 		break;
 	case F_STR:
-		(void)printf(pr->fmt, (char *)bp);
+		printf(pr->fmt, (char *)bp);
 		break;
 	case F_TEXT:
-		(void)printf("%s", pr->fmt);
+		printf("%s", pr->fmt);
 		break;
 	case F_U:
 		conv_u(pr, bp);
@@ -186,19 +186,19 @@
 	case F_UINT:
 		switch(pr->bcnt) {
 		case 1:
-			(void)printf(pr->fmt, (u_quad_t)*bp);
+			printf(pr->fmt, (u_quad_t)*bp);
 			break;
 		case 2:
 			bcopy(bp, &u2, sizeof(u2));
-			(void)printf(pr->fmt, (u_quad_t)u2);
+			printf(pr->fmt, (u_quad_t)u2);
 			break;
 		case 4:
 			bcopy(bp, &u4, sizeof(u4));
-			(void)printf(pr->fmt, (u_quad_t)u4);
+			printf(pr->fmt, (u_quad_t)u4);
 			break;
 		case 8:
 			bcopy(bp, &u8, sizeof(u8));
-			(void)printf(pr->fmt, u8);
+			printf(pr->fmt, u8);
 			break;
 		}
 		break;
@@ -262,7 +262,7 @@
 			    valid_save && 
 			    bcmp(curp, savp, nread) == 0) {
 				if (vflag != DUP)
-					(void)printf("*\n");
+					printf("*\n");
 				return((u_char *)NULL);
 			}
 			bzero((char *)curp + nread, need);
@@ -289,7 +289,7 @@
 				return(curp);
 			}
 			if (vflag == WAIT)
-				(void)printf("*\n");
+				printf("*\n");
 			vflag = DUP;
 			address += blocksize;
 			need = blocksize;
Index: hexdump/hexdump.c
===================================================================
RCS file: /cvs/src/usr.bin/hexdump/hexdump.c,v
retrieving revision 1.4
diff -u -u -r1.4 hexdump.c
--- hexdump/hexdump.c	30 Aug 2004 18:06:49 -0000	1.4
+++ hexdump/hexdump.c	7 Nov 2004 20:02:15 -0000
@@ -54,7 +54,7 @@
 	register FS *tfs;
 	char *p;
 
-	(void)setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	if (!(p = strrchr(argv[0], 'o')) || strcmp(p, "od"))
 		newsyntax(argc, &argv);
@@ -71,7 +71,7 @@
 	for (tfs = fshead; tfs; tfs = tfs->nextfs)
 		rewrite(tfs);
 
-	(void)next(argv);
+	next(argv);
 	display();
 	exit(exitval);
 }
Index: hexdump/hexsyntax.c
===================================================================
RCS file: /cvs/src/usr.bin/hexdump/hexsyntax.c,v
retrieving revision 1.4
diff -u -u -r1.4 hexsyntax.c
--- hexdump/hexsyntax.c	30 Aug 2004 18:06:49 -0000	1.4
+++ hexdump/hexsyntax.c	7 Nov 2004 20:02:15 -0000
@@ -131,7 +131,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n",
 "usage: hexdump [-bcCdovx] [-e fmt] [-f fmt_file] [-n length]",
 "               [-s skip] [file ...]",
 "       hd      [-bcdovx]  [-e fmt] [-f fmt_file] [-n length]",
Index: hexdump/parse.c
===================================================================
RCS file: /cvs/src/usr.bin/hexdump/parse.c,v
retrieving revision 1.4
diff -u -u -r1.4 parse.c
--- hexdump/parse.c	30 Aug 2004 18:06:49 -0000	1.4
+++ hexdump/parse.c	7 Nov 2004 20:02:15 -0000
@@ -69,7 +69,7 @@
 			continue;
 		add(p);
 	}
-	(void)fclose(fp);
+	fclose(fp);
 }
 
 void
@@ -138,7 +138,7 @@
 				badfmt(fmt);
 		if (!(tfu->fmt = malloc(p - savep + 1)))
 			err(1, NULL);
-		(void) strncpy(tfu->fmt, savep, p - savep);
+		strncpy(tfu->fmt, savep, p - savep);
 		tfu->fmt[p - savep] = '\0';
 		escape(tfu->fmt);
 		p++;
@@ -389,8 +389,8 @@
 			p1[0] = '\0';
 			if ((pr->fmt = calloc(1, strlen(fmtp) + 2)) == NULL)
 				err(1, NULL);
-			(void)strcpy(pr->fmt, fmtp);
-			(void)strcat(pr->fmt, cs);
+			strcpy(pr->fmt, fmtp);
+			strcat(pr->fmt, cs);
 			*p2 = savech;
 			pr->cchar = pr->fmt + (p1 - fmtp);
 			fmtp = p2;
@@ -432,10 +432,10 @@
 	}
 #ifdef DEBUG
 	for (fu = fs->nextfu; fu; fu = fu->nextfu) {
-		(void)printf("fmt:");
+		printf("fmt:");
 		for (pr = fu->nextpr; pr; pr = pr->nextpr)
-			(void)printf(" {%s}", pr->fmt);
-		(void)printf("\n");
+			printf(" {%s}", pr->fmt);
+		printf("\n");
 	}
 #endif
 }
Index: id/id.c
===================================================================
RCS file: /cvs/src/usr.bin/id/id.c,v
retrieving revision 1.5
diff -u -u -r1.5 id.c
--- id/id.c	19 Sep 2004 17:25:42 -0000	1.5
+++ id/id.c	7 Nov 2004 20:02:15 -0000
@@ -129,18 +129,18 @@
 	if (gflag) {
 		id = pw ? pw->pw_gid : rflag ? getgid() : getegid();
 		if (nflag && (gr = getgrgid(id)))
-			(void)printf("%s\n", gr->gr_name);
+			printf("%s\n", gr->gr_name);
 		else
-			(void)printf("%u\n", id);
+			printf("%u\n", id);
 		exit(0);
 	}
 
 	if (uflag) {
 		id = pw ? pw->pw_uid : rflag ? getuid() : geteuid();
 		if (nflag && (pw = getpwuid(id)))
-			(void)printf("%s\n", pw->pw_name);
+			printf("%s\n", pw->pw_name);
 		else
-			(void)printf("%u\n", id);
+			printf("%u\n", id);
 		exit(0);
 	}
 
@@ -174,8 +174,8 @@
 	char *login;
 
 	if (pw) {
-		(void)printf("uid\t%s\n", pw->pw_name);
-		(void)printf("groups\t");
+		printf("uid\t%s\n", pw->pw_name);
+		printf("groups\t");
 		group(pw, 1);
 	} else {
 		if ((login = getlogin()) == NULL)
@@ -183,25 +183,25 @@
 
 		pw = getpwuid(rid = getuid());
 		if (pw == NULL || strcmp(login, pw->pw_name))
-			(void)printf("login\t%s\n", login);
+			printf("login\t%s\n", login);
 		if (pw)
-			(void)printf("uid\t%s\n", pw->pw_name);
+			printf("uid\t%s\n", pw->pw_name);
 		else
-			(void)printf("uid\t%u\n", rid);
+			printf("uid\t%u\n", rid);
 
 		if ((eid = geteuid()) != rid) {
 			if ((pw = getpwuid(eid)))
-				(void)printf("euid\t%s\n", pw->pw_name);
+				printf("euid\t%s\n", pw->pw_name);
 			else
-				(void)printf("euid\t%u\n", eid);
+				printf("euid\t%u\n", eid);
 		}
 		if ((rid = getgid()) != (eid = getegid())) {
 			if ((gr = getgrgid(rid)))
-				(void)printf("rgid\t%s\n", gr->gr_name);
+				printf("rgid\t%s\n", gr->gr_name);
 			else
-				(void)printf("rgid\t%u\n", rid);
+				printf("rgid\t%u\n", rid);
 		}
-		(void)printf("groups\t");
+		printf("groups\t");
 		group(NULL, 1);
 	}
 }
@@ -216,22 +216,22 @@
 	const char *fmt;
 
 	id = getuid();
-	(void)printf("uid=%u", id);
+	printf("uid=%u", id);
 	if ((pw = getpwuid(id)))
-		(void)printf("(%s)", pw->pw_name);
+		printf("(%s)", pw->pw_name);
 	if ((eid = geteuid()) != id) {
-		(void)printf(" euid=%u", eid);
+		printf(" euid=%u", eid);
 		if ((pw = getpwuid(eid)))
-			(void)printf("(%s)", pw->pw_name);
+			printf("(%s)", pw->pw_name);
 	}
 	id = getgid();
-	(void)printf(" gid=%u", id);
+	printf(" gid=%u", id);
 	if ((gr = getgrgid(id)))
-		(void)printf("(%s)", gr->gr_name);
+		printf("(%s)", gr->gr_name);
 	if ((eid = getegid()) != id) {
-		(void)printf(" egid=%u", eid);
+		printf(" egid=%u", eid);
 		if ((gr = getgrgid(eid)))
-			(void)printf("(%s)", gr->gr_name);
+			printf("(%s)", gr->gr_name);
 	}
 	if ((ngroups = getgroups(NGROUPS, groups))) {
 		for (fmt = " groups=%u", lastid = -1, cnt = 0; cnt < ngroups;
@@ -239,12 +239,12 @@
 			id = groups[cnt++];
 			if (lastid == id)
 				continue;
-			(void)printf(fmt, id);
+			printf(fmt, id);
 			if ((gr = getgrgid(id)))
-				(void)printf("(%s)", gr->gr_name);
+				printf("(%s)", gr->gr_name);
 		}
 	}
-	(void)printf("\n");
+	printf("\n");
 }
 
 void
@@ -255,24 +255,24 @@
 	int cnt, ngroups;
 	gid_t gid, lastgid, groups[NGROUPS + 1];
 
-	(void)printf("uid=%u(%s)", pw->pw_uid, pw->pw_name);
+	printf("uid=%u(%s)", pw->pw_uid, pw->pw_name);
 	gid = pw->pw_gid;
-	(void)printf(" gid=%u", gid);
+	printf(" gid=%u", gid);
 	if ((gr = getgrgid(gid)))
-		(void)printf("(%s)", gr->gr_name);
+		printf("(%s)", gr->gr_name);
 	ngroups = NGROUPS + 1;
-	(void) getgrouplist(pw->pw_name, gid, groups, &ngroups);
+	getgrouplist(pw->pw_name, gid, groups, &ngroups);
 	fmt = " groups=%u";
 	for (lastgid = -1, cnt = 0; cnt < ngroups; ++cnt) {
 		if (lastgid == (gid = groups[cnt]))
 			continue;
-		(void)printf(fmt, gid);
+		printf(fmt, gid);
 		fmt = ", %u";
 		if ((gr = getgrgid(gid)))
-			(void)printf("(%s)", gr->gr_name);
+			printf("(%s)", gr->gr_name);
 		lastgid = gid;
 	}
-	(void)printf("\n");
+	printf("\n");
 }
 
 void
@@ -285,7 +285,7 @@
 
 	if (pw) {
 		ngroups = NGROUPS + 1;
-		(void) getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
+		getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
 	} else {
 		groups[0] = getgid();
 		ngroups = getgroups(NGROUPS, groups + 1) + 1;
@@ -296,18 +296,18 @@
 			continue;
 		if (nflag) {
 			if ((gr = getgrgid(id)))
-				(void)printf(fmt, gr->gr_name);
+				printf(fmt, gr->gr_name);
 			else
-				(void)printf(*fmt == ' ' ? " %u" : "%u",
+				printf(*fmt == ' ' ? " %u" : "%u",
 				    id);
 			fmt = " %s";
 		} else {
-			(void)printf(fmt, id);
+			printf(fmt, id);
 			fmt = " %u";
 		}
 		lastid = id;
 	}
-	(void)printf("\n");
+	printf("\n");
 }
 
 struct passwd *
@@ -340,7 +340,7 @@
 			err(1, "getpwuid");
 	}
 
-	(void)printf("%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name,
+	printf("%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name,
 			pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class,
 			(long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos,
 			pw->pw_dir, pw->pw_shell);
@@ -352,11 +352,11 @@
 {
 
 	if (isgroups)
-		(void)fprintf(stderr, "usage: groups [user]\n");
+		fprintf(stderr, "usage: groups [user]\n");
 	else if (iswhoami)
-		(void)fprintf(stderr, "usage: whoami\n");
+		fprintf(stderr, "usage: whoami\n");
 	else
-		(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
+		fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
 		    "usage: id [user]",
 		    "       id -G [-n] [user]",
 		    "       id -P [user]",
Index: indent/args.c
===================================================================
RCS file: /cvs/src/usr.bin/indent/args.c,v
retrieving revision 1.2
diff -u -u -r1.2 args.c
--- indent/args.c	17 Jun 2003 04:29:27 -0000	1.2
+++ indent/args.c	7 Nov 2004 20:02:15 -0000
@@ -167,11 +167,11 @@
     sprintf(fname, "%s/%s", getenv("HOME"), prof);
     if ((f = fopen(option_source = fname, "r")) != NULL) {
 	scan_profile(f);
-	(void) fclose(f);
+	fclose(f);
     }
     if ((f = fopen(option_source = prof, "r")) != NULL) {
 	scan_profile(f);
-	(void) fclose(f);
+	fclose(f);
     }
     option_source = "Command line";
 }
Index: join/join.c
===================================================================
RCS file: /cvs/src/usr.bin/join/join.c,v
retrieving revision 1.5
diff -u -u -r1.5 join.c
--- join/join.c	25 Aug 2004 16:07:18 -0000	1.5
+++ join/join.c	7 Nov 2004 20:02:15 -0000
@@ -399,7 +399,7 @@
 	else
 		for (cnt = 0; cnt < lp->fieldcnt; ++cnt)
 			outfield(lp, cnt, 0);
-	(void)printf("\n");
+	printf("\n");
 	if (ferror(stdout))
 		err(1, "stdout");
 	needsep = 0;
@@ -435,7 +435,7 @@
 			if (F2->joinf != cnt)
 				outfield(lp2, cnt, 0);
 	}
-	(void)printf("\n");
+	printf("\n");
 	if (ferror(stdout))
 		err(1, "stdout");
 	needsep = 0;
@@ -445,15 +445,15 @@
 outfield(LINE *lp, u_long fieldno, int out_empty)
 {
 	if (needsep++)
-		(void)printf("%c", *tabchar);
+		printf("%c", *tabchar);
 	if (!ferror(stdout)) {
 		if (lp->fieldcnt <= fieldno || out_empty) {
 			if (empty != NULL)
-				(void)printf("%s", empty);
+				printf("%s", empty);
 		} else {
 			if (*lp->fields[fieldno] == '\0')
 				return;
-			(void)printf("%s", lp->fields[fieldno]);
+			printf("%s", lp->fields[fieldno]);
 		}
 	}
 	if (ferror(stdout))
Index: kdump/kdump.c
===================================================================
RCS file: /cvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.4
diff -u -u -r1.4 kdump.c
--- kdump/kdump.c	4 Oct 2003 20:36:46 -0000	1.4
+++ kdump/kdump.c	7 Nov 2004 20:02:15 -0000
@@ -67,7 +67,7 @@
 	register void *m;
 	int trpoints = ALL_POINTS;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	while ((ch = getopt(argc,argv,"f:dlm:nRTt:")) != -1)
 		switch((char)ch) {
@@ -148,7 +148,7 @@
 			break;
 		}
 		if (tail)
-			(void)fflush(stdout);
+			fflush(stdout);
 	}
 }
 
@@ -157,7 +157,7 @@
 	int i;
 
 	while ((i = fread(buf, size, num, stdin)) == 0 && tail) {
-		(void)sleep(1);
+		sleep(1);
 		clearerr(stdin);
 	}
 	return (i);
@@ -192,21 +192,21 @@
 		type = "USER";
 		break;
 	default:
-		(void)sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type);
+		sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type);
 		type = unknown;
 	}
 
-	(void)printf("%6d %-8.*s ", kth->ktr_pid, MAXCOMLEN, kth->ktr_comm);
+	printf("%6d %-8.*s ", kth->ktr_pid, MAXCOMLEN, kth->ktr_comm);
 	if (timestamp) {
 		if (timestamp == 2) {
 			temp = kth->ktr_time;
 			timevalsub(&kth->ktr_time, &prevtime);
 			prevtime = temp;
 		}
-		(void)printf("%ld.%06ld ",
+		printf("%ld.%06ld ",
 		    kth->ktr_time.tv_sec, kth->ktr_time.tv_usec);
 	}
-	(void)printf("%s  ", type);
+	printf("%s  ", type);
 }
 
 #include <sys/syscall.h>
@@ -228,9 +228,9 @@
 	char *ioctlname();
 
 	if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)
-		(void)printf("[%d]", ktr->ktr_code);
+		printf("[%d]", ktr->ktr_code);
 	else
-		(void)printf("%s", syscallnames[ktr->ktr_code]);
+		printf("%s", syscallnames[ktr->ktr_code]);
 	ip = &ktr->ktr_args[0];
 	if (narg) {
 		char c = '(';
@@ -238,18 +238,18 @@
 			if (ktr->ktr_code == SYS_ioctl) {
 				char *cp;
 				if (decimal)
-					(void)printf("(%ld", (long)*ip);
+					printf("(%ld", (long)*ip);
 				else
-					(void)printf("(%#lx", (long)*ip);
+					printf("(%#lx", (long)*ip);
 				ip++;
 				narg--;
 				if ((cp = ioctlname(*ip)) != NULL)
-					(void)printf(",%s", cp);
+					printf(",%s", cp);
 				else {
 					if (decimal)
-						(void)printf(",%ld", (long)*ip);
+						printf(",%ld", (long)*ip);
 					else
-						(void)printf(",%#lx ", (long)*ip);
+						printf(",%#lx ", (long)*ip);
 				}
 				c = ',';
 				ip++;
@@ -257,33 +257,33 @@
 			} else if (ktr->ktr_code == SYS_ptrace) {
 				if (*ip < sizeof(ptrace_ops) /
 				    sizeof(ptrace_ops[0]) && *ip >= 0)
-					(void)printf("(%s", ptrace_ops[*ip]);
+					printf("(%s", ptrace_ops[*ip]);
 #ifdef PT_GETREGS
 				else if (*ip == PT_GETREGS)
-					(void)printf("(%s", "PT_GETREGS");
+					printf("(%s", "PT_GETREGS");
 #endif
 #ifdef PT_SETREGS
 				else if (*ip == PT_SETREGS)
-					(void)printf("(%s", "PT_SETREGS");
+					printf("(%s", "PT_SETREGS");
 #endif
 #ifdef PT_GETFPREGS
 				else if (*ip == PT_GETFPREGS)
-					(void)printf("(%s", "PT_GETFPREGS");
+					printf("(%s", "PT_GETFPREGS");
 #endif
 #ifdef PT_SETFPREGS
 				else if (*ip == PT_SETFPREGS)
-					(void)printf("(%s", "PT_SETFPREGS");
+					printf("(%s", "PT_SETFPREGS");
 #endif
 #ifdef PT_GETDBREGS
 				else if (*ip == PT_GETDBREGS)
-					(void)printf("(%s", "PT_GETDBREGS");
+					printf("(%s", "PT_GETDBREGS");
 #endif
 #ifdef PT_SETDBREGS
 				else if (*ip == PT_SETDBREGS)
-					(void)printf("(%s", "PT_SETDBREGS");
+					printf("(%s", "PT_SETDBREGS");
 #endif
 				else
-					(void)printf("(%ld", (long)*ip);
+					printf("(%ld", (long)*ip);
 				c = ',';
 				ip++;
 				narg--;
@@ -291,16 +291,16 @@
 		}
 		while (narg) {
 			if (decimal)
-				(void)printf("%c%ld", c, (long)*ip);
+				printf("%c%ld", c, (long)*ip);
 			else
-				(void)printf("%c%#lx", c, (long)*ip);
+				printf("%c%#lx", c, (long)*ip);
 			c = ',';
 			ip++;
 			narg--;
 		}
-		(void)putchar(')');
+		putchar(')');
 	}
-	(void)putchar('\n');
+	putchar('\n');
 }
 
 ktrsysret(struct ktr_sysret *ktr)
@@ -310,36 +310,36 @@
 	register int code = ktr->ktr_code;
 
 	if (code >= nsyscalls || code < 0)
-		(void)printf("[%d] ", code);
+		printf("[%d] ", code);
 	else
-		(void)printf("%s ", syscallnames[code]);
+		printf("%s ", syscallnames[code]);
 
 	if (error == 0) {
 		if (fancy) {
-			(void)printf("%d", ret);
+			printf("%d", ret);
 			if (ret < 0 || ret > 9)
-				(void)printf("/%#lx", (long)ret);
+				printf("/%#lx", (long)ret);
 		} else {
 			if (decimal)
-				(void)printf("%ld", (long)ret);
+				printf("%ld", (long)ret);
 			else
-				(void)printf("%#lx", (long)ret);
+				printf("%#lx", (long)ret);
 		}
 	} else if (error == ERESTART)
-		(void)printf("RESTART");
+		printf("RESTART");
 	else if (error == EJUSTRETURN)
-		(void)printf("JUSTRETURN");
+		printf("JUSTRETURN");
 	else {
-		(void)printf("-1 errno %d", ktr->ktr_error);
+		printf("-1 errno %d", ktr->ktr_error);
 		if (fancy)
-			(void)printf(" %s", strerror(ktr->ktr_error));
+			printf(" %s", strerror(ktr->ktr_error));
 	}
-	(void)putchar('\n');
+	putchar('\n');
 }
 
 ktrnamei(char *cp, int len)
 {
-	(void)printf("\"%.*s\"\n", len, cp);
+	printf("\"%.*s\"\n", len, cp);
 }
 
 ktrgenio(struct ktr_genio *ktr, int len)
@@ -366,23 +366,23 @@
 		datalen == 1 ? "" : "s");
 	if (maxdata && datalen > maxdata)
 		datalen = maxdata;
-	(void)printf("       \"");
+	printf("       \"");
 	col = 8;
 	for (;datalen > 0; datalen--, dp++) {
-		(void) vis(visbuf, *dp, VIS_CSTYLE, *(dp+1));
+		vis(visbuf, *dp, VIS_CSTYLE, *(dp+1));
 		cp = visbuf;
 		/*
 		 * Keep track of printables and
 		 * space chars (like fold(1)).
 		 */
 		if (col == 0) {
-			(void)putchar('\t');
+			putchar('\t');
 			col = 8;
 		}
 		switch(*cp) {
 		case '\n':
 			col = 0;
-			(void)putchar('\n');
+			putchar('\n');
 			continue;
 		case '\t':
 			width = 8 - (col&07);
@@ -391,17 +391,17 @@
 			width = strlen(cp);
 		}
 		if (col + width > (screenwidth-2)) {
-			(void)printf("\\\n\t");
+			printf("\\\n\t");
 			col = 8;
 		}
 		col += width;
 		do {
-			(void)putchar(*cp++);
+			putchar(*cp++);
 		} while (*cp);
 	}
 	if (col == 0)
-		(void)printf("       ");
-	(void)printf("\"\n");
+		printf("       ");
+	printf("\"\n");
 }
 
 char *signames[] = {
@@ -415,32 +415,32 @@
 
 ktrpsig(struct ktr_psig *psig)
 {
-	(void)printf("SIG%s ", signames[psig->signo]);
+	printf("SIG%s ", signames[psig->signo]);
 	if (psig->action == SIG_DFL)
-		(void)printf("SIG_DFL\n");
+		printf("SIG_DFL\n");
 	else
-		(void)printf("caught handler=0x%lx mask=0x%x code=0x%x\n",
+		printf("caught handler=0x%lx mask=0x%x code=0x%x\n",
 		    (u_long)psig->action, psig->mask, psig->code);
 }
 
 ktrcsw(struct ktr_csw *cs)
 {
-	(void)printf("%s %s\n", cs->out ? "stop" : "resume",
+	printf("%s %s\n", cs->out ? "stop" : "resume",
 		cs->user ? "user" : "kernel");
 }
 
 ktruser(int len, unsigned char *p)
 {
-	(void)printf("%d ", len);
+	printf("%d ", len);
 	while (len--)
-		(void)printf(" %02x", *p++);
-	(void)printf("\n");
+		printf(" %02x", *p++);
+	printf("\n");
 		
 }
 
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: kdump [-dnlRT] [-f trfile] [-m maxdata] [-t [cnisuw]]\n");
 	exit(1);
 }
Index: kenv/kenv.c
===================================================================
RCS file: /cvs/src/usr.bin/kenv/kenv.c,v
retrieving revision 1.2
diff -u -u -r1.2 kenv.c
--- kenv/kenv.c	17 Jun 2003 04:29:27 -0000	1.2
+++ kenv/kenv.c	7 Nov 2004 20:02:15 -0000
@@ -39,7 +39,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: kenv [-h] [variable]\n");
+	fprintf(stderr, "usage: kenv [-h] [variable]\n");
 	exit(1);
 }
 
Index: ktrace/ktrace.c
===================================================================
RCS file: /cvs/src/usr.bin/ktrace/ktrace.c,v
retrieving revision 1.3
diff -u -u -r1.3 ktrace.c
--- ktrace/ktrace.c	4 Oct 2003 20:36:46 -0000	1.3
+++ ktrace/ktrace.c	7 Nov 2004 20:02:15 -0000
@@ -113,7 +113,7 @@
 	if (inherit)
 		trpoints |= KTRFAC_INHERIT;
 
-	(void)signal(SIGSYS, no_ktrace);
+	signal(SIGSYS, no_ktrace);
 	if (clear != NOTSET) {
 		if (clear == CLEARALL) {
 			ops = KTROP_CLEAR | KTRFLAG_DESCEND;
@@ -141,8 +141,8 @@
 		    DEFFILEMODE)) < 0)
 			err(1, "%s", tracefile);
 	}
-	(void)umask(omask);
-	(void)close(fd);
+	umask(omask);
+	close(fd);
 
 	if (*argv) { 
 		if (ktrace(tracefile, ops, trpoints, getpid()) < 0)
@@ -173,7 +173,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n",
 "usage: ktrace [-aCcdi] [-f trfile] [-g pgrp | -p pid] [-t cnisuw]",
 "       ktrace [-adi] [-f trfile] [-t cnisuw] command");
 	exit(1);
@@ -182,7 +182,7 @@
 void
 no_ktrace(int sig)
 {
-        (void)fprintf(stderr,
+        fprintf(stderr,
 "error:\tktrace() system call not supported in the running kernel\n\tre-compile kernel with 'options KTRACE'\n");
         exit(1);
 }
Index: last/last.c
===================================================================
RCS file: /cvs/src/usr.bin/last/last.c,v
retrieving revision 1.5
diff -u -u -r1.5 last.c
--- last/last.c	14 Sep 2004 00:13:36 -0000	1.5
+++ last/last.c	7 Nov 2004 20:02:15 -0000
@@ -108,7 +108,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: last [-#] [-y] [-d [[CC]YY][MMDD]hhmm[.SS]] [-f file] [-h host]\n"
 "\t[-t tty] [-s|w] [user ...]\n");
 	exit(1);
@@ -120,7 +120,7 @@
 	int ch;
 	char *p;
 
-	(void) setlocale(LC_TIME, "");
+	setlocale(LC_TIME, "");
 	d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 
 	maxrec = -1;
@@ -206,9 +206,9 @@
 		err(1, "%s", file);
 	bl = (stb.st_size + sizeof(buf) - 1) / sizeof(buf);
 
-	(void)time(&buf[0].ut_time);
-	(void)signal(SIGINT, onintr);
-	(void)signal(SIGQUIT, onintr);
+	time(&buf[0].ut_time);
+	signal(SIGINT, onintr);
+	signal(SIGQUIT, onintr);
 
 	while (--bl >= 0) {
 		if (lseek(wfd, (off_t)(bl * sizeof(buf)), L_SET) == -1 ||
@@ -218,7 +218,7 @@
 			doentry(bp);
 	}
 	tm = localtime(&buf[0].ut_time);
-	(void) strftime(ct, sizeof(ct), "\nwtmp begins %+\n", tm);
+	strftime(ct, sizeof(ct), "\nwtmp begins %+\n", tm);
 	printf("%s", ct);
 }
 
@@ -323,7 +323,7 @@
 	if (maxrec != -1 && !maxrec--)
 		exit(0);
 	tm = localtime(&bp->ut_time);
-	(void) strftime(ct, sizeof(ct), d_first ?
+	strftime(ct, sizeof(ct), d_first ?
 	    (yflag ? "%a %e %b %Y %R" : "%a %e %b %R") :
 	    (yflag ? "%a %b %e %Y %R" : "%a %b %e %R"), tm);
 	printf("%-*.*s %-*.*s %-*.*s %s%c",
@@ -342,7 +342,7 @@
 		printf("- %s", crmsg);
 	} else {
 		tm = localtime(&tt->logout);
-		(void) strftime(ct, sizeof(ct), "%R", tm);
+		strftime(ct, sizeof(ct), "%R", tm);
 		printf("- %s", ct);
 	}
 	delta = tt->logout - bp->ut_time;
@@ -350,7 +350,7 @@
 		printf("  (%8ld)\n", (long)delta);
 	} else {
 		tm = gmtime(&delta);
-		(void) strftime(ct, sizeof(ct), width >= 8 ? "%T" : "%R", tm);
+		strftime(ct, sizeof(ct), width >= 8 ? "%T" : "%R", tm);
 		if (delta < 86400)
 			printf("  (%s)\n", ct);
 		else
@@ -451,10 +451,10 @@
 		if (!(mval = malloc((u_int)8)))
 			err(1, "malloc failure");
 		if (!strcmp(arg, "co"))
-			(void)strcpy(mval, "console");
+			strcpy(mval, "console");
 		else {
-			(void)strcpy(mval, "tty");
-			(void)strcpy(mval + 3, arg);
+			strcpy(mval, "tty");
+			strcpy(mval + 3, arg);
 		}
 		return (mval);
 	}
@@ -547,11 +547,11 @@
 	struct tm *tm;
 
 	tm = localtime(&buf[0].ut_time);
-	(void) strftime(ct, sizeof(ct),
+	strftime(ct, sizeof(ct),
 			d_first ? "%a %e %b %R" : "%a %b %e %R",
 			tm);
 	printf("\ninterrupted %s\n", ct);
 	if (signo == SIGINT)
 		exit(1);
-	(void)fflush(stdout);			/* fix required for rsh */
+	fflush(stdout);			/* fix required for rsh */
 }
Index: lastcomm/lastcomm.c
===================================================================
RCS file: /cvs/src/usr.bin/lastcomm/lastcomm.c,v
retrieving revision 1.3
diff -u -u -r1.3 lastcomm.c
--- lastcomm/lastcomm.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lastcomm/lastcomm.c	7 Nov 2004 20:02:15 -0000
@@ -164,7 +164,7 @@
 		if (*argv && !requested(argv, &ab))
 			continue;
 
-		(void)printf("%-*.*s %-7s %-*s %-*s",
+		printf("%-*.*s %-7s %-*s %-*s",
 			     AC_COMM_LEN, AC_COMM_LEN, ab.ac_comm,
 			     flagbits(ab.ac_flag),
 			     UT_NAMESIZE, user_from_uid(ab.ac_uid, 0),
@@ -173,36 +173,36 @@
 		
 		/* user + system time */
 		if (flags & AC_CTIME) {
-			(void)printf(" %6.2f secs", 
+			printf(" %6.2f secs", 
 				     (expand(ab.ac_utime) + 
 				      expand(ab.ac_stime))/AC_HZ);
 		}
 		
 		/* usr time */
 		if (flags & AC_UTIME) {
-			(void)printf(" %6.2f us", expand(ab.ac_utime)/AC_HZ);
+			printf(" %6.2f us", expand(ab.ac_utime)/AC_HZ);
 		}
 		
 		/* system time */
 		if (flags & AC_STIME) {
-			(void)printf(" %6.2f sy", expand(ab.ac_stime)/AC_HZ);
+			printf(" %6.2f sy", expand(ab.ac_stime)/AC_HZ);
 		}
 		
 		/* elapsed time */
 		if (flags & AC_ETIME) {
-			(void)printf(" %8.2f es", expand(ab.ac_etime)/AC_HZ);
+			printf(" %8.2f es", expand(ab.ac_etime)/AC_HZ);
 		}
 		
 		/* starting time */
 		if (flags & AC_BTIME) {
-			(void)printf(" %.16s", ctime(&ab.ac_btime));
+			printf(" %.16s", ctime(&ab.ac_btime));
 		}
 		
 		/* exit time (starting time + elapsed time )*/
 		if (flags & AC_FTIME) {
 			t = ab.ac_btime;
 			t += (time_t)(expand(ab.ac_etime)/AC_HZ);
-			(void)printf(" %.16s", ctime(&t));
+			printf(" %.16s", ctime(&t));
 		}
 		printf("\n");
  	}
@@ -276,7 +276,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: lastcomm [-EScesu] [ -f file ] [command ...] [user ...] [tty ...]\n");
 	exit(1);
 }
Index: ldd/ldd.c
===================================================================
RCS file: /cvs/src/usr.bin/ldd/ldd.c,v
retrieving revision 1.4
diff -u -u -r1.4 ldd.c
--- ldd/ldd.c	19 Aug 2004 23:41:07 -0000	1.4
+++ ldd/ldd.c	7 Nov 2004 20:02:15 -0000
@@ -123,7 +123,7 @@
 		}
 		if ((n = read(fd, &hdr, sizeof hdr)) == -1) {
 			warn("%s: can't read program header", *argv);
-			(void)close(fd);
+			close(fd);
 			rval |= 1;
 			continue;
 		}
@@ -180,7 +180,7 @@
 			warnx("%s: not a dynamic executable", *argv);
 			file_ok = 0;
 		}
-		(void)close(fd);
+		close(fd);
 		if (!file_ok) {
 			rval |= 1;
 			continue;
Index: leave/leave.c
===================================================================
RCS file: /cvs/src/usr.bin/leave/leave.c,v
retrieving revision 1.3
diff -u -u -r1.3 leave.c
--- leave/leave.c	4 Oct 2003 20:36:47 -0000	1.3
+++ leave/leave.c	7 Nov 2004 20:02:15 -0000
@@ -70,7 +70,7 @@
 
 	if (argc < 2) {
 #define	MSG1	"When do you have to leave? "
-		(void)write(1, MSG1, sizeof(MSG1) - 1);
+		write(1, MSG1, sizeof(MSG1) - 1);
 		cp = fgets(buf, sizeof(buf), stdin);
 		if (cp == NULL || *cp == '\n')
 			exit(0);
@@ -98,7 +98,7 @@
 	if (plusnow)
 		secs = hours * 60 * 60 + minutes * 60;
 	else {
-		(void)time(&now);
+		time(&now);
 		t = localtime(&now);
 
 		if (hours > 23)
@@ -136,7 +136,7 @@
 	int pid;
 
 	if ((pid = fork())) {
-		(void)time(&daytime);
+		time(&daytime);
 		daytime += secs;
 		strftime(tb, sizeof(tb), "%+", localtime(&daytime));
 		printf("Alarm set for %s. (pid %d)\n", tb, pid);
@@ -175,7 +175,7 @@
 	}
 
 #define	MSG5	"\07\07That was the last time I'll tell you.  Bye.\n"
-	(void)write(1, MSG5, sizeof(MSG5) - 1);
+	write(1, MSG5, sizeof(MSG5) - 1);
 	exit(0);
 }
 
Index: lex/gen.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/gen.c,v
retrieving revision 1.3
diff -u -u -r1.3 gen.c
--- lex/gen.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/gen.c	7 Nov 2004 20:02:15 -0000
@@ -603,11 +603,11 @@
 	if ( worry_about_NULs && ! nultrans )
 		{
 		if ( useecs )
-			(void) sprintf( char_map,
+			sprintf( char_map,
 				"(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : %d)",
 					NUL_ec );
 		else
-			(void) sprintf( char_map,
+			sprintf( char_map,
 				"(*yy_cp ? YY_SC_TO_UI(*yy_cp) : %d)", NUL_ec );
 		}
 
@@ -710,7 +710,7 @@
 		{
 		char NUL_ec_str[20];
 
-		(void) sprintf( NUL_ec_str, "%d", NUL_ec );
+		sprintf( NUL_ec_str, "%d", NUL_ec );
 		gen_next_compressed_state( NUL_ec_str );
 
 		do_indent();
@@ -1619,5 +1619,5 @@
 	line_directive_out( stdout, 1 );
 
 	if ( sectnum == 3 )
-		(void) flexscan(); /* copy remainder of input to output */
+		flexscan(); /* copy remainder of input to output */
 	}
Index: lex/initscan.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/initscan.c,v
retrieving revision 1.3
diff -u -u -r1.3 initscan.c
--- lex/initscan.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/initscan.c	7 Nov 2004 20:02:15 -0000
@@ -3533,7 +3533,7 @@
 char msg[];
 #endif
 	{
-	(void) fprintf( stderr, "%s\n", msg );
+	fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 	}
 
Index: lex/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- lex/misc.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/misc.c	7 Nov 2004 20:02:15 -0000
@@ -334,7 +334,7 @@
 	{
 	unsigned int result;
 
-	(void) sscanf( (char *) str, "%x", &result );
+	sscanf( (char *) str, "%x", &result );
 
 	return result;
 	}
@@ -345,7 +345,7 @@
 void lerrif(const char *msg, int arg)
 	{
 	char errmsg[MAXLINE];
-	(void) sprintf( errmsg, msg, arg );
+	sprintf( errmsg, msg, arg );
 	flexerror( errmsg );
 	}
 
@@ -356,7 +356,7 @@
 	{
 	char errmsg[MAXLINE];
 
-	(void) sprintf( errmsg, msg, arg );
+	sprintf( errmsg, msg, arg );
 	flexerror( errmsg );
 	}
 
@@ -494,7 +494,7 @@
 	{
 	int val = 0;
 
-	(void) sscanf( array, "%d", &val );
+	sscanf( array, "%d", &val );
 
 	return val;
 	}
@@ -585,7 +585,7 @@
 	{
 	unsigned int result;
 
-	(void) sscanf( (char *) str, "%o", &result );
+	sscanf( (char *) str, "%o", &result );
 	return result;
 	}
 
@@ -691,7 +691,7 @@
 #endif
 
 			default:
-				(void) sprintf( rform, "\\%.3o",
+				sprintf( rform, "\\%.3o",
 						(unsigned int) c );
 				return rform;
 			}
Index: lex/nfa.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/nfa.c,v
retrieving revision 1.3
diff -u -u -r1.3 nfa.c
--- lex/nfa.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/nfa.c	7 Nov 2004 20:02:15 -0000
@@ -59,7 +59,7 @@
 		{
 		int astate = mkstate( SYM_EPSILON );
 		accptnum[astate] = accepting_number;
-		(void) link_machines( mach, astate );
+		link_machines( mach, astate );
 		}
 	}
 
Index: lex/sym.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/sym.c,v
retrieving revision 1.3
diff -u -u -r1.3 sym.c
--- lex/sym.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/sym.c	7 Nov 2004 20:02:15 -0000
@@ -103,7 +103,7 @@
 	 */
 	Char *copy_unsigned_string();
 
-	(void) addsym( (char *) copy_unsigned_string( ccltxt ),
+	addsym( (char *) copy_unsigned_string( ccltxt ),
 			(char *) 0, cclnum,
 			ccltab, CCL_HASH_SIZE );
 	}
Index: lex/yylex.c
===================================================================
RCS file: /cvs/src/usr.bin/lex/yylex.c,v
retrieving revision 1.3
diff -u -u -r1.3 yylex.c
--- lex/yylex.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lex/yylex.c	7 Nov 2004 20:02:15 -0000
@@ -93,11 +93,11 @@
 			case '*':
 			case '+':
 			case ',':
-				(void) putc( toktype, stderr );
+				putc( toktype, stderr );
 				break;
 
 			case '\n':
-				(void) putc( '\n', stderr );
+				putc( '\n', stderr );
 
 				if ( sectnum == 2 )
 				beglin = 1;
@@ -162,7 +162,7 @@
 								"\\%.3o",
 							(unsigned int) yylval );
 						else
-							(void) putc( yylval,
+							putc( yylval,
 								stderr );
 					break;
 					}
Index: limits/limits.c
===================================================================
RCS file: /cvs/src/usr.bin/limits/limits.c,v
retrieving revision 1.3
diff -u -u -r1.3 limits.c
--- limits/limits.c	22 Apr 2004 17:08:07 -0000	1.3
+++ limits/limits.c	7 Nov 2004 20:02:15 -0000
@@ -434,7 +434,7 @@
 
 	/* set leading environment variables, like eval(1) */
 	while (*argv && (p = strchr(*argv, '=')))
-	    (void)setenv(*argv++, ++p, 1);
+	    setenv(*argv++, ++p, 1);
 
 	/* Set limits */
 	for (rcswhich = 0; rcswhich < RLIM_NLIMITS; rcswhich++) {
@@ -502,7 +502,7 @@
 static void
 usage(void)
 {
-    (void)fprintf(stderr,
+    fprintf(stderr,
 "usage: limits [-C class|-U user] [-eaSHBE] [-bcdflmnstuvk [val]] [[name=val ...] cmd]\n");
     exit(EXIT_FAILURE);
 }
Index: lock/lock.c
===================================================================
RCS file: /cvs/src/usr.bin/lock/lock.c,v
retrieving revision 1.3
diff -u -u -r1.3 lock.c
--- lock/lock.c	4 Oct 2003 20:36:47 -0000	1.3
+++ lock/lock.c	7 Nov 2004 20:02:15 -0000
@@ -136,25 +136,25 @@
 	ap = asctime(timp);
 	tzn = timp->tm_zone;
 
-	(void)signal(SIGINT, quit);
-	(void)signal(SIGQUIT, quit);
+	signal(SIGINT, quit);
+	signal(SIGQUIT, quit);
 	ntty = tty; ntty.sg_flags &= ~ECHO;
-	(void)ioctl(0, TIOCSETP, &ntty);
+	ioctl(0, TIOCSETP, &ntty);
 
 	if (!mypw) {
 		/* get key and check again */
-		(void)printf("Key: ");
+		printf("Key: ");
 		if (!fgets(s, sizeof(s), stdin) || *s == '\n')
 			quit(0);
-		(void)printf("\nAgain: ");
+		printf("\nAgain: ");
 		/*
 		 * Don't need EOF test here, if we get EOF, then s1 != s
 		 * and the right things will happen.
 		 */
-		(void)fgets(s1, sizeof(s1), stdin);
-		(void)putchar('\n');
+		fgets(s1, sizeof(s1), stdin);
+		putchar('\n');
 		if (strcmp(s1, s)) {
-			(void)printf("\07lock: passwords didn't match.\n");
+			printf("\07lock: passwords didn't match.\n");
 			ioctl(0, TIOCSETP, &tty);
 			exit(1);
 		}
@@ -163,10 +163,10 @@
 	}
 
 	/* set signal handlers */
-	(void)signal(SIGINT, hi);
-	(void)signal(SIGQUIT, hi);
-	(void)signal(SIGTSTP, hi);
-	(void)signal(SIGALRM, bye);
+	signal(SIGINT, hi);
+	signal(SIGQUIT, hi);
+	signal(SIGTSTP, hi);
+	signal(SIGALRM, bye);
 
 	ntimer.it_interval = zerotime;
 	ntimer.it_value = timeout;
@@ -180,27 +180,27 @@
 		 * "Key:" prompt.
 		 */
 		if (ioctl(0, VT_LOCKSWITCH, &vtylock) == -1) {
-			(void)ioctl(0, TIOCSETP, &tty);
+			ioctl(0, TIOCSETP, &tty);
 			err(1, "locking vty");
 		}
 		vtyunlock = 0x2;
 	}
 
 	/* header info */
-	(void)printf("lock: %s on %s.", ttynam, hostname);
+	printf("lock: %s on %s.", ttynam, hostname);
 	if (no_timeout)
-		(void)printf(" no timeout.");
+		printf(" no timeout.");
 	else
-		(void)printf(" timeout in %d minute%s.", sectimeout,
+		printf(" timeout in %d minute%s.", sectimeout,
 		    sectimeout != 1 ? "s" : "");
 	if (vtylock)
-		(void)printf(" vty locked.");
-	(void)printf("\ntime now is %.20s%s%s", ap, tzn, ap + 19);
+		printf(" vty locked.");
+	printf("\ntime now is %.20s%s%s", ap, tzn, ap + 19);
 
 	failures = 0;
 
 	for (;;) {
-		(void)printf("Key: ");
+		printf("Key: ");
 		if (!fgets(s, sizeof(s), stdin)) {
 			clearerr(stdin);
 			hi(0);
@@ -213,7 +213,7 @@
 		}
 		else if (!strcmp(s, s1))
 			break;
-		(void)printf("\07\n");
+		printf("\07\n");
 	    	failures++;
 		if (getuid() == 0)
 	    	    syslog(LOG_NOTICE, "%d ROOT UNLOCK FAILURE%s (%s on %s)",
@@ -233,7 +233,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: lock [-npv] [-t timeout]\n");
+	fprintf(stderr, "usage: lock [-npv] [-t timeout]\n");
 	exit(1);
 }
 
@@ -243,11 +243,11 @@
 	struct timeval timval;
 
 	if (!gettimeofday(&timval, (struct timezone *)NULL)) {
-		(void)printf("lock: type in the unlock key. ");
+		printf("lock: type in the unlock key. ");
 		if (no_timeout) {
-			(void)putchar('\n');
+			putchar('\n');
 		} else {
-			(void)printf("timeout in %ld:%ld minutes\n",
+			printf("timeout in %ld:%ld minutes\n",
 			    (nexttime - timval.tv_sec) / 60,
 			    (nexttime - timval.tv_sec) % 60);
 		}
@@ -257,10 +257,10 @@
 void
 quit(int signo __unused)
 {
-	(void)putchar('\n');
-	(void)ioctl(0, TIOCSETP, &tty);
+	putchar('\n');
+	ioctl(0, TIOCSETP, &tty);
 	if (vtyunlock)
-		(void)ioctl(0, VT_LOCKSWITCH, &vtyunlock);
+		ioctl(0, VT_LOCKSWITCH, &vtyunlock);
 	exit(0);
 }
 
@@ -268,10 +268,10 @@
 bye(int signo __unused)
 {
 	if (!no_timeout) {
-		(void)ioctl(0, TIOCSETP, &tty);
+		ioctl(0, TIOCSETP, &tty);
 		if (vtyunlock)
-			(void)ioctl(0, VT_LOCKSWITCH, &vtyunlock);
-		(void)printf("lock: timeout\n");
+			ioctl(0, VT_LOCKSWITCH, &vtyunlock);
+		printf("lock: timeout\n");
 		exit(1);
 	}
 }
Index: logger/logger.c
===================================================================
RCS file: /cvs/src/usr.bin/logger/logger.c,v
retrieving revision 1.3
diff -u -u -r1.3 logger.c
--- logger/logger.c	4 Oct 2003 20:36:48 -0000	1.3
+++ logger/logger.c	7 Nov 2004 20:02:15 -0000
@@ -127,7 +127,7 @@
 
 	/* setup for logging */
 	openlog(tag ? tag : getlogin(), logflags, 0);
-	(void) fclose(stdout);
+	fclose(stdout);
 
 	/* log input line if appropriate */
 	if (argc > 0) {
@@ -266,7 +266,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: %s\n",
+	fprintf(stderr, "usage: %s\n",
 	    "logger [-46Ais] [-f file] [-h host] [-p pri] [-t tag] [message ...]"
 	    );
 	exit(1);
Index: login/login.c
===================================================================
RCS file: /cvs/src/usr.bin/login/login.c,v
retrieving revision 1.4
diff -u -u -r1.4 login.c
--- login/login.c	3 Nov 2003 19:31:30 -0000	1.4
+++ login/login.c	7 Nov 2004 20:02:15 -0000
@@ -166,19 +166,19 @@
 	int e;
 #endif /* USE_PAM */
 
-	(void)signal(SIGQUIT, SIG_IGN);
-	(void)signal(SIGINT, SIG_IGN);
-	(void)signal(SIGHUP, SIG_IGN);
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
+	signal(SIGHUP, SIG_IGN);
 	if (setjmp(timeout_buf)) {
 		if (failures)
 			badlogin(tbuf);
-		(void)fprintf(stderr, "Login timed out after %d seconds\n",
+		fprintf(stderr, "Login timed out after %d seconds\n",
 		    timeout);
 		exit(0);
 	}
-	(void)signal(SIGALRM, timedout);
-	(void)alarm(timeout);
-	(void)setpriority(PRIO_PROCESS, 0, 0);
+	signal(SIGALRM, timedout);
+	alarm(timeout);
+	setpriority(PRIO_PROCESS, 0, 0);
 
 	openlog("login", LOG_ODELAY, LOG_AUTH);
 
@@ -262,11 +262,11 @@
 	setproctitle("-%s", getprogname());
 
 	for (cnt = getdtablesize(); cnt > 2; cnt--)
-		(void)close(cnt);
+		close(cnt);
 
 	ttyn = ttyname(STDIN_FILENO);
 	if (ttyn == NULL || *ttyn == '\0') {
-		(void)snprintf(tname, sizeof(tname), "%s??", _PATH_TTY);
+		snprintf(tname, sizeof(tname), "%s??", _PATH_TTY);
 		ttyn = tname;
 	}
 	if ((tty = strrchr(ttyn, '/')) != NULL)
@@ -309,7 +309,7 @@
 			if (failures > (pwd ? 0 : 1))
 				badlogin(tbuf);
 		}
-		(void)strlcpy(tbuf, username, sizeof(tbuf));
+		strlcpy(tbuf, username, sizeof(tbuf));
 
 		pwd = getpwnam(username);
 
@@ -338,7 +338,7 @@
 
 		fflag = 0;
 
-		(void)setpriority(PRIO_PROCESS, 0, -4);
+		setpriority(PRIO_PROCESS, 0, -4);
 
 #ifdef USE_PAM
 		/*
@@ -350,7 +350,7 @@
 #endif /* USE_PAM */
 			rval = auth_traditional();
 
-		(void)setpriority(PRIO_PROCESS, 0, 0);
+		setpriority(PRIO_PROCESS, 0, 0);
 
 #ifdef USE_PAM
 		/*
@@ -374,7 +374,7 @@
 				break;
 		}
 
-		(void)printf("Login incorrect\n");
+		printf("Login incorrect\n");
 		failures++;
 
 		/*
@@ -391,8 +391,8 @@
 	}
 
 	/* committed to login -- turn off timeout */
-	(void)alarm((u_int)0);
-	(void)signal(SIGHUP, SIG_DFL);
+	alarm((u_int)0);
+	signal(SIGHUP, SIG_DFL);
 
 	endpwent();
 
@@ -407,8 +407,8 @@
 
 	quietlog = login_getcapbool(lc, "hushlogin", 0);
 	/* Switching needed for NFS with root access disabled */
-	(void)setegid(pwd->pw_gid);
-	(void)seteuid(rootlogin ? 0 : pwd->pw_uid);
+	setegid(pwd->pw_gid);
+	seteuid(rootlogin ? 0 : pwd->pw_uid);
 	if (!*pwd->pw_dir || chdir(pwd->pw_dir) < 0) {
 		if (login_getcapbool(lc, "requirehome", 0))
 			refused("Home directory not available", "HOMEDIR", 1);
@@ -418,13 +418,13 @@
 			printf("No home directory.\nLogging in with home = \"/\".\n");
 		pwd->pw_dir = "/";
 	}
-	(void)seteuid(euid);
-	(void)setegid(egid);
+	seteuid(euid);
+	setegid(egid);
 	if (!quietlog)
 		quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0;
 
 	if (pwd->pw_change || pwd->pw_expire)
-		(void)gettimeofday(&tp, (struct timezone *)NULL);
+		gettimeofday(&tp, (struct timezone *)NULL);
 
 #define	DEFAULT_WARN  (2L * 7L * 86400L)  /* Two weeks */
 
@@ -436,7 +436,7 @@
 			refused("Sorry -- your account has expired", "EXPIRED",
 			    1);
 		} else if (pwd->pw_expire - tp.tv_sec < warntime && !quietlog)
-			(void)printf("Warning: your account expires on %s",
+			printf("Warning: your account expires on %s",
 			    ctime(&pwd->pw_expire));
 	}
 
@@ -446,12 +446,12 @@
 	changepass = 0;
 	if (pwd->pw_change) {
 		if (tp.tv_sec >= pwd->pw_change) {
-			(void)printf("Sorry -- your password has expired.\n");
+			printf("Sorry -- your password has expired.\n");
 			changepass = 1;
 			syslog(LOG_INFO, "%s Password expired - forcing change",
 			    pwd->pw_name);
 		} else if (pwd->pw_change - tp.tv_sec < warntime && !quietlog)
-			(void)printf("Warning: your password expires on %s",
+			printf("Warning: your password expires on %s",
 			    ctime(&pwd->pw_change));
 	}
 
@@ -505,11 +505,11 @@
 
 	/* Nothing else left to fail -- really log in. */
 	memset((void *)&utmp, 0, sizeof(utmp));
-	(void)time(&utmp.ut_time);
-	(void)strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
+	time(&utmp.ut_time);
+	strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
 	if (hostname)
-		(void)strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
-	(void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line));
+		strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
+	strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line));
 	login(&utmp);
 
 	dolastlog(quietlog);
@@ -655,16 +655,16 @@
 		exit(1);
 	}
 
-	(void)setenv("SHELL", pwd->pw_shell, 1);
-	(void)setenv("HOME", pwd->pw_dir, 1);
+	setenv("SHELL", pwd->pw_shell, 1);
+	setenv("HOME", pwd->pw_dir, 1);
 	if (term != NULL && *term != '\0')
-		(void)setenv("TERM", term, 1);		/* Preset overrides */
+		setenv("TERM", term, 1);		/* Preset overrides */
 	else {
-		(void)setenv("TERM", stypeof(tty), 0);	/* Fallback doesn't */
+		setenv("TERM", stypeof(tty), 0);	/* Fallback doesn't */
 	}
-	(void)setenv("LOGNAME", username, 1);
-	(void)setenv("USER", username, 1);
-	(void)setenv("PATH", rootlogin ? _PATH_STDPATH : _PATH_DEFPATH, 0);
+	setenv("LOGNAME", username, 1);
+	setenv("USER", username, 1);
+	setenv("PATH", rootlogin ? _PATH_STDPATH : _PATH_DEFPATH, 0);
 
 	if (!quietlog) {
 		char	*cw;
@@ -673,12 +673,12 @@
 		if (cw != NULL && access(cw, F_OK) == 0)
 			motd(cw);
 		else
-		    (void)printf("%s\n\t%s %s\n",
+		    printf("%s\n\t%s %s\n",
 	"Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994",
 	"The Regents of the University of California. ",
 	"All rights reserved.");
 
-		(void)printf("\n");
+		printf("\n");
 
 		cw = login_getcapstr(lc, "welcome", NULL, NULL);
 		if (cw == NULL || access(cw, F_OK) != 0)
@@ -692,16 +692,16 @@
 			snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_MAILDIR,
 			    pwd->pw_name);
 		if (stat(tbuf, &st) == 0 && st.st_size != 0)
-			(void)printf("You have %smail.\n",
+			printf("You have %smail.\n",
 			    (st.st_mtime > st.st_atime) ? "new " : "");
 	}
 
 	login_close(lc);
 
-	(void)signal(SIGALRM, SIG_DFL);
-	(void)signal(SIGQUIT, SIG_DFL);
-	(void)signal(SIGINT, SIG_DFL);
-	(void)signal(SIGTSTP, SIG_IGN);
+	signal(SIGALRM, SIG_DFL);
+	signal(SIGQUIT, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
+	signal(SIGTSTP, SIG_IGN);
 
 	if (changepass) {
 		if (system(_PATH_CHPASS) != 0)
@@ -855,7 +855,7 @@
 
 	for (pp = environ_pam; *pp != NULL; pp++) {
 		if (ok_to_export(*pp))
-			(void) putenv(*pp);
+			putenv(*pp);
 		free(*pp);
 	}
 	return PAM_SUCCESS;
@@ -895,7 +895,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: login [-fp] [-h hostname] [username]\n");
+	fprintf(stderr, "usage: login [-fp] [-h hostname] [username]\n");
 	exit(1);
 }
 
@@ -913,7 +913,7 @@
 	static char nbuf[NBUFSIZ];
 
 	for (;;) {
-		(void)printf("%s", prompt);
+		printf("%s", prompt);
 		for (p = nbuf; (ch = getchar()) != '\n'; ) {
 			if (ch == EOF) {
 				badlogin(username);
@@ -924,7 +924,7 @@
 		}
 		if (p > nbuf) {
 			if (nbuf[0] == '-')
-				(void)fprintf(stderr,
+				fprintf(stderr,
 				    "login names may not start with '-'.\n");
 			else {
 				*p = '\0';
@@ -963,9 +963,9 @@
 	motdinterrupt = 0;
 	oldint = signal(SIGINT, sigint);
 	while ((nchars = read(fd, tbuf, sizeof(tbuf))) > 0 && !motdinterrupt)
-		(void)write(fileno(stdout), tbuf, nchars);
-	(void)signal(SIGINT, oldint);
-	(void)close(fd);
+		write(fileno(stdout), tbuf, nchars);
+	signal(SIGINT, oldint);
+	close(fd);
 }
 
 /* ARGSUSED */
@@ -984,30 +984,30 @@
 	int fd;
 
 	if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
-		(void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
+		lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
 		if (!quiet) {
 			if (read(fd, (char *)&ll, sizeof(ll)) == sizeof(ll) &&
 			    ll.ll_time != 0) {
-				(void)printf("Last login: %.*s ",
+				printf("Last login: %.*s ",
 				    24-5, (char *)ctime(&ll.ll_time));
 				if (*ll.ll_host != '\0')
-					(void)printf("from %.*s\n",
+					printf("from %.*s\n",
 					    (int)sizeof(ll.ll_host),
 					    ll.ll_host);
 				else
-					(void)printf("on %.*s\n",
+					printf("on %.*s\n",
 					    (int)sizeof(ll.ll_line),
 					    ll.ll_line);
 			}
-			(void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
+			lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
 		}
 		memset((void *)&ll, 0, sizeof(ll));
-		(void)time(&ll.ll_time);
-		(void)strncpy(ll.ll_line, tty, sizeof(ll.ll_line));
+		time(&ll.ll_time);
+		strncpy(ll.ll_line, tty, sizeof(ll.ll_line));
 		if (hostname)
-			(void)strncpy(ll.ll_host, hostname, sizeof(ll.ll_host));
-		(void)write(fd, (char *)&ll, sizeof(ll));
-		(void)close(fd);
+			strncpy(ll.ll_host, hostname, sizeof(ll.ll_host));
+		write(fd, (char *)&ll, sizeof(ll));
+		close(fd);
 	} else {
 		syslog(LOG_ERR, "cannot open %s: %m", _PATH_LASTLOG);
 	}
@@ -1071,6 +1071,6 @@
 sleepexit(int eval)
 {
 
-	(void)sleep(5);
+	sleep(5);
 	exit(eval);
 }
Index: login/login_access.c
===================================================================
RCS file: /cvs/src/usr.bin/login/login_access.c,v
retrieving revision 1.3
diff -u -u -r1.3 login_access.c
--- login/login_access.c	19 Jun 2004 17:28:28 -0000	1.3
+++ login/login_access.c	7 Nov 2004 20:02:15 -0000
@@ -94,7 +94,7 @@
 	    match = (list_match(froms, from, from_match)
 		     && list_match(users, user, user_match));
 	}
-	(void) fclose(fp);
+	fclose(fp);
     } else if (errno != ENOENT) {
 	syslog(LOG_ERR, "cannot open %s: %m", _PATH_LOGACCESS);
     }
Index: logname/logname.c
===================================================================
RCS file: /cvs/src/usr.bin/logname/logname.c,v
retrieving revision 1.4
diff -u -u -r1.4 logname.c
--- logname/logname.c	29 Oct 2004 13:52:53 -0000	1.4
+++ logname/logname.c	7 Nov 2004 20:02:15 -0000
@@ -65,13 +65,13 @@
 
 	if ((p = getlogin()) == NULL)
 		err(1, NULL);
-	(void)printf("%s\n", p);
+	printf("%s\n", p);
 	exit(0);
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: logname\n");
+	fprintf(stderr, "usage: logname\n");
 	exit(1);
 }
Index: look/look.c
===================================================================
RCS file: /cvs/src/usr.bin/look/look.c,v
retrieving revision 1.3
diff -u -u -r1.3 look.c
--- look/look.c	4 Oct 2003 20:36:48 -0000	1.3
+++ look/look.c	7 Nov 2004 20:02:15 -0000
@@ -96,7 +96,7 @@
 	int ch, fd, termchar, match;
 	unsigned char *back, *file, *front, *string, *p;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	file = _PATH_WORDS;
 	termchar = '\0';
@@ -321,6 +321,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: look [-df] [-t char] string [file ...]\n");
+	fprintf(stderr, "usage: look [-df] [-t char] string [file ...]\n");
 	exit(2);
 }
Index: m4/eval.c
===================================================================
RCS file: /cvs/src/usr.bin/m4/eval.c,v
retrieving revision 1.2
diff -u -u -r1.2 eval.c
--- m4/eval.c	17 Jun 2003 04:29:28 -0000	1.2
+++ m4/eval.c	7 Nov 2004 20:02:15 -0000
@@ -259,7 +259,7 @@
 
 	case SINCTYPE:
 		if (argc > 2)
-			(void) doincl(argv[2]);
+			doincl(argv[2]);
 		break;
 #ifdef EXTENDED
 	case PASTTYPE:
@@ -271,7 +271,7 @@
 
 	case SPASTYPE:
 		if (argc > 2)
-			(void) dopaste(argv[2]);
+			dopaste(argv[2]);
 		break;
 #endif
 	case CHNQTYPE:
@@ -757,7 +757,7 @@
 		fprintf(active, "#line 1 \"%s\"\n", pfile);
 		while ((c = getc(pf)) != EOF)
 			putc(c, active);
-		(void) fclose(pf);
+		fclose(pf);
 		emitline();
 		return (1);
 	} else
Index: m4/gnum4.c
===================================================================
RCS file: /cvs/src/usr.bin/m4/gnum4.c,v
retrieving revision 1.2
diff -u -u -r1.2 gnum4.c
--- m4/gnum4.c	17 Jun 2003 04:29:28 -0000	1.2
+++ m4/gnum4.c	7 Nov 2004 20:02:15 -0000
@@ -496,15 +496,15 @@
 		err(1, "bad fork");
 		/* NOTREACHED */
 	case 0:
-		(void) close(p[0]);
-		(void) dup2(p[1], 1);
-		(void) close(p[1]);
+		close(p[0]);
+		dup2(p[1], 1);
+		close(p[1]);
 		execl(_PATH_BSHELL, "sh", "-c", cmd, NULL);
 		exit(1);
 	default:
 		/* Read result in two stages, since m4's buffer is
 		 * pushback-only. */
-		(void) close(p[1]);
+		close(p[1]);
 		do {
 			char result[BUFSIZE];
 			cc = read(p[0], result, sizeof result);
@@ -512,7 +512,7 @@
 				addchars(result, cc);
 		} while (cc > 0 || (cc == -1 && errno == EINTR));
 
-		(void) close(p[0]);
+		close(p[0]);
 		while ((pid = wait(&status)) != cpid && pid >= 0)
 			continue;
 		pbstr(getstring());
Index: m4/main.c
===================================================================
RCS file: /cvs/src/usr.bin/m4/main.c,v
retrieving revision 1.2
diff -u -u -r1.2 main.c
--- m4/main.c	17 Jun 2003 04:29:28 -0000	1.2
+++ m4/main.c	7 Nov 2004 20:02:15 -0000
@@ -271,7 +271,7 @@
 			getdiv(n);
 					/* remove bitbucket if used  */
 	if (outfile[0] != NULL) {
-		(void) fclose(outfile[0]);
+		fclose(outfile[0]);
 	}
 
 	exit(rval);
Index: m4/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/m4/misc.c,v
retrieving revision 1.2
diff -u -u -r1.2 misc.c
--- m4/misc.c	17 Jun 2003 04:29:28 -0000	1.2
+++ m4/misc.c	7 Nov 2004 20:02:15 -0000
@@ -222,7 +222,7 @@
 	rewind(outfile[n]);
 	while ((c = getc(outfile[n])) != EOF)
 		putc(c, active);
-	(void) fclose(outfile[n]);
+	fclose(outfile[n]);
 	outfile[n] = NULL;
 }
 
@@ -244,7 +244,7 @@
 
 	for (n = 0; n < maxout; n++)
 		if (outfile[n] != NULL) {
-			(void) fclose(outfile[n]);
+			fclose(outfile[n]);
 		}
 }
 
Index: mail/popen.c
===================================================================
RCS file: /cvs/src/usr.bin/mail/popen.c,v
retrieving revision 1.4
diff -u -u -r1.4 popen.c
--- mail/popen.c	8 Sep 2004 03:01:11 -0000	1.4
+++ mail/popen.c	7 Nov 2004 20:02:15 -0000
@@ -152,9 +152,9 @@
 
 	while (fp_head != NULL)
 		if (fp_head->pipe)
-			(void)Pclose(fp_head->fp);
+			Pclose(fp_head->fp);
 		else
-			(void)Fclose(fp_head->fp);
+			Fclose(fp_head->fp);
 }
 
 void
@@ -179,7 +179,7 @@
 	for (pp = &fp_head; (p = *pp) != NULL; pp = &p->link)
 		if (p->fp == fp) {
 			*pp = p->link;
-			(void)free(p);
+			free(p);
 			return;
 		}
 	errx(1, "Invalid file pointer");
@@ -260,9 +260,9 @@
 		dup2(outfd, 1);
 	for (i = 1; i < NSIG; i++)
 		if (nset != NULL && sigismember(nset, i))
-			(void)signal(i, SIG_IGN);
+			signal(i, SIG_IGN);
 	if (nset == NULL || !sigismember(nset, SIGINT))
-		(void)signal(SIGINT, SIG_DFL);
+		signal(SIGINT, SIG_DFL);
 	sigemptyset(&eset);
 	sigprocmask(SIG_SETMASK, &eset, NULL);
 }
@@ -342,7 +342,7 @@
 	sigprocmask(SIG_BLOCK, &nset, &oset);	
 
 	while (!cp->done)
-		(void)sigsuspend(&oset);
+		sigsuspend(&oset);
 	wait_status = cp->status;
 	delchild(cp);
 	sigprocmask(SIG_SETMASK, &oset, NULL);
Index: make/arch.c
===================================================================
RCS file: /cvs/src/usr.bin/make/arch.c,v
retrieving revision 1.4
diff -u -u -r1.4 arch.c
--- make/arch.c	3 Nov 2003 19:31:30 -0000	1.4
+++ make/arch.c	7 Nov 2004 20:02:15 -0000
@@ -321,7 +321,7 @@
 		    return(FAILURE);
 		} else {
 		    gn->type |= OP_ARCHV;
-		    (void)Lst_AtEnd(nodeLst, (ClientData)gn);
+		    Lst_AtEnd(nodeLst, (ClientData)gn);
 		}
 	    } else if (Arch_ParseArchive(&sacrifice, nodeLst, ctxt)!=SUCCESS) {
 		/*
@@ -364,7 +364,7 @@
 		     * end of the provided list.
 		     */
 		    gn->type |= OP_ARCHV;
-		    (void) Lst_AtEnd (nodeLst, (ClientData)gn);
+		    Lst_AtEnd (nodeLst, (ClientData)gn);
 		}
 	    }
 	    Lst_Destroy(members, NOFREE);
@@ -386,7 +386,7 @@
 		 * provided list.
 		 */
 		gn->type |= OP_ARCHV;
-		(void) Lst_AtEnd (nodeLst, (ClientData)gn);
+		Lst_AtEnd (nodeLst, (ClientData)gn);
 	    }
 	}
 	if (doSubst) {
@@ -572,7 +572,7 @@
 	    arh.ar_size[sizeof(arh.ar_size)-1] = '\0';
 	    size = (int) strtol(arh.ar_size, NULL, 10);
 
-	    (void) strncpy (memName, arh.ar_name, sizeof(arh.ar_name));
+	    strncpy (memName, arh.ar_name, sizeof(arh.ar_name));
 	    for (cp = &memName[AR_MAX_NAME_LEN]; *cp == ' '; cp--) {
 		continue;
 	    }
@@ -633,7 +633,7 @@
 
     fclose (arch);
 
-    (void) Lst_AtEnd (archives, (ClientData) ar);
+    Lst_AtEnd (archives, (ClientData) ar);
 
     /*
      * Now that the archive has been read and cached, we can look into
@@ -753,7 +753,7 @@
 	printf("Replaced %s with %s\n", name, &ar->fnametab[entry]);
     }
 
-    (void) strncpy(name, &ar->fnametab[entry], MAXPATHLEN);
+    strncpy(name, &ar->fnametab[entry], MAXPATHLEN);
     name[MAXPATHLEN] = '\0';
     return 1;
 }
@@ -938,7 +938,7 @@
     snprintf(arh.ar_date, sizeof(arh.ar_date), "%-12ld", (long) now);
 
     if (arch != NULL) {
-	(void)fwrite ((char *)&arh, sizeof (struct ar_hdr), 1, arch);
+	fwrite ((char *)&arh, sizeof (struct ar_hdr), 1, arch);
 	fclose (arch);
     }
 }
@@ -971,7 +971,7 @@
     snprintf(arh.ar_date, sizeof(arh.ar_date), "%-12ld", (long) now);
 
     if (arch != NULL) {
-	(void)fwrite ((char *)&arh, sizeof (struct ar_hdr), 1, arch);
+	fwrite ((char *)&arh, sizeof (struct ar_hdr), 1, arch);
 	fclose (arch);
 
 	times.actime = times.modtime = now;
Index: make/buf.h
===================================================================
RCS file: /cvs/src/usr.bin/make/buf.h,v
retrieving revision 1.3
diff -u -u -r1.3 buf.h
--- make/buf.h	3 Nov 2003 19:31:30 -0000	1.3
+++ make/buf.h	7 Nov 2004 20:02:18 -0000
@@ -62,7 +62,7 @@
 
 /* Buf_AddByte adds a single byte to a buffer. */
 #define	Buf_AddByte(bp, byte) \
-	(void) (--(bp)->left <= 0 ? Buf_OvAddByte(bp, byte), 1 : \
+	(--(bp)->left <= 0 ? Buf_OvAddByte(bp, byte), 1 : \
 		(*(bp)->inPtr++ = (byte), *(bp)->inPtr = 0), 1)
 
 #define BUF_ERROR 256
Index: make/compat.c
===================================================================
RCS file: /cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.3
diff -u -u -r1.3 compat.c
--- make/compat.c	3 Nov 2003 19:31:30 -0000	1.3
+++ make/compat.c	7 Nov 2004 20:02:15 -0000
@@ -127,8 +127,8 @@
     }
     if (signo == SIGQUIT)
 	exit(signo);
-    (void) signal(signo, SIG_DFL);
-    (void) kill(getpid(), signo);
+    signal(signo, SIG_DFL);
+    kill(getpid(), signo);
 }
 
 /*-
@@ -200,8 +200,8 @@
      * to ``unregister'' variables
      */
 #if __GNUC__
-    (void) &av;
-    (void) &errCheck;
+    &av;
+    &errCheck;
 #endif
     silent = gn->type & OP_SILENT;
     errCheck = !(gn->type & OP_IGNORE);
@@ -226,7 +226,7 @@
     Lst_Replace (cmdNode, (ClientData)cmdStart);
 
     if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
-	(void)Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
+	Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
 	return(0);
     } else if (strcmp(cmdStart, "...") == 0) {
 	gn->type |= OP_SAVE_CMDS;
@@ -325,12 +325,12 @@
     if (cpid == 0) {
 	if (local) {
 	    execvp(av[0], av);
-	    (void) write (2, av[0], strlen (av[0]));
-	    (void) write (2, ":", 1);
-	    (void) write (2, strerror(errno), strlen(strerror(errno)));
-	    (void) write (2, "\n", 1);
+	    write (2, av[0], strlen (av[0]));
+	    write (2, ":", 1);
+	    write (2, strerror(errno), strlen(strerror(errno)));
+	    write (2, "\n", 1);
 	} else {
-	    (void)execv(av[0], av);
+	    execv(av[0], av);
 	}
 	exit(1);
     }
Index: make/cond.c
===================================================================
RCS file: /cvs/src/usr.bin/make/cond.c,v
retrieving revision 1.4
diff -u -u -r1.4 cond.c
--- make/cond.c	24 Oct 2004 22:43:58 -0000	1.4
+++ make/cond.c	7 Nov 2004 20:02:15 -0000
@@ -979,7 +979,7 @@
 	    if (l == True) {
 		l = CondF(doEval);
 	    } else {
-		(void) CondF(FALSE);
+		CondF(FALSE);
 	    }
 	} else {
 	    /*
@@ -1027,7 +1027,7 @@
 	    if (l == False) {
 		l = CondE(doEval);
 	    } else {
-		(void) CondE(FALSE);
+		CondE(FALSE);
 	    }
 	} else {
 	    /*
Index: make/dir.c
===================================================================
RCS file: /cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.4
diff -u -u -r1.4 dir.c
--- make/dir.c	24 Oct 2004 22:43:58 -0000	1.4
+++ make/dir.c	7 Nov 2004 20:02:15 -0000
@@ -349,7 +349,7 @@
 	    ((entry->name[0] != '.') ||
 	     (pattern[0] == '.')))
 	{
-	    (void)Lst_AtEnd(expansions,
+	    Lst_AtEnd(expansions,
 			    (isDot ? estrdup(entry->name) :
 			     str_concat(p->name, entry->name,
 					STR_ADDSLASH)));
@@ -460,7 +460,7 @@
 	     * Hit the end w/o finding any wildcards, so stick the expansion
 	     * on the end of the list.
 	     */
-	    (void)Lst_AtEnd(expansions, file);
+	    Lst_AtEnd(expansions, file);
 	} else {
 	next:
 	    free(file);
@@ -804,7 +804,7 @@
 	if (DEBUG(DIR)) {
 	    printf("failed. Trying subdirectories...");
 	}
-	(void) Lst_Open (path);
+	Lst_Open (path);
 	while ((ln = Lst_Next (path)) != NILLNODE) {
 	    p = (Path *) Lst_Datum (ln);
 	    if (p != dot) {
@@ -1039,7 +1039,7 @@
 	p = (Path *)Lst_Datum (ln);
 	if (Lst_Member(path, (ClientData)p) == NILLNODE) {
 	    p->refCount += 1;
-	    (void)Lst_AtEnd (path, (ClientData)p);
+	    Lst_AtEnd (path, (ClientData)p);
 	}
     } else {
 	if (DEBUG(DIR)) {
@@ -1076,11 +1076,11 @@
 		if (ISDOT(dp->d_name) || ISDOTDOT(dp->d_name))
 			continue;
 
-		(void)Hash_CreateEntry(&p->files, dp->d_name, (Boolean *)NULL);
+		Hash_CreateEntry(&p->files, dp->d_name, (Boolean *)NULL);
 	    }
-	    (void) closedir (d);
-	    (void)Lst_AtEnd (openDirectories, (ClientData)p);
-	    (void)Lst_AtEnd (path, (ClientData)p);
+	    closedir (d);
+	    Lst_AtEnd (openDirectories, (ClientData)p);
+	    Lst_AtEnd (path, (ClientData)p);
 	}
 	if (DEBUG(DIR)) {
 	    printf("done\n");
@@ -1178,7 +1178,7 @@
 	LstNode	ln;
 
 	ln = Lst_Member (openDirectories, (ClientData)p);
-	(void) Lst_Remove (openDirectories, ln);
+	Lst_Remove (openDirectories, ln);
 
 	Hash_DeleteTable (&p->files);
 	free((Address)p->name);
@@ -1238,7 +1238,7 @@
 	p = (Path *)Lst_Datum(ln);
 	if (Lst_Member(path1, (ClientData)p) == NILLNODE) {
 	    p->refCount += 1;
-	    (void)Lst_AtEnd(path1, (ClientData)p);
+	    Lst_AtEnd(path1, (ClientData)p);
 	}
     }
 }
Index: make/for.c
===================================================================
RCS file: /cvs/src/usr.bin/make/for.c,v
retrieving revision 1.3
diff -u -u -r1.3 for.c
--- make/for.c	3 Nov 2003 19:31:30 -0000	1.3
+++ make/for.c	7 Nov 2004 20:02:15 -0000
@@ -189,7 +189,7 @@
 		wrd = ptr--;
 	    }
 	if (DEBUG(FOR))
-	    (void) fprintf(stderr, "For: Iterator %s List %s\n", forVar, sub);
+	    fprintf(stderr, "For: Iterator %s List %s\n", forVar, sub);
 	if (ptr - wrd > 0)
 	    ADDWORD();
 	else
@@ -208,7 +208,7 @@
 	if (strncmp(ptr, "endfor", 6) == 0 &&
 	    (isspace((unsigned char) ptr[6]) || !ptr[6])) {
 	    if (DEBUG(FOR))
-		(void) fprintf(stderr, "For: end for %d\n", forLevel);
+		fprintf(stderr, "For: end for %d\n", forLevel);
 	    if (--forLevel < 0) {
 		Parse_Error (level, "for-less endfor");
 		return 0;
@@ -218,7 +218,7 @@
 		 isspace((unsigned char) ptr[3])) {
 	    forLevel++;
 	    if (DEBUG(FOR))
-		(void) fprintf(stderr, "For: new loop %d\n", forLevel);
+		fprintf(stderr, "For: new loop %d\n", forLevel);
 	}
     }
 
@@ -255,7 +255,7 @@
     int len;
     Var_Set(arg->var, name, VAR_GLOBAL);
     if (DEBUG(FOR))
-	(void) fprintf(stderr, "--- %s = %s\n", arg->var, name);
+	fprintf(stderr, "--- %s = %s\n", arg->var, name);
     Parse_FromString(Var_Subst(arg->var, (char *) Buf_GetAll(arg->buf, &len),
 			       VAR_GLOBAL, FALSE));
     Var_Delete(arg->var, VAR_GLOBAL);
Index: make/hash.c
===================================================================
RCS file: /cvs/src/usr.bin/make/hash.c,v
retrieving revision 1.3
diff -u -u -r1.3 hash.c
--- make/hash.c	3 Nov 2003 19:31:30 -0000	1.3
+++ make/hash.c	7 Nov 2004 20:02:15 -0000
@@ -247,7 +247,7 @@
 	*hp = e;
 	e->clientData = NULL;
 	e->namehash = h;
-	(void) strcpy(e->name, p);
+	strcpy(e->name, p);
 	t->numEntries++;
 
 	if (newPtr != NULL)
@@ -290,7 +290,7 @@
 			return;
 		}
 	}
-	(void) write(2, "bad call to Hash_DeleteEntry\n", 29);
+	write(2, "bad call to Hash_DeleteEntry\n", 29);
 	abort();
 }
 
Index: make/job.c
===================================================================
RCS file: /cvs/src/usr.bin/make/job.c,v
retrieving revision 1.4
diff -u -u -r1.4 job.c
--- make/job.c	23 Jul 2004 07:12:28 -0000	1.4
+++ make/job.c	7 Nov 2004 20:02:15 -0000
@@ -236,11 +236,11 @@
 #ifdef REMOTE
 # define TARG_FMT  "--- %s at %s ---\n" /* Default format */
 # define MESSAGE(fp, gn) \
-	(void) fprintf(fp, targFmt, gn->name, gn->rem.hname);
+	fprintf(fp, targFmt, gn->name, gn->rem.hname);
 #else
 # define TARG_FMT  "--- %s ---\n" /* Default format */
 # define MESSAGE(fp, gn) \
-	(void) fprintf(fp, targFmt, gn->name);
+	fprintf(fp, targFmt, gn->name);
 #endif
 
 /*
@@ -331,7 +331,7 @@
     int	signo = *(int *) signop;
 #ifdef RMT_WANTS_SIGNALS
     if (job->flags & JOB_REMOTE) {
-	(void) Rmt_Signal(job, signo);
+	Rmt_Signal(job, signo);
     } else {
 	KILL(job->pid, signo);
     }
@@ -341,10 +341,10 @@
      * job as well.
      */
     if (DEBUG(JOB)) {
-	(void) fprintf(stdout,
+	fprintf(stdout,
 		       "JobCondPassSig passing signal %d to child %d.\n",
 		       signo, job->pid);
-	(void) fflush(stdout);
+	fflush(stdout);
     }
     KILL(job->pid, signo);
 #endif
@@ -373,8 +373,8 @@
     struct sigaction act;
 
     if (DEBUG(JOB)) {
-	(void) fprintf(stdout, "JobPassSig(%d) called.\n", signo);
-	(void) fflush(stdout);
+	fprintf(stdout, "JobPassSig(%d) called.\n", signo);
+	fflush(stdout);
     }
     Lst_ForEach(jobs, JobCondPassSig, (ClientData) &signo);
 
@@ -411,19 +411,19 @@
     sigaction(signo, &act, NULL);
 
     if (DEBUG(JOB)) {
-	(void) fprintf(stdout,
+	fprintf(stdout,
 		       "JobPassSig passing signal to self, mask = %x.\n",
 		       ~0 & ~(1 << (signo-1)));
-	(void) fflush(stdout);
+	fflush(stdout);
     }
-    (void) signal(signo, SIG_DFL);
+    signal(signo, SIG_DFL);
 
-    (void) KILL(getpid(), signo);
+    KILL(getpid(), signo);
 
     signo = SIGCONT;
     Lst_ForEach(jobs, JobCondPassSig, (ClientData) &signo);
 
-    (void) sigprocmask(SIG_SETMASK, &omask, NULL);
+    sigprocmask(SIG_SETMASK, &omask, NULL);
     sigprocmask(SIG_SETMASK, &omask, NULL);
     act.sa_handler = JobPassSig;
     sigaction(signo, &act, NULL);
@@ -534,11 +534,11 @@
     }
 
 #define DBPRINTF(fmt, arg) if (DEBUG(JOB)) {	\
-	(void) fprintf(stdout, fmt, arg); 	\
-	(void) fflush(stdout); 			\
+	fprintf(stdout, fmt, arg); 	\
+	fflush(stdout); 			\
     }						\
-   (void) fprintf(job->cmdFILE, fmt, arg);	\
-   (void) fflush(job->cmdFILE);
+   fprintf(job->cmdFILE, fmt, arg);	\
+   fflush(job->cmdFILE);
 
     numCommands += 1;
 
@@ -668,7 +668,7 @@
     ClientData   gn;
 {
     cmd = (ClientData) Var_Subst(NULL, (char *) cmd, (GNode *) gn, FALSE);
-    (void) Lst_AtEnd(postCommands->commands, cmd);
+    Lst_AtEnd(postCommands->commands, cmd);
     return(0);
 }
 
@@ -697,12 +697,12 @@
 	FD_CLR(job->inPipe, &outputs);
 #endif
 	if (job->outPipe != job->inPipe) {
-	   (void) close(job->outPipe);
+	   close(job->outPipe);
 	}
 	JobDoOutput(job, TRUE);
-	(void) close(job->inPipe);
+	close(job->inPipe);
     } else {
-	(void) close(job->outFd);
+	close(job->outFd);
 	JobDoOutput(job, TRUE);
     }
 }
@@ -755,7 +755,7 @@
 #endif
 	JobClose(job);
 	if (job->cmdFILE != NULL && job->cmdFILE != stdout) {
-	   (void) fclose(job->cmdFILE);
+	   fclose(job->cmdFILE);
 	}
 	done = TRUE;
 #ifdef REMOTE
@@ -809,15 +809,15 @@
 
 	if (WIFEXITED(*status)) {
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "Process %d exited.\n", job->pid);
-		(void) fflush(stdout);
+		fprintf(stdout, "Process %d exited.\n", job->pid);
+		fflush(stdout);
 	    }
 	    if (WEXITSTATUS(*status) != 0) {
 		if (usePipes && job->node != lastNode) {
 		    MESSAGE(out, job->node);
 		    lastNode = job->node;
 		}
-		(void) fprintf(out, "*** Error code %d%s\n",
+		fprintf(out, "*** Error code %d%s\n",
 			       WEXITSTATUS(*status),
 			       (job->flags & JOB_IGNERR) ? "(ignored)" : "");
 
@@ -829,28 +829,28 @@
 		    MESSAGE(out, job->node);
 		    lastNode = job->node;
 		}
-		(void) fprintf(out, "*** Completed successfully\n");
+		fprintf(out, "*** Completed successfully\n");
 	    }
 	} else if (WIFSTOPPED(*status)) {
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "Process %d stopped.\n", job->pid);
-		(void) fflush(stdout);
+		fprintf(stdout, "Process %d stopped.\n", job->pid);
+		fflush(stdout);
 	    }
 	    if (usePipes && job->node != lastNode) {
 		MESSAGE(out, job->node);
 		lastNode = job->node;
 	    }
 	    if (!(job->flags & JOB_REMIGRATE)) {
-		(void) fprintf(out, "*** Stopped -- signal %d\n",
+		fprintf(out, "*** Stopped -- signal %d\n",
 		    WSTOPSIG(*status));
 	    }
 	    job->flags |= JOB_RESUME;
-	    (void)Lst_AtEnd(stoppedJobs, (ClientData)job);
+	    Lst_AtEnd(stoppedJobs, (ClientData)job);
 #ifdef REMOTE
 	    if (job->flags & JOB_REMIGRATE)
 		JobRestart(job);
 #endif
-	    (void) fflush(out);
+	    fflush(out);
 	    return;
 	} else if (WTERMSIG(*status) == SIGCONT) {
 	    /*
@@ -863,14 +863,14 @@
 		    MESSAGE(out, job->node);
 		    lastNode = job->node;
 		}
-		(void) fprintf(out, "*** Continued\n");
+		fprintf(out, "*** Continued\n");
 	    }
 	    if (!(job->flags & JOB_CONTINUING)) {
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout,
+		    fprintf(stdout,
 				   "Warning: process %d was not continuing.\n",
 				   job->pid);
-		    (void) fflush(stdout);
+		    fflush(stdout);
 		}
 #ifdef notdef
 		/*
@@ -887,31 +887,31 @@
 	    nJobs += 1;
 	    if (!(job->flags & JOB_REMOTE)) {
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout,
+		    fprintf(stdout,
 				   "Process %d is continuing locally.\n",
 				   job->pid);
-		    (void) fflush(stdout);
+		    fflush(stdout);
   		}
 		nLocal += 1;
 	    }
 	    if (nJobs == maxJobs) {
 		jobFull = TRUE;
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout, "Job queue is full.\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "Job queue is full.\n");
+		    fflush(stdout);
   		}
   	    }
-	    (void) fflush(out);
+	    fflush(out);
   	    return;
 	} else {
 	    if (usePipes && job->node != lastNode) {
 		MESSAGE(out, job->node);
 		lastNode = job->node;
 	    }
-	    (void) fprintf(out, "*** Signal %d\n", WTERMSIG(*status));
+	    fprintf(out, "*** Signal %d\n", WTERMSIG(*status));
 	}
 
-	(void) fflush(out);
+	fflush(out);
     }
 
     /*
@@ -1021,8 +1021,8 @@
     }
 
     if (!silent) {
-	(void) fprintf(stdout, "touch %s\n", gn->name);
-	(void) fflush(stdout);
+	fprintf(stdout, "touch %s\n", gn->name);
+	fflush(stdout);
     }
 
     if (noExecute) {
@@ -1048,15 +1048,15 @@
 		 * modification time, then close the file.
 		 */
 		if (read(streamID, &c, 1) == 1) {
-		    (void) lseek(streamID, 0L, SEEK_SET);
-		    (void) write(streamID, &c, 1);
+		    lseek(streamID, 0L, SEEK_SET);
+		    write(streamID, &c, 1);
 		}
 
-		(void) close(streamID);
+		close(streamID);
 	    } else {
-		(void) fprintf(stdout, "*** couldn't touch %s: %s",
+		fprintf(stdout, "*** couldn't touch %s: %s",
 			       file, strerror(errno));
-		(void) fflush(stdout);
+		fflush(stdout);
 	    }
 	}
     }
@@ -1113,11 +1113,11 @@
 	    static const char msg[] = "make: don't know how to make";
 
 	    if (gn->type & OP_OPTIONAL) {
-		(void) fprintf(stdout, "%s %s(ignored)\n", msg, gn->name);
-		(void) fflush(stdout);
+		fprintf(stdout, "%s %s(ignored)\n", msg, gn->name);
+		fflush(stdout);
 	    } else if (keepgoing) {
-		(void) fprintf(stdout, "%s %s(continuing)\n", msg, gn->name);
-		(void) fflush(stdout);
+		fprintf(stdout, "%s %s(continuing)\n", msg, gn->name);
+		fflush(stdout);
   		return FALSE;
 	    } else {
 #if OLD_JOKE
@@ -1181,14 +1181,14 @@
     if (DEBUG(JOB)) {
 	int 	  i;
 
-	(void) fprintf(stdout, "Running %s %sly\n", job->node->name,
+	fprintf(stdout, "Running %s %sly\n", job->node->name,
 		       job->flags&JOB_REMOTE?"remote":"local");
-	(void) fprintf(stdout, "\tCommand: ");
+	fprintf(stdout, "\tCommand: ");
 	for (i = 0; argv[i] != NULL; i++) {
-	    (void) fprintf(stdout, "%s ", argv[i]);
+	    fprintf(stdout, "%s ", argv[i]);
 	}
- 	(void) fprintf(stdout, "\n");
- 	(void) fflush(stdout);
+ 	fprintf(stdout, "\n");
+ 	fflush(stdout);
     }
 
     /*
@@ -1220,8 +1220,8 @@
 	 */
 	if (dup2(FILENO(job->cmdFILE), 0) == -1)
 	    Punt("Cannot dup2: %s", strerror(errno));
-	(void) fcntl(0, F_SETFD, 0);
-	(void) lseek(0, 0, SEEK_SET);
+	fcntl(0, F_SETFD, 0);
+	lseek(0, 0, SEEK_SET);
 
 	if (usePipes) {
 	    /*
@@ -1245,7 +1245,7 @@
 	 * it before routing the shell's error output to the same place as
 	 * its standard output.
 	 */
-	(void) fcntl(1, F_SETFD, 0);
+	fcntl(1, F_SETFD, 0);
 	if (dup2(1, 2) == -1)
 	    Punt("Cannot dup2: %s", strerror(errno));
 
@@ -1256,9 +1256,9 @@
 	 * by killing its process family, but not commit suicide.
 	 */
 # if defined(SYSV)
-	(void) setsid();
+	setsid();
 # else
-	(void) setpgid(0, getpid());
+	setpgid(0, getpid());
 # endif
 #endif /* USE_PGRP */
 
@@ -1267,9 +1267,9 @@
 	    Rmt_Exec(shellPath, argv, FALSE);
 	} else
 #endif /* REMOTE */
-	   (void) execv(shellPath, argv);
+	   execv(shellPath, argv);
 
-	(void) write(2, "Could not execute shell\n",
+	write(2, "Could not execute shell\n",
 		     sizeof("Could not execute shell"));
 	_exit(1);
     } else {
@@ -1305,12 +1305,12 @@
 	     * XXX: Used to not happen if REMOTE. Why?
 	     */
 	    if (job->cmdFILE != NULL && job->cmdFILE != stdout) {
-		(void) fclose(job->cmdFILE);
+		fclose(job->cmdFILE);
 		job->cmdFILE = NULL;
 	    }
 	}
 #ifdef REMOTE
-	(void) sigsetmask(omask);
+	sigsetmask(omask);
 #endif
     }
 
@@ -1321,7 +1321,7 @@
      * Now the job is actually running, add it to the table.
      */
     nJobs += 1;
-    (void) Lst_AtEnd(jobs, (ClientData)job);
+    Lst_AtEnd(jobs, (ClientData)job);
     if (nJobs == maxJobs) {
 	jobFull = TRUE;
     }
@@ -1359,7 +1359,7 @@
 	 * Bourne shell thinks its second argument is a file to source.
 	 * Grrrr. Note the ten-character limitation on the combined arguments.
 	 */
-	(void)sprintf(args, "-%s%s",
+	sprintf(args, "-%s%s",
 		      ((job->flags & JOB_IGNERR) ? "" :
 		       (commandShell->exit ? commandShell->exit : "")),
 		      ((job->flags & JOB_SILENT) ? "" :
@@ -1409,16 +1409,16 @@
 	    verboseRemigrates ||
 #endif
 	    DEBUG(JOB)) {
-	   (void) fprintf(stdout, "*** remigrating %x(%s)\n",
+	   fprintf(stdout, "*** remigrating %x(%s)\n",
 			   job->pid, job->node->name);
-	   (void) fflush(stdout);
+	   fflush(stdout);
 	}
 
 #ifdef REMOTE
 	if (!Rmt_ReExport(job->pid, job->node, &host)) {
 	    if (verboseRemigrates || DEBUG(JOB)) {
-		(void) fprintf(stdout, "*** couldn't migrate...\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "*** couldn't migrate...\n");
+		fflush(stdout);
 	    }
 #endif
 	    if (nLocal != maxLocal) {
@@ -1432,8 +1432,8 @@
 		    verboseRemigrates ||
 #endif
 		    DEBUG(JOB)) {
-		    (void) fprintf(stdout, "*** resuming on local machine\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "*** resuming on local machine\n");
+		    fflush(stdout);
 		}
 		KILL(job->pid, SIGCONT);
 		nLocal +=1;
@@ -1453,14 +1453,14 @@
 		    verboseRemigrates ||
 #endif
 		    DEBUG(JOB)) {
-		   (void) fprintf(stdout, "*** holding\n");
-		   (void) fflush(stdout);
+		   fprintf(stdout, "*** holding\n");
+		   fflush(stdout);
   		}
-		(void)Lst_AtFront(stoppedJobs, (ClientData)job);
+		Lst_AtFront(stoppedJobs, (ClientData)job);
 		jobFull = TRUE;
 		if (DEBUG(JOB)) {
-		   (void) fprintf(stdout, "Job queue is full.\n");
-		   (void) fflush(stdout);
+		   fprintf(stdout, "Job queue is full.\n");
+		   fflush(stdout);
 		}
 		return;
 	    }
@@ -1477,13 +1477,13 @@
 	}
 #endif
 
-	(void)Lst_AtEnd(jobs, (ClientData)job);
+	Lst_AtEnd(jobs, (ClientData)job);
 	nJobs += 1;
 	if (nJobs == maxJobs) {
 	    jobFull = TRUE;
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "Job queue is full.\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "Job queue is full.\n");
+		fflush(stdout);
 	    }
 	}
     } else if (job->flags & JOB_RESTART) {
@@ -1500,8 +1500,8 @@
 	JobMakeArgv(job, argv);
 
 	if (DEBUG(JOB)) {
-	    (void) fprintf(stdout, "Restarting %s...", job->node->name);
-	    (void) fflush(stdout);
+	    fprintf(stdout, "Restarting %s...", job->node->name);
+	    fflush(stdout);
 	}
 #ifdef REMOTE
 	if ((job->node->type&OP_NOEXPORT) ||
@@ -1519,14 +1519,14 @@
 		 * back on the hold queue and mark the table full
 		 */
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout, "holding\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "holding\n");
+		    fflush(stdout);
 		}
-		(void)Lst_AtFront(stoppedJobs, (ClientData)job);
+		Lst_AtFront(stoppedJobs, (ClientData)job);
 		jobFull = TRUE;
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout, "Job queue is full.\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "Job queue is full.\n");
+		    fflush(stdout);
 		}
 		return;
 	    } else {
@@ -1534,8 +1534,8 @@
 		 * Job may be run locally.
 		 */
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout, "running locally\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "running locally\n");
+		    fflush(stdout);
 		}
 		job->flags &= ~JOB_REMOTE;
 	    }
@@ -1546,8 +1546,8 @@
 	     * Can be exported. Hooray!
 	     */
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "exporting\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "exporting\n");
+		fflush(stdout);
 	    }
 	    job->flags |= JOB_REMOTE;
 	}
@@ -1559,8 +1559,8 @@
 	 * we don't know...
 	 */
 	if (DEBUG(JOB)) {
-	   (void) fprintf(stdout, "Resuming %s...", job->node->name);
-	   (void) fflush(stdout);
+	   fprintf(stdout, "Resuming %s...", job->node->name);
+	   fflush(stdout);
 	}
 	if (((job->flags & JOB_REMOTE) ||
 	    (nLocal < maxLocal) ||
@@ -1602,8 +1602,8 @@
 
 		job->flags &= ~(JOB_RESUME|JOB_CONTINUING);
 		if (DEBUG(JOB)) {
-		   (void) fprintf(stdout, "done\n");
-		   (void) fflush(stdout);
+		   fprintf(stdout, "done\n");
+		   fflush(stdout);
 		}
 	    } else {
 		Error("couldn't resume %s: %s",
@@ -1618,14 +1618,14 @@
 	     * place the job back on the list of stopped jobs.
 	     */
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "table full\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "table full\n");
+		fflush(stdout);
 	    }
-	    (void) Lst_AtFront(stoppedJobs, (ClientData)job);
+	    Lst_AtFront(stoppedJobs, (ClientData)job);
 	    jobFull = TRUE;
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "Job queue is full.\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "Job queue is full.\n");
+		fflush(stdout);
 	    }
 	}
     }
@@ -1715,7 +1715,7 @@
 	    DieHorribly();
 	}
 
-	(void) strcpy(tfile, TMPPAT);
+	strcpy(tfile, TMPPAT);
 	if ((tfd = mkstemp(tfile)) == -1)
 	    Punt("Cannot create temp file: %s", strerror(errno));
 	job->cmdFILE = fdopen(tfd, "w+");
@@ -1724,7 +1724,7 @@
 	    close(tfd);
 	    Punt("Could not open %s", tfile);
 	}
-	(void) fcntl(FILENO(job->cmdFILE), F_SETFD, 1);
+	fcntl(FILENO(job->cmdFILE), F_SETFD, 1);
 	/*
 	 * Send the commands to the command file, flush all its buffers then
 	 * rewind and remove the thing.
@@ -1829,9 +1829,9 @@
 	 */
 	if (job->cmdFILE != stdout) {
 	    if (job->cmdFILE != NULL)
-		(void) fclose(job->cmdFILE);
+		fclose(job->cmdFILE);
 	} else {
-	     (void) fflush(stdout);
+	     fflush(stdout);
 	}
 
 	/*
@@ -1855,7 +1855,7 @@
 	    return(JOB_ERROR);
 	}
     } else {
-	(void) fflush(job->cmdFILE);
+	fflush(job->cmdFILE);
     }
 
     /*
@@ -1876,15 +1876,15 @@
 		Punt("Cannot create pipe: %s", strerror(errno));
 	    job->inPipe = fd[0];
 	    job->outPipe = fd[1];
-	    (void) fcntl(job->inPipe, F_SETFD, 1);
-	    (void) fcntl(job->outPipe, F_SETFD, 1);
+	    fcntl(job->inPipe, F_SETFD, 1);
+	    fcntl(job->outPipe, F_SETFD, 1);
 	} else {
-	    (void) fprintf(stdout, "Remaking `%s'\n", gn->name);
-  	    (void) fflush(stdout);
-	    (void) strcpy(job->outFile, TMPPAT);
+	    fprintf(stdout, "Remaking `%s'\n", gn->name);
+  	    fflush(stdout);
+	    strcpy(job->outFile, TMPPAT);
 	    if ((job->outFd = mkstemp(job->outFile)) == -1)
 		Punt("cannot create temp file: %s", strerror(errno));
-	    (void) fcntl(job->outFd, F_SETFD, 1);
+	    fcntl(job->outFd, F_SETFD, 1);
 	}
     }
 
@@ -1923,11 +1923,11 @@
 	jobFull = TRUE;
 
 	if (DEBUG(JOB)) {
-	   (void) fprintf(stdout, "Can only run job locally.\n");
-	   (void) fflush(stdout);
+	   fprintf(stdout, "Can only run job locally.\n");
+	   fflush(stdout);
 	}
 	job->flags |= JOB_RESTART;
-	(void) Lst_AtEnd(stoppedJobs, (ClientData)job);
+	Lst_AtEnd(stoppedJobs, (ClientData)job);
     } else {
 	if ((nLocal >= maxLocal) && local) {
 	    /*
@@ -1936,8 +1936,8 @@
 	     */
 	    jobFull = TRUE;
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "Local job queue is full.\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "Local job queue is full.\n");
+		fflush(stdout);
 	    }
 	}
 	JobExec(job, argv);
@@ -1968,8 +1968,8 @@
 		 * however, since the non-printable comes after it,
 		 * there must be a newline, so we don't print one.
 		 */
-		(void) fprintf(stdout, "%s", cp);
-		(void) fflush(stdout);
+		fprintf(stdout, "%s", cp);
+		fflush(stdout);
 	    }
 	    cp = ecp + commandShell->noPLen;
 	    if (cp != endp) {
@@ -2124,13 +2124,13 @@
 			MESSAGE(stdout, job->node);
 			lastNode = job->node;
 		    }
-		    (void) fprintf(stdout, "%s%s", cp, gotNL ? "\n" : "");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "%s%s", cp, gotNL ? "\n" : "");
+		    fflush(stdout);
 		}
 	    }
 	    if (i < max - 1) {
 		/* shift the remaining characters down */
-		(void) memcpy(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
+		memcpy(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
 		job->curPos = max - (i + 1);
 
 	    } else {
@@ -2165,8 +2165,8 @@
 	 */
 	oFILE = fopen(job->outFile, "r");
 	if (oFILE != NULL) {
-	    (void) fprintf(stdout, "Results of making %s:\n", job->node->name);
-	    (void) fflush(stdout);
+	    fprintf(stdout, "Results of making %s:\n", job->node->name);
+	    fflush(stdout);
 	    while (fgets(inLine, sizeof(inLine), oFILE) != NULL) {
 		register char	*cp, *endp, *oendp;
 
@@ -2182,15 +2182,15 @@
 		 * we know there's no newline at the end, so we add one of
 		 * our own free will.
 		 */
-		(void) fprintf(stdout, "%s", cp);
-		(void) fflush(stdout);
+		fprintf(stdout, "%s", cp);
+		fflush(stdout);
 		if (endp != oendp) {
-		    (void) fprintf(stdout, "\n");
-		    (void) fflush(stdout);
+		    fprintf(stdout, "\n");
+		    fflush(stdout);
 		}
 	    }
-	    (void) fclose(oFILE);
-	    (void) eunlink(job->outFile);
+	    fclose(oFILE);
+	    eunlink(job->outFile);
 	}
     }
 }
@@ -2234,8 +2234,8 @@
 			  (block?0:WNOHANG)|WUNTRACED)) > 0)
     {
 	if (DEBUG(JOB)) {
-	    (void) fprintf(stdout, "Process %d exited or stopped.\n", pid);
-	    (void) fflush(stdout);
+	    fprintf(stdout, "Process %d exited or stopped.\n", pid);
+	    fflush(stdout);
 	}
 
 
@@ -2249,26 +2249,26 @@
 		    continue;
 		}
 		job = (Job *)Lst_Datum(jnode);
-		(void) Lst_Remove(stoppedJobs, jnode);
+		Lst_Remove(stoppedJobs, jnode);
 	    } else {
 		Error("Child (%d) not in table?", pid);
 		continue;
 	    }
 	} else {
 	    job = (Job *) Lst_Datum(jnode);
-	    (void) Lst_Remove(jobs, jnode);
+	    Lst_Remove(jobs, jnode);
 	    nJobs -= 1;
 	    if (jobFull && DEBUG(JOB)) {
-		(void) fprintf(stdout, "Job queue is no longer full.\n");
-		(void) fflush(stdout);
+		fprintf(stdout, "Job queue is no longer full.\n");
+		fflush(stdout);
 	    }
 	    jobFull = FALSE;
 #ifdef REMOTE
 	    if (!(job->flags & JOB_REMOTE)) {
 		if (DEBUG(JOB)) {
-		    (void) fprintf(stdout,
+		    fprintf(stdout,
 				   "Job queue has one fewer local process.\n");
-		    (void) fflush(stdout);
+		    fflush(stdout);
 		}
 		nLocal -= 1;
 	    }
@@ -2309,7 +2309,7 @@
     int	    	  	  pnJobs;   	/* Previous nJobs */
 #endif
 
-    (void) fflush(stdout);
+    fflush(stdout);
 #ifdef RMT_WILL_WATCH
     pnJobs = nJobs;
 
@@ -2376,7 +2376,7 @@
 Job_Make(gn)
     GNode   *gn;
 {
-    (void) JobStart(gn, 0, NULL);
+    JobStart(gn, 0, NULL);
 }
 
 /*-
@@ -2451,16 +2451,16 @@
      * JobPassSig will take care of calling JobInterrupt if appropriate.
      */
     if (signal(SIGINT, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGINT, JobPassSig);
+	signal(SIGINT, JobPassSig);
     }
     if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGHUP, JobPassSig);
+	signal(SIGHUP, JobPassSig);
     }
     if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGQUIT, JobPassSig);
+	signal(SIGQUIT, JobPassSig);
     }
     if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGTERM, JobPassSig);
+	signal(SIGTERM, JobPassSig);
     }
     /*
      * There are additional signals that need to be caught and passed if
@@ -2470,16 +2470,16 @@
      */
 #if defined(RMT_WANTS_SIGNALS) || defined(USE_PGRP)
     if (signal(SIGTSTP, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGTSTP, JobPassSig);
+	signal(SIGTSTP, JobPassSig);
     }
     if (signal(SIGTTOU, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGTTOU, JobPassSig);
+	signal(SIGTTOU, JobPassSig);
     }
     if (signal(SIGTTIN, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGTTIN, JobPassSig);
+	signal(SIGTTIN, JobPassSig);
     }
     if (signal(SIGWINCH, SIG_IGN) != SIG_IGN) {
-	(void) signal(SIGWINCH, JobPassSig);
+	signal(SIGWINCH, JobPassSig);
     }
 #endif
 
@@ -2784,7 +2784,7 @@
 
     aborting = ABORT_INTERRUPT;
 
-   (void) Lst_Open(jobs);
+   Lst_Open(jobs);
     while ((ln = Lst_Next(jobs)) != NILLNODE) {
 	job = (Job *) Lst_Datum(ln);
 
@@ -2818,10 +2818,10 @@
 #else
 	if (job->pid) {
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout,
+		fprintf(stdout,
 			       "JobInterrupt passing signal to child %d.\n",
 			       job->pid);
-		(void) fflush(stdout);
+		fflush(stdout);
 	    }
 	    KILL(job->pid, signo);
 	}
@@ -2829,16 +2829,16 @@
     }
 
 #ifdef REMOTE
-   (void)Lst_Open(stoppedJobs);
+   Lst_Open(stoppedJobs);
     while ((ln = Lst_Next(stoppedJobs)) != NILLNODE) {
 	job = (Job *) Lst_Datum(ln);
 
 	if (job->flags & JOB_RESTART) {
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout, "%s%s",
+		fprintf(stdout, "%s%s",
 			       "JobInterrupt skipping job on stopped queue",
 			       "-- it was waiting to be restarted.\n");
-		(void) fflush(stdout);
+		fflush(stdout);
 	    }
 	    continue;
 	}
@@ -2854,10 +2854,10 @@
 	 * Resume the thing so it will take the signal.
 	 */
 	if (DEBUG(JOB)) {
-	    (void) fprintf(stdout,
+	    fprintf(stdout,
 			   "JobInterrupt passing CONT to stopped child %d.\n",
 			   job->pid);
-	    (void) fflush(stdout);
+	    fflush(stdout);
 	}
 	KILL(job->pid, SIGCONT);
 #ifdef RMT_WANTS_SIGNALS
@@ -2877,10 +2877,10 @@
 	    }
 	} else if (job->pid) {
 	    if (DEBUG(JOB)) {
-		(void) fprintf(stdout,
+		fprintf(stdout,
 		       "JobInterrupt passing interrupt to stopped child %d.\n",
 			       job->pid);
-		(void) fflush(stdout);
+		fflush(stdout);
 	    }
 	    KILL(job->pid, SIGINT);
 	}
@@ -2987,7 +2987,7 @@
 
     if (nJobs) {
 
-	(void) Lst_Open(jobs);
+	Lst_Open(jobs);
 	while ((ln = Lst_Next(jobs)) != NILLNODE) {
 	    job = (Job *) Lst_Datum(ln);
 
@@ -3040,8 +3040,8 @@
     LstNode       jnode;    	/* list element for finding job */
 
     if (DEBUG(JOB)) {
-	(void) fprintf(stdout, "JobFlagForMigration(%d) called.\n", hostID);
-	(void) fflush(stdout);
+	fprintf(stdout, "JobFlagForMigration(%d) called.\n", hostID);
+	fflush(stdout);
     }
     jnode = Lst_Find(jobs, (ClientData)hostID, JobCmpRmtID);
 
@@ -3057,10 +3057,10 @@
     job = (Job *) Lst_Datum(jnode);
 
     if (DEBUG(JOB)) {
-	(void) fprintf(stdout,
+	fprintf(stdout,
 		       "JobFlagForMigration(%d) found job '%s'.\n", hostID,
 		       job->node->name);
-	(void) fflush(stdout);
+	fflush(stdout);
     }
 
     KILL(job->pid, SIGSTOP);
@@ -3090,9 +3090,9 @@
 {
     while (!jobFull && !Lst_IsEmpty(stoppedJobs)) {
 	if (DEBUG(JOB)) {
-	    (void) fprintf(stdout,
+	    fprintf(stdout,
 		       "Job queue is not full. Restarting a stopped job.\n");
-	    (void) fflush(stdout);
+	    fflush(stdout);
 	}
 	JobRestart((Job *)Lst_DeQueue(stoppedJobs));
     }
Index: make/main.c
===================================================================
RCS file: /cvs/src/usr.bin/make/main.c,v
retrieving revision 1.7
diff -u -u -r1.7 main.c
--- make/main.c	24 Oct 2004 22:43:58 -0000	1.7
+++ make/main.c	7 Nov 2004 20:02:15 -0000
@@ -194,7 +194,7 @@
 			break;
 		case 'V':
 			printVars = TRUE;
-			(void)Lst_AtEnd(variables, (ClientData)optarg);
+			Lst_AtEnd(variables, (ClientData)optarg);
 			Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
 			Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
 			break;
@@ -288,8 +288,8 @@
 			p = malloc(strlen(optarg) + 1);
 			if (!p)
 				Punt("make: cannot allocate memory.");
-			(void)strcpy(p, optarg);
-			(void)Lst_AtEnd(envFirstVars, (ClientData)p);
+			strcpy(p, optarg);
+			Lst_AtEnd(envFirstVars, (ClientData)p);
 			Var_Append(MAKEFLAGS, "-E", VAR_GLOBAL);
 			Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
 			break;
@@ -298,7 +298,7 @@
 			Var_Append(MAKEFLAGS, "-e", VAR_GLOBAL);
 			break;
 		case 'f':
-			(void)Lst_AtEnd(makefiles, (ClientData)optarg);
+			Lst_AtEnd(makefiles, (ClientData)optarg);
 			break;
 		case 'i':
 			ignoreErrors = TRUE;
@@ -381,7 +381,7 @@
 					optind = 1;     /* - */
 				goto rearg;
 			}
-			(void)Lst_AtEnd(create, (ClientData)estrdup(*argv));
+			Lst_AtEnd(create, (ClientData)estrdup(*argv));
 		}
 }
 
@@ -432,7 +432,7 @@
 		}
 		else {
 			if (path[0] != '/') {
-				(void) snprintf(obpath, MAXPATHLEN, "%s/%s",
+				snprintf(obpath, MAXPATHLEN, "%s/%s",
 						curdir, path);
 				return obpath;
 			}
@@ -511,7 +511,7 @@
 		if (getrlimit(RLIMIT_NOFILE, &rl) != -1 &&
 		    rl.rlim_cur != rl.rlim_max) {
 			rl.rlim_cur = rl.rlim_max;
-			(void) setrlimit(RLIMIT_NOFILE, &rl);
+			setrlimit(RLIMIT_NOFILE, &rl);
 		}
 	}
 #endif
@@ -531,7 +531,7 @@
 	if ((pwd = getenv("PWD")) != NULL) {
 	    if (stat(pwd, &sb) == 0 && sa.st_ino == sb.st_ino &&
 		sa.st_dev == sb.st_dev)
-		(void) strcpy(curdir, pwd);
+		strcpy(curdir, pwd);
 	}
 #endif
 
@@ -618,11 +618,11 @@
 		if (!(path = getenv("MAKEOBJDIR"))) {
 			path = _PATH_OBJDIR;
 			pathp = _PATH_OBJDIRPREFIX;
-			(void) snprintf(mdpath, MAXPATHLEN, "%s.%s",
+			snprintf(mdpath, MAXPATHLEN, "%s.%s",
 					path, machine);
 			if (!(objdir = chdir_verify_path(mdpath, obpath)))
 				if (!(objdir=chdir_verify_path(path, obpath))) {
-					(void) snprintf(mdpath, MAXPATHLEN,
+					snprintf(mdpath, MAXPATHLEN,
 							"%s%s", pathp, curdir);
 					if (!(objdir=chdir_verify_path(mdpath,
 								       obpath)))
@@ -633,7 +633,7 @@
 			objdir = curdir;
 	}
 	else {
-		(void) snprintf(mdpath, MAXPATHLEN, "%s%s", pathp, curdir);
+		snprintf(mdpath, MAXPATHLEN, "%s%s", pathp, curdir);
 		if (!(objdir = chdir_verify_path(mdpath, obpath)))
 			objdir = curdir;
 	}
@@ -730,7 +730,7 @@
 	Suff_Init();
 
 	DEFAULT = NILGNODE;
-	(void)time(&now);
+	time(&now);
 
 	/*
 	 * Set up the .TARGETS variable to contain the list of targets to be
@@ -792,9 +792,9 @@
 		if (ln != NILLNODE)
 			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
 	} else if (!ReadMakefile("makefile", NULL))
-		(void)ReadMakefile("Makefile", NULL);
+		ReadMakefile("Makefile", NULL);
 
-	(void)ReadMakefile(".depend", NULL);
+	ReadMakefile(".depend", NULL);
 
 	Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
 	efree(p1);
@@ -837,7 +837,7 @@
 			*cp = savec;
 			path = cp + 1;
 		} while (savec == ':');
-		(void)free((Address)vpath);
+		free((Address)vpath);
 	}
 
 	/*
@@ -862,7 +862,7 @@
 				if (!p1)
 					Punt("make: cannot allocate memory.");
 				/* This sprintf is safe, because of the malloc above */
-				(void)sprintf(p1, "${%s}", (char *)Lst_Datum(ln));
+				sprintf(p1, "${%s}", (char *)Lst_Datum(ln));
 				value = Var_Subst(NULL, p1, VAR_GLOBAL, FALSE);
 			} else {
 				value = Var_Value((char *)Lst_Datum(ln),
@@ -960,7 +960,7 @@
 
 		/* if we've chdir'd, rebuild the path name */
 		if (curdir != objdir && *fname != '/') {
-			(void)snprintf(path, MAXPATHLEN, "%s/%s", curdir, fname);
+			snprintf(path, MAXPATHLEN, "%s/%s", curdir, fname);
 			/*
 			 * XXX The realpath stuff breaks relative includes
 			 * XXX in some cases.   The problem likely is in
@@ -1017,7 +1017,7 @@
 		if (setMAKEFILE)
 			Var_Set("MAKEFILE", MAKEFILE, VAR_GLOBAL);
 		Parse_File(fname, stream);
-		(void)fclose(stream);
+		fclose(stream);
 	}
 	return(TRUE);
 }
@@ -1076,17 +1076,17 @@
 	/*
 	 * Close input side of pipe
 	 */
-	(void) close(fds[0]);
+	close(fds[0]);
 
 	/*
 	 * Duplicate the output stream to the shell's output, then
 	 * shut the extra thing down. Note we don't fetch the error
 	 * stream...why not? Why?
 	 */
-	(void) dup2(fds[1], 1);
-	(void) close(fds[1]);
+	dup2(fds[1], 1);
+	close(fds[1]);
 
-	(void) execv("/bin/sh", args);
+	execv("/bin/sh", args);
 	_exit(1);
 	/*NOTREACHED*/
 
@@ -1098,7 +1098,7 @@
 	/*
 	 * No need for the writing half
 	 */
-	(void) close(fds[1]);
+	close(fds[1]);
 
 	buf = Buf_Init (MAKE_BSIZE);
 
@@ -1113,7 +1113,7 @@
 	/*
 	 * Close the input side of the pipe.
 	 */
-	(void) close(fds[0]);
+	close(fds[0]);
 
 	/*
 	 * Wait for the process to exit.
@@ -1186,10 +1186,10 @@
 	va_start(ap);
 	fmt = va_arg(ap, char *);
 #endif
-	(void)vfprintf(stderr, fmt, ap);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	(void)fflush(stderr);
+	fprintf(stderr, "\n");
+	fflush(stderr);
 }
 
 /*-
@@ -1224,10 +1224,10 @@
 	if (jobsRunning)
 		Job_Wait();
 
-	(void)vfprintf(stderr, fmt, ap);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	(void)fflush(stderr);
+	fprintf(stderr, "\n");
+	fflush(stderr);
 
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
@@ -1264,11 +1264,11 @@
 	fmt = va_arg(ap, char *);
 #endif
 
-	(void)fprintf(stderr, "make: ");
-	(void)vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "make: ");
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	(void)fflush(stderr);
+	fprintf(stderr, "\n");
+	fflush(stderr);
 
 	DieHorribly();
 }
@@ -1392,7 +1392,7 @@
 static void
 usage()
 {
-	(void)fprintf(stderr, "%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n",
 "usage: make [-BPSXeiknqrstv] [-C directory] [-D variable] [-d flags]",
 "            [-E variable] [-f makefile] [-I directory] [-j max_jobs]",
 "            [-m directory] [-V variable] [variable=value] [target ...]");
Index: make/make.c
===================================================================
RCS file: /cvs/src/usr.bin/make/make.c,v
retrieving revision 1.3
diff -u -u -r1.3 make.c
--- make/make.c	3 Nov 2003 19:31:30 -0000	1.3
+++ make/make.c	7 Nov 2004 20:02:15 -0000
@@ -154,7 +154,7 @@
      * doesn't depend on their modification time...
      */
     if ((gn->type & (OP_JOIN|OP_USE|OP_EXEC)) == 0) {
-	(void) Dir_MTime (gn);
+	Dir_MTime (gn);
 	if (DEBUG(MAKE)) {
 	    if (gn->mtime != 0) {
 		printf ("modified %s...", Targ_FmtTime(gn->mtime));
@@ -291,7 +291,7 @@
     Lst            l = (Lst) lp;
 
     if (!gn->make && !(gn->type & OP_USE)) {
-	(void)Lst_EnQueue (l, (ClientData)gn);
+	Lst_EnQueue (l, (ClientData)gn);
     }
     return (0);
 }
@@ -333,7 +333,7 @@
 	     * .USE or transformation and target has no commands -- append
 	     * the child's commands to the parent.
 	     */
-	    (void) Lst_Concat (pgn->commands, cgn->commands, LST_CONCNEW);
+	    Lst_Concat (pgn->commands, cgn->commands, LST_CONCNEW);
 	}
 
 	if (Lst_Open (cgn->children) == SUCCESS) {
@@ -341,8 +341,8 @@
 		gn = (GNode *)Lst_Datum (ln);
 
 		if (Lst_Member (pgn->children, gn) == NILLNODE) {
-		    (void) Lst_AtEnd (pgn->children, gn);
-		    (void) Lst_AtEnd (gn->parents, pgn);
+		    Lst_AtEnd (pgn->children, gn);
+		    Lst_AtEnd (gn->parents, pgn);
 		    pgn->unmade += 1;
 		}
 	    }
@@ -489,7 +489,7 @@
 			    pgn->cmtime = cgn->mtime;
 			}
 		    } else {
-			(void)Make_TimeStamp (pgn, cgn);
+			Make_TimeStamp (pgn, cgn);
 		    }
 		}
 		if (pgn->unmade == 0) {
@@ -497,7 +497,7 @@
 		     * Queue the node up -- any unmade predecessors will
 		     * be dealt with in MakeStartJobs.
 		     */
-		    (void)Lst_EnQueue (toBeMade, (ClientData)pgn);
+		    Lst_EnQueue (toBeMade, (ClientData)pgn);
 		} else if (pgn->unmade < 0) {
 		    Error ("Graph cycles through %s", pgn->name);
 		}
@@ -517,7 +517,7 @@
 	if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
 	    Lst_Member(toBeMade, (ClientData)succ) == NILLNODE)
 	{
-	    (void)Lst_EnQueue(toBeMade, (ClientData)succ);
+	    Lst_EnQueue(toBeMade, (ClientData)succ);
 	}
     }
 
@@ -853,7 +853,7 @@
 	    if (gn->unmade != 0) {
 		Lst_ForEach (gn->children, MakeAddChild, (ClientData)examine);
 	    } else {
-		(void)Lst_EnQueue (toBeMade, (ClientData)gn);
+		Lst_EnQueue (toBeMade, (ClientData)gn);
 	    }
 	}
     }
@@ -875,7 +875,7 @@
 	 * the finishing of a job. So we fill the Job table as much as we can
 	 * before going into our loop.
 	 */
-	(void) MakeStartJobs();
+	MakeStartJobs();
     }
 
     /*
@@ -891,7 +891,7 @@
     while (!Job_Empty ()) {
 	Job_CatchOutput ();
 	Job_CatchChildren (!usePipes);
-	(void)MakeStartJobs();
+	MakeStartJobs();
     }
 
     errors = Job_End();
Index: make/parse.c
===================================================================
RCS file: /cvs/src/usr.bin/make/parse.c,v
retrieving revision 1.5
diff -u -u -r1.5 parse.c
--- make/parse.c	24 Oct 2004 22:43:58 -0000	1.5
+++ make/parse.c	7 Nov 2004 20:02:15 -0000
@@ -328,13 +328,13 @@
 	fmt = va_arg(ap, char *);
 #endif
 
-	(void)fprintf(stderr, "\"%s\", line %d: ", fname, lineno);
+	fprintf(stderr, "\"%s\", line %d: ", fname, lineno);
 	if (type == PARSE_WARNING)
-		(void)fprintf(stderr, "warning: ");
-	(void)vfprintf(stderr, fmt, ap);
+		fprintf(stderr, "warning: ");
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	(void)fflush(stderr);
+	fprintf(stderr, "\n");
+	fflush(stderr);
 	if (type == PARSE_FATAL)
 		fatals += 1;
 }
@@ -363,9 +363,9 @@
     GNode          *pgn = (GNode *) pgnp;
     GNode          *cgn = (GNode *) cgnp;
     if (Lst_Member (pgn->children, (ClientData)cgn) == NILLNODE) {
-	(void)Lst_AtEnd (pgn->children, (ClientData)cgn);
+	Lst_AtEnd (pgn->children, (ClientData)cgn);
 	if (specType == Not) {
-	    (void)Lst_AtEnd (cgn->parents, (ClientData)pgn);
+	    Lst_AtEnd (cgn->parents, (ClientData)pgn);
 	}
 	pgn->unmade += 1;
     }
@@ -432,7 +432,7 @@
 	 */
 	Lst_ForEach(gn->parents, ParseLinkSrc, (ClientData)cohort);
 	cohort->type = OP_DOUBLEDEP|OP_INVISIBLE;
-	(void)Lst_AtEnd(gn->cohorts, (ClientData)cohort);
+	Lst_AtEnd(gn->cohorts, (ClientData)cohort);
 
 	/*
 	 * Replace the node in the targets list with the new copy
@@ -480,8 +480,8 @@
 	 * but checking is tedious, and the debugging output can show the
 	 * problem
 	 */
-	(void)Lst_AtEnd(p->successors, (ClientData)s);
-	(void)Lst_AtEnd(s->preds, (ClientData)p);
+	Lst_AtEnd(p->successors, (ClientData)s);
+	Lst_AtEnd(s->preds, (ClientData)p);
 	return 0;
     }
     else
@@ -539,7 +539,7 @@
 	 * invoked if the user didn't specify a target on the command
 	 * line. This is to allow #ifmake's to succeed, or something...
 	 */
-	(void) Lst_AtEnd (create, (ClientData)estrdup(src));
+	Lst_AtEnd (create, (ClientData)estrdup(src));
 	/*
 	 * Add the name to the .TARGETS variable as well, so the user cna
 	 * employ that, if desired.
@@ -554,8 +554,8 @@
 	 */
 	gn = Targ_FindNode(src, TARG_CREATE);
 	if (predecessor != NILGNODE) {
-	    (void)Lst_AtEnd(predecessor->successors, (ClientData)gn);
-	    (void)Lst_AtEnd(gn->preds, (ClientData)predecessor);
+	    Lst_AtEnd(predecessor->successors, (ClientData)gn);
+	    Lst_AtEnd(gn->preds, (ClientData)predecessor);
 	}
 	/*
 	 * The current source now becomes the predecessor for the next one.
@@ -598,7 +598,7 @@
     }
 
     gn->order = waiting;
-    (void)Lst_AtEnd(allsrc, (ClientData)gn);
+    Lst_AtEnd(allsrc, (ClientData)gn);
     if (waiting) {
 	Lst_ForEach(allsrc, ParseAddDep, (ClientData)gn);
     }
@@ -873,7 +873,7 @@
 			if (paths == NULL) {
 			    paths = Lst_Init(FALSE);
 			}
-			(void)Lst_AtEnd(paths, (ClientData)dirSearchPath);
+			Lst_AtEnd(paths, (ClientData)dirSearchPath);
 			break;
 		    case Main:
 			if (!Lst_IsEmpty(create)) {
@@ -885,12 +885,12 @@
 		    case Interrupt:
 			gn = Targ_FindNode(line, TARG_CREATE);
 			gn->type |= OP_NOTMAIN;
-			(void)Lst_AtEnd(targets, (ClientData)gn);
+			Lst_AtEnd(targets, (ClientData)gn);
 			break;
 		    case Default:
 			gn = Targ_NewGN(".DEFAULT");
 			gn->type |= (OP_NOTMAIN|OP_TRANSFORM);
-			(void)Lst_AtEnd(targets, (ClientData)gn);
+			Lst_AtEnd(targets, (ClientData)gn);
 			DEFAULT = gn;
 			break;
 		    case NotParallel:
@@ -928,7 +928,7 @@
 		    if (paths == (Lst)NULL) {
 			paths = Lst_Init(FALSE);
 		    }
-		    (void)Lst_AtEnd(paths, (ClientData)path);
+		    Lst_AtEnd(paths, (ClientData)path);
 		}
 	    }
 	}
@@ -955,7 +955,7 @@
 		 * No wildcards, but we want to avoid code duplication,
 		 * so create a list with the word on it.
 		 */
-		(void)Lst_AtEnd(curTargs, (ClientData)line);
+		Lst_AtEnd(curTargs, (ClientData)line);
 	    }
 
 	    while(!Lst_IsEmpty(curTargs)) {
@@ -967,7 +967,7 @@
 		    gn = Suff_AddTransform (targName);
 		}
 
-		(void)Lst_AtEnd (targets, (ClientData)gn);
+		Lst_AtEnd (targets, (ClientData)gn);
 	    }
 	} else if (specType == ExPath && *line != '.' && *line != '\0') {
 	    Parse_Error(PARSE_WARNING, "Extra target (%s) ignored", line);
@@ -1378,8 +1378,8 @@
      * to ``unregister'' variables
      */
 #if __GNUC__
-    (void) &cp;
-    (void) &line;
+    &cp;
+    &line;
 #endif
 
     /*
@@ -1526,7 +1526,7 @@
     GNode *gn = (GNode *) gnp;
     /* if target already supplied, ignore commands */
     if (!(gn->type & OP_HAS_COMMANDS))
-	(void)Lst_AtEnd(gn->commands, cmd);
+	Lst_AtEnd(gn->commands, cmd);
     return(0);
 }
 
@@ -1765,7 +1765,7 @@
     oldFile->p = curPTR;
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront (includes, (ClientData)oldFile);
 
     /*
      * Once the previous state has been saved, we can get down to reading
@@ -1783,7 +1783,7 @@
 	/*
 	 * Pop to previous file
 	 */
-	(void) ParseEOF(0);
+	ParseEOF(0);
     } else {
 	Var_Append(".MAKEFILE_LIST", fullname, VAR_GLOBAL);
     }
@@ -1811,7 +1811,7 @@
     IFile         *oldFile;	/* state associated with this file */
 
     if (DEBUG(FOR))
-	(void) fprintf(stderr, "%s\n----\n", str);
+	fprintf(stderr, "%s\n----\n", str);
 
     oldFile = (IFile *) emalloc (sizeof (IFile));
     oldFile->lineno = lineno;
@@ -1819,7 +1819,7 @@
     oldFile->F = curFILE;
     oldFile->p = curPTR;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront (includes, (ClientData)oldFile);
 
     curFILE = NULL;
     curPTR = (PTR *) emalloc (sizeof (PTR));
@@ -1950,7 +1950,7 @@
     oldFile->p = curPTR;
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront (includes, (ClientData)oldFile);
 
     /*
      * Once the previous state has been saved, we can get down to reading
@@ -1968,7 +1968,7 @@
 	/*
 	 * Pop to previous file
 	 */
-	(void) ParseEOF(1);
+	ParseEOF(1);
     } else {
 	Var_Append(".MAKEFILE_LIST", fullname, VAR_GLOBAL);
     }
@@ -2006,7 +2006,7 @@
     fname = ifile->fname;
     lineno = ifile->lineno;
     if (opened && curFILE) {
-	(void) fclose (curFILE);
+	fclose (curFILE);
 	Var_Append(".MAKEFILE_LIST", "..", VAR_GLOBAL);
     }
     if (curPTR) {
@@ -2661,10 +2661,10 @@
 	Punt ("no target to make.");
     	/*NOTREACHED*/
     } else if (mainNode->type & OP_DOUBLEDEP) {
-	(void) Lst_AtEnd (listmain, (ClientData)mainNode);
+	Lst_AtEnd (listmain, (ClientData)mainNode);
 	Lst_Concat(listmain, mainNode->cohorts, LST_CONCNEW);
     }
     else
-	(void) Lst_AtEnd (listmain, (ClientData)mainNode);
+	Lst_AtEnd (listmain, (ClientData)mainNode);
     return (listmain);
 }
Index: make/str.c
===================================================================
RCS file: /cvs/src/usr.bin/make/str.c,v
retrieving revision 1.3
diff -u -u -r1.3 str.c
--- make/str.c	24 Oct 2004 22:43:58 -0000	1.3
+++ make/str.c	7 Nov 2004 20:02:15 -0000
@@ -116,8 +116,8 @@
 
 	/* free original strings */
 	if (flags & STR_DOFREE) {
-		(void)free(s1);
-		(void)free(s2);
+		free(s1);
+		free(s2);
 	}
 	return(result);
 }
Index: make/suff.c
===================================================================
RCS file: /cvs/src/usr.bin/make/suff.c,v
retrieving revision 1.5
diff -u -u -r1.5 suff.c
--- make/suff.c	24 Oct 2004 22:43:58 -0000	1.5
+++ make/suff.c	7 Nov 2004 20:02:15 -0000
@@ -420,16 +420,16 @@
 	if (DEBUG(SUFF)) {
 	    printf("at end of list\n");
 	}
-	(void)Lst_AtEnd (l, (ClientData)s);
+	Lst_AtEnd (l, (ClientData)s);
 	s->refCount++;
-	(void)Lst_AtEnd(s->ref, (ClientData) l);
+	Lst_AtEnd(s->ref, (ClientData) l);
     } else if (s2->sNum != s->sNum) {
 	if (DEBUG(SUFF)) {
 	    printf("before %s(%d)\n", s2->name, s2->sNum);
 	}
-	(void)Lst_Insert (l, ln, (ClientData)s);
+	Lst_Insert (l, ln, (ClientData)s);
 	s->refCount++;
-	(void)Lst_AtEnd(s->ref, (ClientData) l);
+	Lst_AtEnd(s->ref, (ClientData) l);
     } else if (DEBUG(SUFF)) {
 	printf("already there\n");
     }
@@ -602,7 +602,7 @@
 	 * by the Parse module.
 	 */
 	gn = Targ_NewGN (line);
-	(void)Lst_AtEnd (transforms, (ClientData)gn);
+	Lst_AtEnd (transforms, (ClientData)gn);
     } else {
 	/*
 	 * New specification for transformation rule. Just nuke the old list
@@ -619,7 +619,7 @@
 
     gn->type = OP_TRANSFORM;
 
-    (void)SuffParseTransform(line, &s, &t);
+    SuffParseTransform(line, &s, &t);
 
     /*
      * link the two together in the proper relationship and order
@@ -810,7 +810,7 @@
 	s->flags =  	0;
 	s->refCount =	0;
 
-	(void)Lst_AtEnd (sufflist, (ClientData)s);
+	Lst_AtEnd (sufflist, (ClientData)s);
 	/*
 	 * Look for any existing transformations from or to this suffix.
 	 * XXX: Only do this after a Suff_ClearSuffixes?
@@ -1015,7 +1015,7 @@
 	s->refCount++;
 	s2->children =	0;
 	targ->children += 1;
-	(void)Lst_AtEnd (ls->l, (ClientData)s2);
+	Lst_AtEnd (ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
 	s2->cp = Lst_Init(FALSE);
 	Lst_AtEnd(targ->cp, (ClientData) s2);
@@ -1033,7 +1033,7 @@
     s->refCount++;
     s2->children =  0;
     targ->children += 1;
-    (void)Lst_AtEnd (ls->l, (ClientData)s2);
+    Lst_AtEnd (ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
     s2->cp = Lst_Init(FALSE);
     Lst_AtEnd(targ->cp, (ClientData) s2);
@@ -1232,7 +1232,7 @@
     char    	  	*cp;
 
     t = targ->node;
-    (void) Lst_Open (t->children);
+    Lst_Open (t->children);
     prefLen = strlen (targ->pref);
 
     while ((ln = Lst_Next (t->children)) != NILLNODE) {
@@ -1353,7 +1353,7 @@
 		 */
 		char	*sacrifice = cp;
 
-		(void)Arch_ParseArchive(&sacrifice, members, pgn);
+		Arch_ParseArchive(&sacrifice, members, pgn);
 	    } else {
 		/*
 		 * Break the result into a vector of strings whose nodes
@@ -1375,7 +1375,7 @@
 			 */
 			*cp++ = '\0';
 			gn = Targ_FindNode(start, TARG_CREATE);
-			(void)Lst_AtEnd(members, (ClientData)gn);
+			Lst_AtEnd(members, (ClientData)gn);
 			while (*cp == ' ' || *cp == '\t') {
 			    cp++;
 			}
@@ -1414,7 +1414,7 @@
 		     * Stuff left over -- add it to the list too
 		     */
 		    gn = Targ_FindNode(start, TARG_CREATE);
-		    (void)Lst_AtEnd(members, (ClientData)gn);
+		    Lst_AtEnd(members, (ClientData)gn);
 		}
 		/*
 		 * Point cp back at the beginning again so the variable value
@@ -1432,9 +1432,9 @@
 		    printf("%s...", gn->name);
 		}
 		if (Lst_Member(pgn->children, (ClientData)gn) == NILLNODE) {
-		    (void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
+		    Lst_Append(pgn->children, prevLN, (ClientData)gn);
 		    prevLN = Lst_Succ(prevLN);
-		    (void)Lst_AtEnd(gn->parents, (ClientData)pgn);
+		    Lst_AtEnd(gn->parents, (ClientData)pgn);
 		    pgn->unmade++;
 		}
 	    }
@@ -1509,9 +1509,9 @@
 	     * up the parent's count of unmade children.
 	     */
 	    if (Lst_Member(pgn->children, (ClientData)gn) == NILLNODE) {
-		(void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
+		Lst_Append(pgn->children, prevLN, (ClientData)gn);
 		prevLN = Lst_Succ(prevLN);
-		(void)Lst_AtEnd(gn->parents, (ClientData)pgn);
+		Lst_AtEnd(gn->parents, (ClientData)pgn);
 		pgn->unmade++;
 	    }
 	}
@@ -1570,8 +1570,8 @@
 	 * Not already linked, so form the proper links between the
 	 * target and source.
 	 */
-	(void)Lst_AtEnd(tGn->children, (ClientData)sGn);
-	(void)Lst_AtEnd(sGn->parents, (ClientData)tGn);
+	Lst_AtEnd(tGn->children, (ClientData)sGn);
+	Lst_AtEnd(sGn->parents, (ClientData)tGn);
 	tGn->unmade += 1;
     }
 
@@ -1590,8 +1590,8 @@
 		 * Not already linked, so form the proper links between the
 		 * target and source.
 		 */
-		(void)Lst_AtEnd(tGn->children, (ClientData)gn);
-		(void)Lst_AtEnd(gn->parents, (ClientData)tGn);
+		Lst_AtEnd(tGn->children, (ClientData)gn);
+		Lst_AtEnd(gn->parents, (ClientData)tGn);
 		tGn->unmade += 1;
 	    }
 	}
@@ -1626,7 +1626,7 @@
     /*
      * Pass the buck to Make_HandleUse to apply the rule
      */
-    (void)Make_HandleUse(gn, tGn);
+    Make_HandleUse(gn, tGn);
 
     /*
      * Deal with wildcards and variables in any acquired sources
@@ -1641,7 +1641,7 @@
      * Keep track of another parent to which this beast is transformed so
      * the .IMPSRC variable can be set correctly for the parent.
      */
-    (void)Lst_AtEnd(sGn->iParents, (ClientData)tGn);
+    Lst_AtEnd(sGn->iParents, (ClientData)tGn);
 
     return(TRUE);
 }
@@ -1702,8 +1702,8 @@
      * Create the link between the two nodes right off
      */
     if (Lst_Member(gn->children, (ClientData)mem) == NILLNODE) {
-	(void)Lst_AtEnd(gn->children, (ClientData)mem);
-	(void)Lst_AtEnd(mem->parents, (ClientData)gn);
+	Lst_AtEnd(gn->children, (ClientData)mem);
+	Lst_AtEnd(mem->parents, (ClientData)gn);
 	gn->unmade += 1;
     }
 
@@ -1886,7 +1886,7 @@
 	    /*
 	     * Record the target so we can nuke it
 	     */
-	    (void)Lst_AtEnd(targs, (ClientData)targ);
+	    Lst_AtEnd(targs, (ClientData)targ);
 
 	    /*
 	     * Search from this suffix's successor...
@@ -1929,7 +1929,7 @@
 	if (DEBUG(SUFF))
 	    printf("adding suffix rules\n");
 
-	(void)Lst_AtEnd(targs, (ClientData)targ);
+	Lst_AtEnd(targs, (ClientData)targ);
     }
 
     /*
Index: make/targ.c
===================================================================
RCS file: /cvs/src/usr.bin/make/targ.c,v
retrieving revision 1.3
diff -u -u -r1.3 targ.c
--- make/targ.c	3 Nov 2003 19:31:30 -0000	1.3
+++ make/targ.c	7 Nov 2004 20:02:15 -0000
@@ -253,7 +253,7 @@
 	if (isNew) {
 	    gn = Targ_NewGN (name);
 	    Hash_SetValue (he, gn);
-	    (void) Lst_AtEnd (allTargets, (ClientData)gn);
+	    Lst_AtEnd (allTargets, (ClientData)gn);
 	}
     } else {
 	he = Hash_FindEntry (&targets, name);
@@ -306,9 +306,9 @@
 	     * are added to the list in the order in which they were
 	     * encountered in the makefile.
 	     */
-	    (void) Lst_AtEnd (nodes, (ClientData)gn);
+	    Lst_AtEnd (nodes, (ClientData)gn);
 	    if (gn->type & OP_DOUBLEDEP) {
-		(void)Lst_Concat (nodes, gn->cohorts, LST_CONCNEW);
+		Lst_Concat (nodes, gn->cohorts, LST_CONCNEW);
 	    }
 	} else if (flags == TARG_NOCREATE) {
 	    Error ("\"%s\" -- target unknown.", name);
Index: make/util.c
===================================================================
RCS file: /cvs/src/usr.bin/make/util.c,v
retrieving revision 1.2
diff -u -u -r1.2 util.c
--- make/util.c	17 Jun 2003 04:29:29 -0000	1.2
+++ make/util.c	7 Nov 2004 20:02:15 -0000
@@ -70,7 +70,7 @@
     int len = strlen(name) + strlen(value) + 2; /* = \0 */
     char *ptr = (char*) malloc(len);
 
-    (void) dum;
+    dum;
 
     if (ptr == NULL)
 	return -1;
@@ -134,7 +134,7 @@
 {
     struct sigvec osv, sv;
 
-    (void) sigvector(s, (struct sigvec *) 0, &osv);
+    sigvector(s, (struct sigvec *) 0, &osv);
     sv = osv;
     sv.sv_handler = a;
 #ifdef SV_BSDSIG
@@ -183,7 +183,7 @@
 
     /* find the inode of root */
     if (stat("/", &st_root) == -1) {
-	(void) sprintf(pathname,
+	sprintf(pathname,
 			"getwd: Cannot stat \"/\" (%s)", strerror(errno));
 	return (NULL);
     }
@@ -194,7 +194,7 @@
 
     /* find the inode of the current directory */
     if (lstat(".", &st_cur) == -1) {
-	(void) sprintf(pathname,
+	sprintf(pathname,
 			"getwd: Cannot stat \".\" (%s)", strerror(errno));
 	return (NULL);
     }
@@ -206,7 +206,7 @@
 	/* look if we found root yet */
 	if (st_cur.st_ino == st_root.st_ino &&
 	    DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
-	    (void) strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
+	    strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
 	    return (pathname);
 	}
 
@@ -239,11 +239,11 @@
 	    for (d = readdir(dp); d != NULL; d = readdir(dp)) {
 		if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
 		    continue;
-		(void) strcpy(cur_name_add, d->d_name);
+		strcpy(cur_name_add, d->d_name);
 		if (lstat(nextpathptr, &st_next) == -1) {
 		    snprintf(pathname, sizeof(pathname), "getwd: Cannot stat \"%s\" (%s)",
 				    d->d_name, strerror(errno));
-		    (void) closedir(dp);
+		    closedir(dp);
 		    return (NULL);
 		}
 		/* check if we found it yet */
@@ -253,15 +253,15 @@
 	    }
 	}
 	if (d == NULL) {
-	    (void) sprintf(pathname, "getwd: Cannot find \".\" in \"..\"");
-	    (void) closedir(dp);
+	    sprintf(pathname, "getwd: Cannot find \".\" in \"..\"");
+	    closedir(dp);
 	    return (NULL);
 	}
 	st_cur = st_dotdot;
 	pathptr = strrcpy(pathptr, d->d_name);
 	pathptr = strrcpy(pathptr, "/");
 	nextpathptr = strrcpy(nextpathptr, "../");
-	(void) closedir(dp);
+	closedir(dp);
 	*cur_name_add = '\0';
     }
 } /* end getwd */
Index: make/var.c
===================================================================
RCS file: /cvs/src/usr.bin/make/var.c,v
retrieving revision 1.5
diff -u -u -r1.5 var.c
--- make/var.c	19 Apr 2004 17:44:53 -0000	1.5
+++ make/var.c	7 Nov 2004 20:02:15 -0000
@@ -371,8 +371,8 @@
 
     v->flags = 0;
 
-    (void) Lst_AtFront (ctxt->context, (ClientData)v);
-    (void) Lst_AtEnd (allVars, (ClientData) v);
+    Lst_AtFront (ctxt->context, (ClientData)v);
+    Lst_AtEnd (allVars, (ClientData) v);
     if (DEBUG(VAR)) {
 	printf("%s:%s = %s\n", ctxt->name, name, val);
     }
Index: mesg/mesg.c
===================================================================
RCS file: /cvs/src/usr.bin/mesg/mesg.c,v
retrieving revision 1.3
diff -u -u -r1.3 mesg.c
--- mesg/mesg.c	4 Oct 2003 20:36:49 -0000	1.3
+++ mesg/mesg.c	7 Nov 2004 20:02:15 -0000
@@ -75,10 +75,10 @@
 
 	if (*argv == NULL) {
 		if (sb.st_mode & S_IWGRP) {
-			(void)fprintf(stderr, "is y\n");
+			fprintf(stderr, "is y\n");
 			exit(0);
 		}
-		(void)fprintf(stderr, "is n\n");
+		fprintf(stderr, "is n\n");
 		exit(1);
 	}
 
@@ -100,6 +100,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: mesg [y | n]\n");
+	fprintf(stderr, "usage: mesg [y | n]\n");
 	exit(2);
 }
Index: mkfifo/mkfifo.c
===================================================================
RCS file: /cvs/src/usr.bin/mkfifo/mkfifo.c,v
retrieving revision 1.3
diff -u -u -r1.3 mkfifo.c
--- mkfifo/mkfifo.c	4 Oct 2003 20:36:49 -0000	1.3
+++ mkfifo/mkfifo.c	7 Nov 2004 20:02:15 -0000
@@ -99,6 +99,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: mkfifo [-m mode] fifo_name ...\n");
+	fprintf(stderr, "usage: mkfifo [-m mode] fifo_name ...\n");
 	exit(1);
 }
Index: msgs/msgs.c
===================================================================
RCS file: /cvs/src/usr.bin/msgs/msgs.c,v
retrieving revision 1.3
diff -u -u -r1.3 msgs.c
--- msgs/msgs.c	4 Oct 2003 20:36:49 -0000	1.3
+++ msgs/msgs.c	7 Nov 2004 20:02:15 -0000
@@ -482,7 +482,7 @@
 		 */
 		if (totty)
 			signal(SIGTSTP, onsusp);
-		(void) setjmp(tstpbuf);
+		setjmp(tstpbuf);
 		already = YES;
 		nlines = 2;
 		if (seenfrom) {
@@ -729,7 +729,7 @@
 	printf("%s ", prompt);
 	fflush(stdout);
 	intrpflg = NO;
-	(void) fgets(inbuf, sizeof inbuf, stdin);
+	fgets(inbuf, sizeof inbuf, stdin);
 	if ((n = strlen(inbuf)) > 0 && inbuf[n - 1] == '\n')
 		inbuf[n - 1] = '\0';
 	if (intrpflg)
Index: mt/mt.c
===================================================================
RCS file: /cvs/src/usr.bin/mt/mt.c,v
retrieving revision 1.5
diff -u -u -r1.5 mt.c
--- mt/mt.c	22 Jan 2004 03:22:53 -0000	1.5
+++ mt/mt.c	7 Nov 2004 20:02:15 -0000
@@ -231,33 +231,33 @@
 
 			if (ioctl(mtfd, comp->c_code, (caddr_t)&umn) < 0)
 				err(2, "%s", tape);
-			(void)printf("Last I/O Residual: %u\n", s->io_resid);
-			(void)printf(" Last I/O Command:");
+			printf("Last I/O Residual: %u\n", s->io_resid);
+			printf(" Last I/O Command:");
 			for (i = 0; i < sizeof (s->io_cdb); i++)
-				(void)printf(" %02X", s->io_cdb[i]);
-			(void)printf("\n");
-			(void)printf("   Last I/O Sense:\n\n\t");
+				printf(" %02X", s->io_cdb[i]);
+			printf("\n");
+			printf("   Last I/O Sense:\n\n\t");
 			for (i = 0; i < sizeof (s->io_sense); i++) {
-				(void)printf(" %02X", s->io_sense[i]);
+				printf(" %02X", s->io_sense[i]);
 				if (((i + 1) & 0xf) == 0) {
-					(void)printf("\n\t");
+					printf("\n\t");
 				}
 			}
-			(void)printf("\n");
-			(void)printf("Last Control Residual: %u\n",
+			printf("\n");
+			printf("Last Control Residual: %u\n",
 			    s->ctl_resid);
-			(void)printf(" Last Control Command:");
+			printf(" Last Control Command:");
 			for (i = 0; i < sizeof (s->ctl_cdb); i++)
-				(void)printf(" %02X", s->ctl_cdb[i]);
-			(void)printf("\n");
-			(void)printf("   Last Control Sense:\n\n\t");
+				printf(" %02X", s->ctl_cdb[i]);
+			printf("\n");
+			printf("   Last Control Sense:\n\n\t");
 			for (i = 0; i < sizeof (s->ctl_sense); i++) {
-				(void)printf(" %02X", s->ctl_sense[i]);
+				printf(" %02X", s->ctl_sense[i]);
 				if (((i + 1) & 0xf) == 0) {
-					(void)printf("\n\t");
+					printf("\n\t");
 				}
 			}
-			(void)printf("\n\n");
+			printf("\n\n");
 			exit(0);
 			/* NOTREACHED */
 		}
@@ -267,7 +267,7 @@
 			u_int32_t block;
 			if (ioctl(mtfd, comp->c_code, (caddr_t)&block) < 0)
 				err(2, "%s", tape);
-			(void)printf("%s: %s block location %u\n", tape,
+			printf("%s: %s block location %u\n", tape,
 			    (comp->c_code == MTIOCRDHPOS)? "hardware" :
 			    "logical", block);
 			exit(0);
@@ -287,7 +287,7 @@
 			u_int32_t om;
 			if (ioctl(mtfd, MTIOCGETEOTMODEL, (caddr_t)&om) < 0)
 				err(2, "%s", tape);
-			(void)printf("%s: the model is %u filemar%s at EOT\n",
+			printf("%s: the model is %u filemar%s at EOT\n",
 			    tape, om, (om > 1)? "ks" : "k");
 			exit(0);
 			/* NOTREACHED */
@@ -299,9 +299,9 @@
 				err(2, "%s", tape);
 			if (ioctl(mtfd, comp->c_code, (caddr_t)&nm) < 0)
 				err(2, "%s", tape);
-			(void)printf("%s: old model was %u filemar%s at EOT\n",
+			printf("%s: old model was %u filemar%s at EOT\n",
 			    tape, om, (om > 1)? "ks" : "k");
-			(void)printf("%s: new model  is %u filemar%s at EOT\n",
+			printf("%s: new model  is %u filemar%s at EOT\n",
 			    tape, nm, (nm > 1)? "ks" : "k");
 			exit(0);
 			/* NOTREACHED */
@@ -392,7 +392,7 @@
 
 	for (mt = tapes;; mt++) {
 		if (mt->t_type == 0) {
-			(void)printf("%d: unknown tape drive type\n",
+			printf("%d: unknown tape drive type\n",
 			    bp->mt_type);
 			return;
 		}
@@ -404,10 +404,10 @@
 		st_status(bp);
 	else {
 #endif /* defined (__DragonFly__) */
-	(void)printf("%s tape drive, residual=%d\n", mt->t_name, bp->mt_resid);
+	printf("%s tape drive, residual=%d\n", mt->t_name, bp->mt_resid);
 	printreg("ds", (unsigned short)bp->mt_dsreg, mt->t_dsbits);
 	printreg("\ner", (unsigned short)bp->mt_erreg, mt->t_erbits);
-	(void)putchar('\n');
+	putchar('\n');
 #if defined (__DragonFly__)
 	}
 #endif /* defined (__DragonFly__) */
@@ -449,7 +449,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: mt [-f device] command [ count ]\n");
+	fprintf(stderr, "usage: mt [-f device] command [ count ]\n");
 	exit(1);
 }
 
@@ -695,7 +695,7 @@
 			printf(sfmt, "Loading");
 			break;
 		default:
-			(void) sprintf(foo, "Unknown state 0x%x", bp->mt_dsreg);
+			sprintf(foo, "Unknown state 0x%x", bp->mt_dsreg);
 			printf(sfmt, foo);
 			break;
 		}
Index: netstat/atalk.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/atalk.c,v
retrieving revision 1.2
diff -u -u -r1.2 atalk.c
--- netstat/atalk.c	17 Jun 2003 04:29:30 -0000	1.2
+++ netstat/atalk.c	7 Nov 2004 20:02:15 -0000
@@ -112,15 +112,15 @@
 		return "????";
 	default:
 		if (numeric_port) {
-			(void)snprintf(mybuf, sizeof(mybuf), "%d",
+			snprintf(mybuf, sizeof(mybuf), "%d",
 			    (unsigned int)sat->sat_port);
 		} else {
 			serv = getservbyport(sat->sat_port, "ddp");
 			if (serv == NULL)
-				(void)snprintf(mybuf, sizeof(mybuf), "%d",
+				snprintf(mybuf, sizeof(mybuf), "%d",
 				    (unsigned int) sat->sat_port);
 			else
-				(void) snprintf(mybuf, sizeof(mybuf), "%s",
+				snprintf(mybuf, sizeof(mybuf), "%s",
 				    serv->s_name);
 		}
 	}
Index: netstat/if.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/if.c,v
retrieving revision 1.7
diff -u -u -r1.7 if.c
--- netstat/if.c	30 Aug 2004 18:06:49 -0000	1.7
+++ netstat/if.c	7 Nov 2004 20:02:15 -0000
@@ -563,9 +563,9 @@
 	memset(sum, 0, sizeof(struct iftot));
 
 
-	(void)signal(SIGALRM, catchalarm);
+	signal(SIGALRM, catchalarm);
 	signalled = NO;
-	(void)alarm(interval);
+	alarm(interval);
 	first = 1;
 banner:
 	printf("%17s %14s %16s", "input",
@@ -654,7 +654,7 @@
 	}
 	sigsetmask(oldmask);
 	signalled = NO;
-	(void)alarm(interval);
+	alarm(interval);
 	line++;
 	first = 0;
 	if (line == 21)
Index: netstat/inet6.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/inet6.c,v
retrieving revision 1.4
diff -u -u -r1.4 inet6.c
--- netstat/inet6.c	30 Aug 2004 18:06:50 -0000	1.4
+++ netstat/inet6.c	7 Nov 2004 20:02:15 -0000
@@ -1080,7 +1080,7 @@
 		first = 0;
 		if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
 		    (cp = strchr(domain, '.')))
-			(void) strcpy(domain, cp + 1);
+			strcpy(domain, cp + 1);
 		else
 			domain[0] = 0;
 	}
Index: netstat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.6
diff -u -u -r1.6 main.c
--- netstat/main.c	8 Mar 2004 22:41:05 -0000	1.6
+++ netstat/main.c	7 Nov 2004 20:02:15 -0000
@@ -730,7 +730,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 "usage: netstat [-AaLnSW] [-f protocol_family | -p protocol]\n"
 "               [-M core] [-N system]",
 "       netstat -i | -I interface [-abdnt] [-f address_family]\n"
Index: netstat/route.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/route.c,v
retrieving revision 1.6
diff -u -u -r1.6 route.c
--- netstat/route.c	14 Sep 2004 00:27:18 -0000	1.6
+++ netstat/route.c	7 Nov 2004 20:02:15 -0000
@@ -655,7 +655,7 @@
 
 		if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 &&
 		    sdl->sdl_slen == 0)
-			(void) sprintf(workbuf, "link#%d", sdl->sdl_index);
+			sprintf(workbuf, "link#%d", sdl->sdl_index);
 		else
 			switch (sdl->sdl_type) {
 
Index: newkey/newkey.c
===================================================================
RCS file: /cvs/src/usr.bin/newkey/newkey.c,v
retrieving revision 1.3
diff -u -u -r1.3 newkey.c
--- newkey/newkey.c	4 Oct 2003 20:36:49 -0000	1.3
+++ newkey/newkey.c	7 Nov 2004 20:02:15 -0000
@@ -112,19 +112,19 @@
 		pw = getpwnam(argv[2]);
 		if (pw == NULL)
 			errx(1, "unknown user: %s", argv[2]);
-		(void)user2netname(name, (int)pw->pw_uid, (char *)NULL);
+		user2netname(name, (int)pw->pw_uid, (char *)NULL);
 	} else {
 #ifdef undef
 		h = gethostbyname(argv[2]);
 		if (h == NULL)
 			errx(1, "unknown host: %s", argv[1]);
-		(void)host2netname(name, h->h_name, (char *)NULL);
+		host2netname(name, h->h_name, (char *)NULL);
 #else
-		(void)host2netname(name, argv[2], (char *)NULL);
+		host2netname(name, argv[2], (char *)NULL);
 #endif
 	}
 
-	(void)printf("Adding new key for %s.\n", name);
+	printf("Adding new key for %s.\n", name);
 	pass = getpass("New password:");
 	genkeys(public, secret, pass);
 
@@ -140,7 +140,7 @@
 		errx(1, "password incorrect");
 
 #ifdef YP
-	(void)printf("Please wait for the database to get updated...\n");
+	printf("Please wait for the database to get updated...\n");
 #endif
 	if ((status = setpublicmap(name, public, crypt1))) {
 #ifdef YP
@@ -151,7 +151,7 @@
 			status, err_string(status));
 #endif
 	}
-	(void)printf("Your new key has been successfully stored away.\n");
+	printf("Your new key has been successfully stored away.\n");
 	exit(0);
 	/* NOTREACHED */
 }
@@ -159,7 +159,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n",
 		"usage: newkey [-u username]",
 		"       newkey [-h hostname]");
 	exit(1);
@@ -172,7 +172,7 @@
 {
 	char pkent[1024];
 
-	(void)sprintf(pkent, "%s:%s", public, secret);
+	sprintf(pkent, "%s:%s", public, secret);
 #ifdef YP
 	return (mapupdate(name, PKMAP, YPOP_STORE,
 		strlen(name), name, strlen(pkent), pkent));
Index: newkey/update.c
===================================================================
RCS file: /cvs/src/usr.bin/newkey/update.c,v
retrieving revision 1.3
diff -u -u -r1.3 update.c
--- newkey/update.c	4 Oct 2003 20:36:49 -0000	1.3
+++ newkey/update.c	7 Nov 2004 20:02:15 -0000
@@ -99,7 +99,7 @@
 #ifdef DEBUG
 	printf("%s %s\n", key, data);
 #endif
-	(void)sprintf(updater, "make -s -f %s/%s %s", YPDBPATH, /* !!! */
+	sprintf(updater, "make -s -f %s/%s %s", YPDBPATH, /* !!! */
 					UPDATEFILE, mapname);
 	pid = _openchild(updater, &childargs, &childrslt);
 	if (pid < 0) {
@@ -109,23 +109,23 @@
 	/*
 	 * Write to child
 	 */
-	(void)fprintf(childargs, "%s\n", requester);
-	(void)fprintf(childargs, "%u\n", op);
-	(void)fprintf(childargs, "%u\n", keylen);
-	(void)fwrite(key, (int)keylen, 1, childargs);
-	(void)fprintf(childargs, "\n");
-	(void)fprintf(childargs, "%u\n", datalen);
-	(void)fwrite(data, (int)datalen, 1, childargs);
-	(void)fprintf(childargs, "\n");
-	(void)fclose(childargs);
+	fprintf(childargs, "%s\n", requester);
+	fprintf(childargs, "%u\n", op);
+	fprintf(childargs, "%u\n", keylen);
+	fwrite(key, (int)keylen, 1, childargs);
+	fprintf(childargs, "\n");
+	fprintf(childargs, "%u\n", datalen);
+	fwrite(data, (int)datalen, 1, childargs);
+	fprintf(childargs, "\n");
+	fclose(childargs);
 
 	/*
 	 * Read from child
 	 */
-	(void)fscanf(childrslt, "%d", &yperrno);
-	(void)fclose(childrslt);
+	fscanf(childrslt, "%d", &yperrno);
+	fclose(childrslt);
 
-	(void)wait(&status);
+	wait(&status);
 #ifdef WEXITSTATUS
 	if (WEXITSTATUS(status) != 0) {
 #else
@@ -163,19 +163,19 @@
 		/*
 		 * child: read from pdto[0], write into pdfrom[1]
 		 */
-		(void)close(0);
-		(void)dup(pdto[0]);
-		(void)close(1);
-		(void)dup(pdfrom[1]);
+		close(0);
+		dup(pdto[0]);
+		close(1);
+		dup(pdfrom[1]);
 		getrlimit(RLIMIT_NOFILE, &rl);
 		for (i = rl.rlim_max - 1; i >= 3; i--) {
-			(void) close(i);
+			close(i);
 		}
 		com = malloc((unsigned) strlen(command) + 6);
 		if (com == NULL) {
 			_exit(~0);
 		}
-		(void)sprintf(com, "exec %s", command);
+		sprintf(com, "exec %s", command);
 		execl(SHELL, basename(SHELL), "-c", com, NULL);
 		_exit(~0);
 
@@ -184,9 +184,9 @@
 		 * parent: write into pdto[1], read from pdfrom[0]
 		 */
 		*fto = fdopen(pdto[1], "w");
-		(void)close(pdto[0]);
+		close(pdto[0]);
 		*ffrom = fdopen(pdfrom[0], "r");
-		(void)close(pdfrom[1]);
+		close(pdfrom[1]);
 		break;
 	}
 	return (pid);
@@ -195,11 +195,11 @@
 	 * error cleanup and return
 	 */
 error3:
-	(void)close(pdfrom[0]);
-	(void)close(pdfrom[1]);
+	close(pdfrom[0]);
+	close(pdfrom[1]);
 error2:
-	(void)close(pdto[0]);
-	(void)close(pdto[1]);
+	close(pdto[0]);
+	close(pdto[1]);
 error1:
 	return (-1);
 }
Index: nfsstat/nfsstat.c
===================================================================
RCS file: /cvs/src/usr.bin/nfsstat/nfsstat.c,v
retrieving revision 1.4
diff -u -u -r1.4 nfsstat.c
--- nfsstat/nfsstat.c	16 Jul 2004 00:55:04 -0000	1.4
+++ nfsstat/nfsstat.c	7 Nov 2004 20:02:15 -0000
@@ -426,7 +426,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: nfsstat [-csW] [-M core] [-N system] [-w interval]\n");
 	exit(1);
 }
Index: nice/nice.c
===================================================================
RCS file: /cvs/src/usr.bin/nice/nice.c,v
retrieving revision 1.3
diff -u -u -r1.3 nice.c
--- nice/nice.c	4 Oct 2003 20:36:49 -0000	1.3
+++ nice/nice.c	7 Nov 2004 20:02:15 -0000
@@ -99,6 +99,6 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: nice [-n incr] utility [arguments]\n");
+	fprintf(stderr, "usage: nice [-n incr] utility [arguments]\n");
 	exit(1);
 }
Index: nl/nl.c
===================================================================
RCS file: /cvs/src/usr.bin/nl/nl.c,v
retrieving revision 1.3
diff -u -u -r1.3 nl.c
--- nl/nl.c	4 Oct 2003 20:36:49 -0000	1.3
+++ nl/nl.c	7 Nov 2004 20:02:15 -0000
@@ -144,7 +144,7 @@
 	char *ep;
 	size_t intbuffersize;
 
-	(void)setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	while ((c = getopt(argc, argv, "pb:d:f:h:i:l:n:s:v:w:")) != -1) {
 		switch (c) {
@@ -281,7 +281,7 @@
 	line = startnum;
 	section = BODY;
 #ifdef __GNUC__
-	(void)&donumber;	/* avoid bogus `uninitialized' warning */
+	&donumber;	/* avoid bogus `uninitialized' warning */
 #endif
 
 	while (fgets(buffer, (int)buffersize, stdin) != NULL) {
@@ -330,13 +330,13 @@
 		if (donumber) {
 			/* Note: sprintf() is safe here. */
 			consumed = sprintf(intbuffer, format, width, line);
-			(void)printf("%s",
+			printf("%s",
 			    intbuffer + max(0, consumed - width));
 			line += incr;
 		} else {
-			(void)printf("%*s", width, "");
+			printf("%*s", width, "");
 		}
-		(void)printf("%s%s", sep, buffer);
+		printf("%s%s", sep, buffer);
 
 		if (ferror(stdout))
 			err(EXIT_FAILURE, "output error");
@@ -378,7 +378,7 @@
 		/* Compile/validate the supplied regular expression. */
 		if ((error = regcomp(&numbering_properties[section].expr,
 		    &argstr[1], REG_NEWLINE|REG_NOSUB)) != 0) {
-			(void)regerror(error,
+			regerror(error,
 			    &numbering_properties[section].expr,
 			    errorbuf, sizeof (errorbuf));
 			errx(EXIT_FAILURE,
@@ -398,7 +398,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: nl [-p] [-b type] [-d delim] [-f type] \
+	fprintf(stderr, "usage: nl [-p] [-b type] [-d delim] [-f type] \
 [-h type] [-i incr] [-l num]\n\t[-n format] [-s sep] [-v startnum] [-w width] \
 [file]\n");
 	exit(EXIT_FAILURE);
Index: nm/nm.c
===================================================================
RCS file: /cvs/src/usr.bin/nm/nm.c,v
retrieving revision 1.3
diff -u -u -r1.3 nm.c
--- nm/nm.c	4 Oct 2003 20:36:50 -0000	1.3
+++ nm/nm.c	7 Nov 2004 20:02:15 -0000
@@ -161,7 +161,7 @@
 	}
 
 	if (fcount > 1 && !table)
-		(void)printf("\n%s:\n", fname);
+		printf("\n%s:\n", fname);
 
 	/*
 	 * first check whether this is an object file - read a object
@@ -169,7 +169,7 @@
 	 */
 	if (fread((char *)&exec_head, sizeof(exec_head), (size_t)1, fp) != 1) {
 		warnx("%s: bad format", fname);
-		(void)fclose(fp);
+		fclose(fp);
 		return(1);
 	}
 	rewind(fp);
@@ -179,13 +179,13 @@
 		if (fread(magic, sizeof(magic), (size_t)1, fp) != 1 ||
 		    strncmp(magic, ARMAG, SARMAG)) {
 			warnx("%s: not object file or archive", fname);
-			(void)fclose(fp);
+			fclose(fp);
 			return(1);
 		}
 		retval = show_archive(fname, fp);
 	} else
 		retval = show_objfile(fname, fp);
-	(void)fclose(fp);
+	fclose(fp);
 	return(retval);
 }
 
@@ -228,7 +228,7 @@
 		/* bad archive entry - stop processing this archive */
 		if (strncmp(ar_head.ar_fmag, ARFMAG, sizeof(ar_head.ar_fmag))) {
 			warnx("%s: bad format archive header", fname);
-			(void)free(name);
+			free(name);
 			return(1);
 		}
 
@@ -254,7 +254,7 @@
 			if (fread(ar_name, 1, len, fp) != len)
 			{
 				warnx("EOF reading format 1 long name");
-				(void)free(name);
+				free(name);
 				return(1);
 			}
 			ar_name[len] = 0;
@@ -284,7 +284,7 @@
 		/* get and check current object's header */
 		if (fread((char *)&exec_head, sizeof(exec_head), (size_t)1, fp) != 1) {
 			warnx("%s: premature EOF", name);
-			(void)free(name);
+			free(name);
 			return(1);
 		}
 
@@ -294,10 +294,10 @@
 				rval = 1;
 			}
 		} else {
-			(void)fseek(fp, -(long)sizeof(exec_head),
+			fseek(fp, -(long)sizeof(exec_head),
 			    SEEK_CUR);
 			if (!print_file_each_line && !table)
-				(void)printf("\n%s:\n", name);
+				printf("\n%s:\n", name);
 			rval |= show_objfile(name, fp);
 		}
 
@@ -309,11 +309,11 @@
 skip:		if (fseek(fp, last_ar_off + even(atol(ar_head.ar_size)),
 		    SEEK_SET)) {
 			warn("%s", fname);
-			(void)free(name);
+			free(name);
 			return(1);
 		}
 	}
-	(void)free(name);
+	free(name);
 	return(rval);
 }
 
@@ -369,7 +369,7 @@
 	nrawnames = head.a_syms / sizeof(*names);
 	if (fread((char *)names, (size_t)head.a_syms, (size_t)1, fp) != 1) {
 		warnx("%s: cannot read symbol table", objname);
-		(void)free((char *)names);
+		free((char *)names);
 		return(1);
 	}
 
@@ -380,7 +380,7 @@
 	 */
 	if (fread((char *)&stabsize, sizeof(stabsize), (size_t)1, fp) != 1) {
 		warnx("%s: cannot read stab size", objname);
-		(void)free((char *)names);
+		free((char *)names);
 		return(1);
 	}
 	stab = emalloc((size_t)stabsize);
@@ -392,8 +392,8 @@
 	stabsize -= 4;		/* we already have the size */
 	if (fread(stab + 4, (size_t)stabsize, (size_t)1, fp) != 1) {
 		warnx("%s: stab truncated..", objname);
-		(void)free((char *)names);
-		(void)free(stab);
+		free((char *)names);
+		free(stab);
 		return(1);
 	}
 
@@ -438,8 +438,8 @@
 	for (np = names, i = 0; i < nnames; np++, i++)
 		print_symbol(objname, np);
 
-	(void)free((char *)names);
-	(void)free(stab);
+	free((char *)names);
+	free(stab);
 	return(0);
 }
 
@@ -455,10 +455,10 @@
 	if (table) {
 		printf("%s|", objname);
 		if (SYMBOL_TYPE(sym->n_type) != N_UNDF)
-			(void)printf("%08lx", (u_long)sym->n_value);
-		(void)printf("|");
+			printf("%08lx", (u_long)sym->n_value);
+		printf("|");
 		if (IS_DEBUGGER_SYMBOL(sym->n_type))
-			(void)printf("-|%02x %04x %5s|", sym->n_other,
+			printf("-|%02x %04x %5s|", sym->n_other,
 			    sym->n_desc&0xffff, typestring(sym->n_type));
 		else {
 			putchar(typeletter(sym->n_type));
@@ -468,30 +468,30 @@
 		}
 
 		/* print the symbol's name */
-		(void)printf("%s\n",sym->n_un.n_name);
+		printf("%s\n",sym->n_un.n_name);
 		return;
 	}
 	if (print_file_each_line)
-		(void)printf("%s:", objname);
+		printf("%s:", objname);
 
 	/*
 	 * handle undefined-only format separately (no space is
 	 * left for symbol values, no type field is printed)
 	 */
 	if (print_only_undefined_symbols) {
-		(void)puts(sym->n_un.n_name);
+		puts(sym->n_un.n_name);
 		return;
 	}
 
 	/* print symbol's value */
 	if (SYMBOL_TYPE(sym->n_type) == N_UNDF)
-		(void)printf("        ");
+		printf("        ");
 	else
-		(void)printf("%08lx", (u_long)sym->n_value);
+		printf("%08lx", (u_long)sym->n_value);
 
 	/* print type information */
 	if (IS_DEBUGGER_SYMBOL(sym->n_type))
-		(void)printf(" - %02x %04x %5s ", sym->n_other,
+		printf(" - %02x %04x %5s ", sym->n_other,
 		    sym->n_desc&0xffff, typestring(sym->n_type));
 	else {
 		putchar(' ');
@@ -506,7 +506,7 @@
 	}
 
 	/* print the symbol's name */
-	(void)puts(sym->n_un.n_name);
+	puts(sym->n_un.n_name);
 }
 
 /*
@@ -645,6 +645,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: nm [-agnoprtuwW] [file ...]\n");
+	fprintf(stderr, "usage: nm [-agnoprtuwW] [file ...]\n");
 	exit(1);
 }
Index: passwd/local_passwd.c
===================================================================
RCS file: /cvs/src/usr.bin/passwd/local_passwd.c,v
retrieving revision 1.3
diff -u -u -r1.3 local_passwd.c
--- passwd/local_passwd.c	4 Oct 2003 20:36:50 -0000	1.3
+++ passwd/local_passwd.c	7 Nov 2004 20:02:15 -0000
@@ -98,7 +98,7 @@
 	struct timeval tv;
 
 	if (!nis)
-		(void)printf("Changing local password for %s.\n", pw->pw_name);
+		printf("Changing local password for %s.\n", pw->pw_name);
 
 	if (uid && pw->pw_passwd[0] &&
 	    strcmp(crypt(getpass("Old password:"), pw->pw_passwd),
@@ -132,25 +132,25 @@
 	for (buf[0] = '\0', tries = 0;;) {
 		p = getpass("New password:");
 		if (!*p) {
-			(void)printf("Password unchanged.\n");
+			printf("Password unchanged.\n");
 			pw_error(NULL, 0, 0);
 		}
 		if (strlen(p) < min_length && (uid != 0 || ++tries < 2)) {
-			(void)printf("Please enter a password at least %d characters in length.\n", min_length);
+			printf("Please enter a password at least %d characters in length.\n", min_length);
 			continue;
 		}
 		
 		if (force_mix_case) {
 		    for (t = p; *t && islower(*t); ++t);
 		    if (!*t && (uid != 0 || ++tries < 2)) {
-			    (void)printf("Please don't use an all-lower case password.\nUnusual capitalization, control characters or digits are suggested.\n");
+			    printf("Please don't use an all-lower case password.\nUnusual capitalization, control characters or digits are suggested.\n");
 			    continue;
 		    }
 		}
-		(void)strcpy(buf, p);
+		strcpy(buf, p);
 		if (!strcmp(buf, getpass("Retype new password:")))
 			break;
-		(void)printf("Mismatch; try again, EOF to quit.\n");
+		printf("Mismatch; try again, EOF to quit.\n");
 	}
 	/* grab a random printable character that isn't a colon */
 	if (!randinit) {
@@ -170,7 +170,7 @@
 		pw_error("cannot set password cipher", 1, 1);
 	login_close(lc);
 #else
-	(void)crypt_set_format("md5");
+	crypt_set_format("md5");
 #endif
 	/* Salt suitable for anything */
 	to64(&salt[0], random(), 3);
Index: passwd/passwd.c
===================================================================
RCS file: /cvs/src/usr.bin/passwd/passwd.c,v
retrieving revision 1.3
diff -u -u -r1.3 passwd.c
--- passwd/passwd.c	4 Oct 2003 20:36:50 -0000	1.3
+++ passwd/passwd.c	7 Nov 2004 20:02:15 -0000
@@ -224,7 +224,7 @@
 		"usage: passwd [-l] [-i instance] [-r realm] [-u fullname]",
 		"       passwd [-l] [-y] [-o] [-d domain [-h host]] [user]");
 #else
-	(void)fprintf(stderr,
+	fprintf(stderr,
 		"usage: passwd [-l] [-y] [-o] [-d domain [-h host]] [user]\n");
 #endif
 #else
@@ -232,7 +232,7 @@
 	fprintf(stderr,
 		"usage: passwd [-l] [-i instance] [-r realm] [-u fullname] [user]\n");
 #else
-	(void)fprintf(stderr, "usage: passwd user\n");
+	fprintf(stderr, "usage: passwd user\n");
 #endif
 #endif
 	exit(1);
Index: paste/paste.c
===================================================================
RCS file: /cvs/src/usr.bin/paste/paste.c,v
retrieving revision 1.2
diff -u -u -r1.2 paste.c
--- paste/paste.c	17 Jun 2003 04:29:30 -0000	1.2
+++ paste/paste.c	7 Nov 2004 20:02:15 -0000
@@ -202,7 +202,7 @@
 		if (needdelim)
 			putchar('\n');
 		if (fp != stdin)
-			(void)fclose(fp);
+			fclose(fp);
 	}
 
 	return (failed != 0);
@@ -240,6 +240,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: paste [-s] [-d delimiters] file ...\n");
+	fprintf(stderr, "usage: paste [-s] [-d delimiters] file ...\n");
 	exit(1);
 }
Index: patch/inp.c
===================================================================
RCS file: /cvs/src/usr.bin/patch/inp.c,v
retrieving revision 1.2
diff -u -u -r1.2 inp.c
--- patch/inp.c	28 Sep 2004 19:09:50 -0000	1.2
+++ patch/inp.c	7 Nov 2004 20:02:15 -0000
@@ -346,7 +346,7 @@
 	using_plan_a = false;
 	if ((ifp = fopen(filename, "r")) == NULL)
 		pfatal("can't open file %s", filename);
-	(void) unlink(TMPINNAME);
+	unlink(TMPINNAME);
 	if ((tifd = open(TMPINNAME, O_EXCL | O_CREAT | O_WRONLY, 0666)) < 0)
 		pfatal("can't open file %s", TMPINNAME);
 	while (fgets(buf, sizeof buf, ifp) != NULL) {
Index: pr/egetopt.c
===================================================================
RCS file: /cvs/src/usr.bin/pr/egetopt.c,v
retrieving revision 1.3
diff -u -u -r1.3 egetopt.c
--- pr/egetopt.c	4 Oct 2003 20:36:50 -0000	1.3
+++ pr/egetopt.c	7 Nov 2004 20:02:15 -0000
@@ -142,7 +142,7 @@
 				p = *nargv;
 			else
 				++p;
-			(void)fprintf(stderr, "%s: illegal option -- %c\n",
+			fprintf(stderr, "%s: illegal option -- %c\n",
 			    p, eoptopt);
 		}
 		return (BADCH);
@@ -158,7 +158,7 @@
 				p = *nargv;
 			else
 				++p;
-			(void)fprintf(stderr,
+			fprintf(stderr,
 				"%s: illegal '+' delimiter with option -- %c\n",
 				p, eoptopt);
 		}
@@ -195,7 +195,7 @@
 				p = *nargv;
 			else
 				++p;
-			(void)fprintf(stderr,
+			fprintf(stderr,
 			    "%s: option requires an argument -- %c\n", p,
 			    eoptopt);
 		}
Index: pr/pr.c
===================================================================
RCS file: /cvs/src/usr.bin/pr/pr.c,v
retrieving revision 1.3
diff -u -u -r1.3 pr.c
--- pr/pr.c	4 Oct 2003 20:36:50 -0000	1.3
+++ pr/pr.c	7 Nov 2004 20:02:15 -0000
@@ -110,7 +110,7 @@
 	int ret_val;
 
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-		(void)signal(SIGINT, terminate);
+		signal(SIGINT, terminate);
 	ret_val = setup(argc, argv);
 	if (!ret_val) {
 		/*
@@ -145,10 +145,10 @@
 	if ((pauseall || (pausefst && pagecnt == 1)) &&
 	    isatty(STDOUT_FILENO)) {
 		if ((ttyfp = fopen("/dev/tty", "r")) != NULL) {
-			(void)putc('\a', stderr);
+			putc('\a', stderr);
 			while ((pch = getc(ttyfp)) != '\n' && pch != EOF)
 				;
-			(void)fclose(ttyfp);
+			fclose(ttyfp);
 		}
 	}
 }
@@ -206,8 +206,8 @@
 	if (num)
 		nbuf[--num] = nmchar;
 	if (offst) {
-		(void)memset(obuf, (int)' ', offst);
-		(void)memset(hbuf, (int)' ', offst);
+		memset(obuf, (int)' ', offst);
+		memset(hbuf, (int)' ', offst);
 	}
 
 	/*
@@ -292,7 +292,7 @@
 			++pagecnt;
 		}
 		if (inf != stdin)
-			(void)fclose(inf);
+			fclose(inf);
 	}
 	if (eoptind < argc)
 		return(1);
@@ -352,7 +352,7 @@
 	}
 	ohbuf = hbuf + offst;
 	if (offst)
-		(void)memset(hbuf, (int)' ', offst);
+		memset(hbuf, (int)' ', offst);
 
 	/*
 	 * col pointers when no headers
@@ -397,7 +397,7 @@
 		indy[j] = lindy[j] + offst;
 		if (offst) {
 			ptbf = buf + lindy[j];
-			(void)memset(ptbf, (int)' ', offst);
+			memset(ptbf, (int)' ', offst);
 			ptbf += offst;
 		} else
 			ptbf = buf + indy[j];
@@ -480,7 +480,7 @@
 						if (sflag)
 							*ptbf++ = schar;
 						else if ((pln = col-cnt) > 0) {
-							(void)memset(ptbf,
+							memset(ptbf,
 								(int)' ',pln);
 							ptbf += pln;
 						}
@@ -613,7 +613,7 @@
 			++pagecnt;
 		}
 		if (inf != stdin)
-			(void)fclose(inf);
+			fclose(inf);
 	}
 	if (eoptind < argc)
 		return(1);
@@ -659,8 +659,8 @@
 	}
 	ohbuf = hbuf + offst;
 	if (offst) {
-		(void)memset(buf, (int)' ', offst);
-		(void)memset(hbuf, (int)' ', offst);
+		memset(buf, (int)' ', offst);
+		memset(hbuf, (int)' ', offst);
 	}
 
 	/*
@@ -721,7 +721,7 @@
 					if (sflag)
 						*ptbf++ = schar;
 					else if ((pln = col - cnt) > 0) {
-						(void)memset(ptbf,(int)' ',pln);
+						memset(ptbf,(int)' ',pln);
 						ptbf += pln;
 					}
 				}
@@ -755,7 +755,7 @@
 			++pagecnt;
 		}
 		if (inf != stdin)
-			(void)fclose(inf);
+			fclose(inf);
 	}
 	if (eoptind < argc)
 		return(1);
@@ -841,7 +841,7 @@
 		pgwd = ((colwd + 1) * clcnt) - 1;
 	}
 	if (colwd < 1) {
-		(void)fprintf(err,
+		fprintf(err,
 		  "pr: page width too small for %d columns\n", clcnt);
 		return(1);
 	}
@@ -856,8 +856,8 @@
 		return(1);
 	}
 	if (offst) {
-		(void)memset(buf, (int)' ', offst);
-		(void)memset(hbuf, (int)' ', offst);
+		memset(buf, (int)' ', offst);
+		memset(hbuf, (int)' ', offst);
 	}
 	if (pgnm)
 		pagecnt = pgnm;
@@ -903,7 +903,7 @@
 					 * EOF hit; no data
 					 */
 					if (fbuf[j] != stdin)
-						(void)fclose(fbuf[j]);
+						fclose(fbuf[j]);
 					fbuf[j] = NULL;
 					--actf;
 					cnt = 0;
@@ -928,7 +928,7 @@
 				if (sflag) {
 					*ptbf++ = schar;
 				} else if ((pln = col - cnt) > 0) {
-					(void)memset(ptbf, (int)' ', pln);
+					memset(ptbf, (int)' ', pln);
 					ptbf += pln;
 				}
 			}
@@ -1236,7 +1236,7 @@
 		}
 		if (c == EOF) {
 			if (inf != stdin)
-				(void)fclose(inf);
+				fclose(inf);
 			return(1);
 		}
 	}
@@ -1278,7 +1278,7 @@
 			return(inf);
 		if (gettimeofday(&tv, &tz) < 0) {
 			++errcnt;
-			(void)fprintf(err, "pr: cannot get time of day, %s\n",
+			fprintf(err, "pr: cannot get time of day, %s\n",
 				strerror(errno));
 			eoptind = argc - 1;
 			return(NULL);
@@ -1302,7 +1302,7 @@
 				return(inf);
 			if (gettimeofday(&tv, &tz) < 0) {
 				++errcnt;
-				(void)fprintf(err,
+				fprintf(err,
 					"pr: cannot get time of day, %s\n",
 					strerror(errno));
 				return(NULL);
@@ -1317,7 +1317,7 @@
 				++errcnt;
 				if (nodiag)
 					continue;
-				(void)fprintf(err, "pr: Cannot open %s, %s\n",
+				fprintf(err, "pr: Cannot open %s, %s\n",
 					argv[eoptind], strerror(errno));
 				continue;
 			}
@@ -1334,7 +1334,7 @@
 			if (dt) {
 				if (gettimeofday(&tv, &tz) < 0) {
 					++errcnt;
-					(void)fprintf(err,
+					fprintf(err,
 					     "pr: cannot get time of day, %s\n",
 					     strerror(errno));
 					return(NULL);
@@ -1344,8 +1344,8 @@
 			} else {
 				if (fstat(fileno(inf), &statbuf) < 0) {
 					++errcnt;
-					(void)fclose(inf);
-					(void)fprintf(err,
+					fclose(inf);
+					fprintf(err,
 						"pr: Cannot stat %s, %s\n",
 						argv[eoptind], strerror(errno));
 					return(NULL);
@@ -1364,8 +1364,8 @@
 	if (strftime(buf, HDBUF, timefrmt, timeptr) <= 0) {
 		++errcnt;
 		if (inf != stdin)
-			(void)fclose(inf);
-		(void)fputs("pr: time conversion failed\n", err);
+			fclose(inf);
+		fputs("pr: time conversion failed\n", err);
 		return(NULL);
 	}
 	return(inf);
@@ -1435,7 +1435,7 @@
 	 */
 	if (offst && otln(buf, offst, &ips, &ops, -1))
 		return(1);
-	(void)printf(HDFMT,buf+offst, fname, pagcnt);
+	printf(HDFMT,buf+offst, fname, pagcnt);
 	return(0);
 }
 
@@ -1523,36 +1523,36 @@
 {
 	char buf[BUFSIZ];
 
-	(void)fflush(stdout);
-	(void)fflush(err);
+	fflush(stdout);
+	fflush(err);
 	if (err == stderr)
 		return;
 	rewind(err);
 	while (fgets(buf, BUFSIZ, err) != NULL)
-		(void)fputs(buf, stderr);
+		fputs(buf, stderr);
 }
 
 void
 mfail(void)
 {
-	(void)fputs("pr: memory allocation failed\n", err);
+	fputs("pr: memory allocation failed\n", err);
 }
 
 void
 pfail(void)
 {
-	(void)fprintf(err, "pr: write failure, %s\n", strerror(errno));
+	fprintf(err, "pr: write failure, %s\n", strerror(errno));
 }
 
 void
 usage(void)
 {
-	(void)fputs(
+	fputs(
 	 "usage: pr [+page] [-col] [-adFfmprt] [-e[ch][gap]] [-h header]\n",
 	 err);
-	(void)fputs(
+	fputs(
 	 "          [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n",err);
-	(void)fputs(
+	fputs(
 	 "          [-L locale] [-s[ch]] [-w width] [-] [file ...]\n", err);
 }
 
@@ -1577,7 +1577,7 @@
 		 */
 		if ((err = tmpfile()) == NULL) {
 			err = stderr;
-		       (void)fputs("Cannot defer diagnostic messages\n",stderr);
+		       fputs("Cannot defer diagnostic messages\n",stderr);
 		       return(1);
 		}
 	} else
@@ -1586,14 +1586,14 @@
 		switch (c) {
 		case '+':
 			if ((pgnm = atoi(eoptarg)) < 1) {
-			    (void)fputs("pr: +page number must be 1 or more\n",
+			    fputs("pr: +page number must be 1 or more\n",
 				err);
 			    return(1);
 			}
 			break;
 		case '-':
 			if ((clcnt = atoi(eoptarg)) < 1) {
-			    (void)fputs("pr: -columns must be 1 or more\n",err);
+			    fputs("pr: -columns must be 1 or more\n",err);
 			    return(1);
 			}
 			if (clcnt > 1)
@@ -1613,14 +1613,14 @@
 				inchar = INCHAR;
 			if ((eoptarg != NULL) && isdigit((unsigned char)*eoptarg)) {
 				if ((ingap = atoi(eoptarg)) < 0) {
-					(void)fputs(
+					fputs(
 					"pr: -e gap must be 0 or more\n", err);
 					return(1);
 				}
 				if (ingap == 0)
 					ingap = INGAP;
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				fprintf(err,
 				      "pr: invalid value for -e %s\n", eoptarg);
 				return(1);
 			} else
@@ -1643,14 +1643,14 @@
 				ochar = OCHAR;
 			if ((eoptarg != NULL) && isdigit((unsigned char)*eoptarg)) {
 				if ((ogap = atoi(eoptarg)) < 0) {
-					(void)fputs(
+					fputs(
 					"pr: -i gap must be 0 or more\n", err);
 					return(1);
 				}
 				if (ogap == 0)
 					ogap = OGAP;
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				fprintf(err,
 				      "pr: invalid value for -i %s\n", eoptarg);
 				return(1);
 			} else
@@ -1661,7 +1661,7 @@
 			break;
 		case 'l':
 			if (!isdigit((unsigned char)*eoptarg) || ((lines=atoi(eoptarg)) < 1)) {
-				(void)fputs(
+				fputs(
 				 "pr: Number of lines must be 1 or more\n",err);
 				return(1);
 			}
@@ -1676,12 +1676,12 @@
 				nmchar = NMCHAR;
 			if ((eoptarg != NULL) && isdigit((unsigned char)*eoptarg)) {
 				if ((nmwd = atoi(eoptarg)) < 1) {
-					(void)fputs(
+					fputs(
 					"pr: -n width must be 1 or more\n",err);
 					return(1);
 				}
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				fprintf(err,
 				      "pr: invalid value for -n %s\n", eoptarg);
 				return(1);
 			} else
@@ -1689,7 +1689,7 @@
 			break;
 		case 'o':
 			if (!isdigit((unsigned char)*eoptarg) || ((offst = atoi(eoptarg))< 1)){
-				(void)fputs("pr: -o offset must be 1 or more\n",
+				fputs("pr: -o offset must be 1 or more\n",
 					err);
 				return(1);
 			}
@@ -1707,7 +1707,7 @@
 			else {
 				schar = *eoptarg++;
 				if (*eoptarg != '\0') {
-					(void)fprintf(err,
+					fprintf(err,
 					    "pr: invalid value for -s %s\n",
 					    eoptarg);
 					return(1);
@@ -1720,7 +1720,7 @@
 		case 'w':
 			++wflag;
 			if (!isdigit((unsigned char)*eoptarg) || ((pgwd = atoi(eoptarg)) < 1)){
-				(void)fputs(
+				fputs(
 				   "pr: -w width must be 1 or more \n",err);
 				return(1);
 			}
@@ -1745,12 +1745,12 @@
 	}
 	if (across) {
 		if (clcnt == 1) {
-			(void)fputs("pr: -a flag requires multiple columns\n",
+			fputs("pr: -a flag requires multiple columns\n",
 				err);
 			return(1);
 		}
 		if (merge) {
-			(void)fputs("pr: -m cannot be used with -a\n", err);
+			fputs("pr: -m cannot be used with -a\n", err);
 			return(1);
 		}
 	}
@@ -1772,7 +1772,7 @@
 	}
 	if (cflag) {
 		if (merge) {
-			(void)fputs(
+			fputs(
 			  "pr: -m cannot be used with multiple columns\n", err);
 			return(1);
 		}
@@ -1784,7 +1784,7 @@
 			pgwd = ((colwd + 1) * clcnt) - 1;
 		}
 		if (colwd < 1) {
-			(void)fprintf(err,
+			fprintf(err,
 			  "pr: page width is too small for %d columns\n",clcnt);
 			return(1);
 		}
@@ -1813,7 +1813,7 @@
 		}
 	}
 
-	(void) setlocale(LC_TIME, (Lflag != NULL) ? Lflag : "");
+	setlocale(LC_TIME, (Lflag != NULL) ? Lflag : "");
 
 	d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 	timefrmt = d_first ? TIMEFMTD : TIMEFMTM;
Index: printenv/printenv.c
===================================================================
RCS file: /cvs/src/usr.bin/printenv/printenv.c,v
retrieving revision 1.3
diff -u -u -r1.3 printenv.c
--- printenv/printenv.c	4 Oct 2003 20:36:50 -0000	1.3
+++ printenv/printenv.c	7 Nov 2004 20:02:16 -0000
@@ -70,7 +70,7 @@
 
 	if (argc == 0) {
 		for (ep = environ; *ep; ep++)
-			(void)printf("%s\n", *ep);
+			printf("%s\n", *ep);
 		exit(0);
 	}
 	len = strlen(*argv);
@@ -78,7 +78,7 @@
 		if (!memcmp(*ep, *argv, len)) {
 			cp = *ep + len;
 			if (!*cp || *cp == '=') {
-				(void)printf("%s\n", *cp ? cp + 1 : cp);
+				printf("%s\n", *cp ? cp + 1 : cp);
 				exit(0);
 			}
 		}
@@ -88,6 +88,6 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: printenv [name]\n");
+	fprintf(stderr, "usage: printenv [name]\n");
 	exit(1);
 }
Index: printf/printf.c
===================================================================
RCS file: /cvs/src/usr.bin/printf/printf.c,v
retrieving revision 1.5
diff -u -u -r1.5 printf.c
--- printf/printf.c	19 Mar 2004 16:37:24 -0000	1.5
+++ printf/printf.c	7 Nov 2004 20:02:16 -0000
@@ -64,15 +64,15 @@
 	char *b = NULL; \
 	if (fieldwidth) \
 		if (precision) \
-			(void)asprintf(&b, f, fieldwidth, precision, func); \
+			asprintf(&b, f, fieldwidth, precision, func); \
 		else \
-			(void)asprintf(&b, f, fieldwidth, func); \
+			asprintf(&b, f, fieldwidth, func); \
 	else if (precision) \
-		(void)asprintf(&b, f, precision, func); \
+		asprintf(&b, f, precision, func); \
 	else \
-		(void)asprintf(&b, f, func); \
+		asprintf(&b, f, func); \
 	if (b) { \
-		(void)fputs(b, stdout); \
+		fputs(b, stdout); \
 		free(b); \
 	} \
 } while (0)
@@ -102,7 +102,7 @@
 	char convch, nextch, *format, *fmt, *start;
 
 #ifndef BUILTIN
-	(void) setlocale(LC_NUMERIC, "");
+	setlocale(LC_NUMERIC, "");
 #endif
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch (ch) {
@@ -140,7 +140,7 @@
 			if (!*fmt) {
 				/* avoid infinite loop */
 				if (chopped) {
-					(void)printf("%s", start);
+					printf("%s", start);
 					return (rval);
 				}
 				if (end == 1) {
@@ -150,7 +150,7 @@
 				}
 				end = 1;
 				if (fmt > start)
-					(void)printf("%s", start);
+					printf("%s", start);
 				if (!*gargv)
 					return (rval);
 				fmt = format;
@@ -161,7 +161,7 @@
 				if (*++fmt != '%')
 					break;
 				*fmt++ = '\0';
-				(void)printf("%s", start);
+				printf("%s", start);
 				goto next;
 			}
 		}
@@ -489,5 +489,5 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: printf format [arg ...]\n");
+	fprintf(stderr, "usage: printf format [arg ...]\n");
 }
Index: quota/quota.c
===================================================================
RCS file: /cvs/src/usr.bin/quota/quota.c,v
retrieving revision 1.4
diff -u -u -r1.4 quota.c
--- quota/quota.c	30 Aug 2004 18:06:50 -0000	1.4
+++ quota/quota.c	7 Nov 2004 20:02:16 -0000
@@ -523,7 +523,7 @@
 		*qfnamep = cp;
 		return (1);
 	}
-	(void) sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]);
+	sprintf(buf, "%s/%s.%s", fs->fs_file, qfname, qfextension[type]);
 	*qfnamep = buf;
 	return (1);
 }
@@ -543,7 +543,7 @@
 			warn("%s", qfpathname);
 			return (0);
 		}
-		(void) lseek(fd, (off_t)(id * sizeof(struct dqblk)), L_SET);
+		lseek(fd, (off_t)(id * sizeof(struct dqblk)), L_SET);
 		switch (read(fd, &qup->dqblk, sizeof(struct dqblk))) {
 		case 0:				/* EOF */
 			/*
Index: ranlib/build.c
===================================================================
RCS file: /cvs/src/usr.bin/ranlib/build.c,v
retrieving revision 1.4
diff -u -u -r1.4 build.c
--- ranlib/build.c	24 Jul 2004 11:45:44 -0000	1.4
+++ ranlib/build.c	7 Nov 2004 20:02:16 -0000
@@ -109,11 +109,11 @@
 
 	/* Copy the saved objects into the archive. */
 	size = lseek(tfd, (off_t)0, SEEK_CUR);
-	(void)lseek(tfd, (off_t)0, SEEK_SET);
+	lseek(tfd, (off_t)0, SEEK_SET);
 	SETCF(tfd, tname, afd, archive, WPAD);
 	copy_ar(&cf, size);
-	(void)ftruncate(afd, lseek(afd, (off_t)0, SEEK_CUR));
-	(void)close(tfd);
+	ftruncate(afd, lseek(afd, (off_t)0, SEEK_CUR));
+	close(tfd);
 
 	/* Set the time. */
 	settime(afd);
@@ -246,7 +246,7 @@
 
 	/* Put out the ranlib archive file header. */
 #define	DEFMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
-	(void)sprintf(hb, HDR2, RANLIBMAG, 0L, getuid(), getgid(),
+	sprintf(hb, HDR2, RANLIBMAG, 0L, getuid(), getgid(),
 	    DEFMODE & ~umask(0), ransize, ARFMAG);
 	if (!fwrite(hb, sizeof(struct ar_hdr), 1, fp))
 		error(tname);
@@ -289,5 +289,5 @@
 	if (pad && !fwrite(&pad, sizeof(pad), 1, fp))
 		error(tname);
 
-	(void)fflush(fp);
+	fflush(fp);
 }
Index: ranlib/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/ranlib/misc.c,v
retrieving revision 1.5
diff -u -u -r1.5 misc.c
--- ranlib/misc.c	30 Aug 2004 18:06:50 -0000	1.5
+++ ranlib/misc.c	7 Nov 2004 20:02:16 -0000
@@ -62,16 +62,16 @@
 	char *envtmp, path[MAXPATHLEN];
 
 	if ((envtmp = getenv("TMPDIR")) != NULL)
-		(void)sprintf(path, "%s%s", envtmp, strrchr(_PATH_RANTMP, '/'));
+		sprintf(path, "%s%s", envtmp, strrchr(_PATH_RANTMP, '/'));
 	else
 		bcopy(_PATH_RANTMP, path, sizeof(_PATH_RANTMP));
 
 	sigfillset(&set);
-	(void)sigprocmask(SIG_BLOCK, &set, &oset);
+	sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((fd = mkstemp(path)) == -1)
 		error(path);
-        (void)unlink(path);
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
+        unlink(path);
+	sigprocmask(SIG_SETMASK, &oset, NULL);
 	return(fd);
 }
 
Index: ranlib/ranlib.c
===================================================================
RCS file: /cvs/src/usr.bin/ranlib/ranlib.c,v
retrieving revision 1.4
diff -u -u -r1.4 ranlib.c
--- ranlib/ranlib.c	24 Jul 2004 11:45:44 -0000	1.4
+++ ranlib/ranlib.c	7 Nov 2004 20:02:16 -0000
@@ -83,7 +83,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: ranlib [-t] archive ...\n");
+	fprintf(stderr, "usage: ranlib [-t] archive ...\n");
 	exit(1);
 }
 
Index: ranlib/touch.c
===================================================================
RCS file: /cvs/src/usr.bin/ranlib/touch.c,v
retrieving revision 1.4
diff -u -u -r1.4 touch.c
--- ranlib/touch.c	24 Jul 2004 11:45:44 -0000	1.4
+++ ranlib/touch.c	7 Nov 2004 20:02:16 -0000
@@ -84,7 +84,7 @@
 	size = SARMAG + sizeof(hdr->ar_name);
 	if (lseek(afd, size, SEEK_SET) == (off_t)-1)
 		error(archive);
-	(void)sprintf(buf, "%-12ld", (long)time((time_t *)NULL) + RANLIBSKEW);
+	sprintf(buf, "%-12ld", (long)time((time_t *)NULL) + RANLIBSKEW);
 	if (write(afd, buf, sizeof(hdr->ar_date)) != sizeof(hdr->ar_date))
 		error(archive);
 }
Index: rev/rev.c
===================================================================
RCS file: /cvs/src/usr.bin/rev/rev.c,v
retrieving revision 1.4
diff -u -u -r1.4 rev.c
--- rev/rev.c	3 Nov 2003 19:31:32 -0000	1.4
+++ rev/rev.c	7 Nov 2004 20:02:16 -0000
@@ -91,7 +91,7 @@
 			warn("%s", filename);
 			rval = 1;
 		}
-		(void)fclose(fp);
+		fclose(fp);
 	} while(*argv);
 	exit(rval);
 }
@@ -99,6 +99,6 @@
 void
 usage()
 {
-	(void)fprintf(stderr, "usage: rev [file ...]\n");
+	fprintf(stderr, "usage: rev [file ...]\n");
 	exit(1);
 }
Index: rlogin/rlogin.c
===================================================================
RCS file: /cvs/src/usr.bin/rlogin/rlogin.c,v
retrieving revision 1.4
diff -u -u -r1.4 rlogin.c
--- rlogin/rlogin.c	30 Aug 2004 18:06:50 -0000	1.4
+++ rlogin/rlogin.c	7 Nov 2004 20:02:16 -0000
@@ -221,7 +221,7 @@
 #ifdef KERBEROS
 		case 'k':
 			dest_realm = dst_realm_buf;
-			(void)strncpy(dest_realm, optarg, REALM_SZ);
+			strncpy(dest_realm, optarg, REALM_SZ);
 			break;
 #endif
 		case 'l':
@@ -275,17 +275,17 @@
 
 #define	MAX_TERM_LENGTH	(sizeof(term) - 1 - MAX_SPEED_LENGTH - 1)
 
-	(void)strncpy(term, (p = getenv("TERM")) ? p : "network",
+	strncpy(term, (p = getenv("TERM")) ? p : "network",
 		      MAX_TERM_LENGTH);
 	term[MAX_TERM_LENGTH] = '\0';
 	if (ioctl(0, TIOCGETP, &ttyb) == 0) {
-		(void)strcat(term, "/");
-		(void)strcat(term, speeds[(int)ttyb.sg_ospeed]);
+		strcat(term, "/");
+		strcat(term, speeds[(int)ttyb.sg_ospeed]);
 	}
 
-	(void)get_window_size(0, &winsize);
+	get_window_size(0, &winsize);
 
-	(void)signal(SIGPIPE, lostpeer);
+	signal(SIGPIPE, lostpeer);
 	/* will use SIGUSR1 for window size hack, so hold it off */
 	omask = sigblock(sigmask(SIGURG) | sigmask(SIGUSR1));
 	/*
@@ -294,8 +294,8 @@
 	 * discarded. Note that these routines will be ready to get
 	 * a signal by the time that they are unblocked below.
 	 */
-	(void)signal(SIGURG, copytochild);
-	(void)signal(SIGUSR1, writeroob);
+	signal(SIGURG, copytochild);
+	signal(SIGUSR1, writeroob);
 
 #ifdef KERBEROS
 	if (use_kerberos) {
@@ -368,7 +368,7 @@
 		if (ss.ss_family == AF_INET)
 			warn("setsockopt getsockname failed");
 
-	(void)setuid(uid);
+	setuid(uid);
 	doit(omask);
 	/*NOTREACHED*/
 }
@@ -386,18 +386,18 @@
 {
 	struct sgttyb sb;
 
-	(void)ioctl(0, TIOCGETP, (char *)&sb);
+	ioctl(0, TIOCGETP, (char *)&sb);
 	defflags = sb.sg_flags;
 	tabflag = defflags & TBDELAY;
 	defflags &= ECHO | CRMOD;
 	deferase = sb.sg_erase;
 	defkill = sb.sg_kill;
-	(void)ioctl(0, TIOCLGET, &deflflags);
-	(void)ioctl(0, TIOCGETC, &deftc);
+	ioctl(0, TIOCLGET, &deflflags);
+	ioctl(0, TIOCGETC, &deftc);
 	notc.t_startc = deftc.t_startc;
 	notc.t_stopc = deftc.t_stopc;
-	(void)ioctl(0, TIOCGLTC, &defltc);
-	(void)signal(SIGINT, SIG_IGN);
+	ioctl(0, TIOCGLTC, &defltc);
+	signal(SIGINT, SIG_IGN);
 	setsignal(SIGHUP);
 	setsignal(SIGQUIT);
 	child = fork();
@@ -423,8 +423,8 @@
 	 * signals to the child. We can now unblock SIGURG and SIGUSR1
 	 * that were set above.
 	 */
-	(void)sigsetmask(omask);
-	(void)signal(SIGCHLD, catch_child);
+	sigsetmask(omask);
+	signal(SIGCHLD, catch_child);
 	writer();
 	msg("closed connection.");
 	done(0);
@@ -438,8 +438,8 @@
 	int omask = sigblock(sigmask(sig));
 
 	if (signal(sig, exit) == SIG_IGN)
-		(void)signal(sig, SIG_IGN);
-	(void)sigsetmask(omask);
+		signal(sig, SIG_IGN);
+	sigsetmask(omask);
 }
 
 void
@@ -451,7 +451,7 @@
 	mode(0);
 	if (child > 0) {
 		/* make sure catch_child does not snap it up */
-		(void)signal(SIGCHLD, SIG_DFL);
+		signal(SIGCHLD, SIG_DFL);
 		if (kill(child, SIGKILL) >= 0)
 			while ((w = wait(&wstatus)) > 0 && w != child);
 	}
@@ -470,7 +470,7 @@
 {
 	if (dosigwinch == 0) {
 		sendwindow();
-		(void)signal(SIGWINCH, sigwinch);
+		signal(SIGWINCH, sigwinch);
 	}
 	dosigwinch = 1;
 }
@@ -543,13 +543,13 @@
 #ifdef CRYPT
 #ifdef KERBEROS
 				if (doencrypt)
-					(void)des_enc_write(rem,
+					des_enc_write(rem,
 					    (char *)&escapechar, 1,
 						schedule, &cred.session);
 				else
 #endif
 #endif
-					(void)write(rem, &escapechar, 1);
+					write(rem, &escapechar, 1);
 		}
 
 #ifdef CRYPT
@@ -596,7 +596,7 @@
 		*p++ = c;
 	*p++ = '\r';
 	*p++ = '\n';
-	(void)write(STDOUT_FILENO, buf, p - buf);
+	write(STDOUT_FILENO, buf, p - buf);
 }
 
 void
@@ -608,9 +608,9 @@
 #endif
 {
 	mode(0);
-	(void)signal(SIGCHLD, SIG_IGN);
-	(void)kill(cmdc == defltc.t_suspc ? 0 : getpid(), SIGTSTP);
-	(void)signal(SIGCHLD, catch_child);
+	signal(SIGCHLD, SIG_IGN);
+	kill(cmdc == defltc.t_suspc ? 0 : getpid(), SIGTSTP);
+	signal(SIGCHLD, catch_child);
 	mode(1);
 	sigwinch(0);			/* check for size changes */
 }
@@ -650,12 +650,12 @@
 #ifdef CRYPT
 #ifdef KERBEROS
 	if(doencrypt)
-		(void)des_enc_write(rem, obuf, sizeof(obuf),
+		des_enc_write(rem, obuf, sizeof(obuf),
 			schedule, &cred.session);
 	else
 #endif
 #endif
-		(void)write(rem, obuf, sizeof(obuf));
+		write(rem, obuf, sizeof(obuf));
 }
 
 /*
@@ -704,28 +704,28 @@
 	}
 	if (mark & TIOCPKT_WINDOW) {
 		/* Let server know about window size changes */
-		(void)kill(ppid, SIGUSR1);
+		kill(ppid, SIGUSR1);
 	}
 	if (!eight && (mark & TIOCPKT_NOSTOP)) {
-		(void)ioctl(0, TIOCGETP, (char *)&sb);
+		ioctl(0, TIOCGETP, (char *)&sb);
 		sb.sg_flags &= ~CBREAK;
 		sb.sg_flags |= RAW;
-		(void)ioctl(0, TIOCSETN, (char *)&sb);
+		ioctl(0, TIOCSETN, (char *)&sb);
 		notc.t_stopc = -1;
 		notc.t_startc = -1;
-		(void)ioctl(0, TIOCSETC, (char *)&notc);
+		ioctl(0, TIOCSETC, (char *)&notc);
 	}
 	if (!eight && (mark & TIOCPKT_DOSTOP)) {
-		(void)ioctl(0, TIOCGETP, (char *)&sb);
+		ioctl(0, TIOCGETP, (char *)&sb);
 		sb.sg_flags &= ~RAW;
 		sb.sg_flags |= CBREAK;
-		(void)ioctl(0, TIOCSETN, (char *)&sb);
+		ioctl(0, TIOCSETN, (char *)&sb);
 		notc.t_stopc = deftc.t_stopc;
 		notc.t_startc = deftc.t_startc;
-		(void)ioctl(0, TIOCSETC, (char *)&notc);
+		ioctl(0, TIOCSETC, (char *)&notc);
 	}
 	if (mark & TIOCPKT_FLUSHWRITE) {
-		(void)ioctl(1, TIOCFLUSH, (char *)&out);
+		ioctl(1, TIOCFLUSH, (char *)&out);
 		for (;;) {
 			if (ioctl(rem, SIOCATMARK, &atmark) < 0) {
 				warn("ioctl");
@@ -771,12 +771,12 @@
 #else
 	pid = -getpid();	/* old broken systems use negatives */
 #endif
-	(void)signal(SIGTTOU, SIG_IGN);
-	(void)signal(SIGURG, oob);
+	signal(SIGTTOU, SIG_IGN);
+	signal(SIGURG, oob);
 	ppid = getppid();
-	(void)fcntl(rem, F_SETOWN, pid);
-	(void)setjmp(rcvtop);
-	(void)sigsetmask(omask);
+	fcntl(rem, F_SETOWN, pid);
+	setjmp(rcvtop);
+	sigsetmask(omask);
 	bufp = rcvbuf;
 	for (;;) {
 		while ((remaining = rcvcnt - (bufp - rcvbuf)) > 0) {
@@ -822,8 +822,8 @@
 	struct tchars *tc;
 	int lflags;
 
-	(void)ioctl(0, TIOCGETP, (char *)&sb);
-	(void)ioctl(0, TIOCLGET, (char *)&lflags);
+	ioctl(0, TIOCGETP, (char *)&sb);
+	ioctl(0, TIOCLGET, (char *)&lflags);
 	switch(f) {
 	case 0:
 		sb.sg_flags &= ~(CBREAK|RAW|TBDELAY);
@@ -849,17 +849,17 @@
 	default:
 		return;
 	}
-	(void)ioctl(0, TIOCSLTC, (char *)ltc);
-	(void)ioctl(0, TIOCSETC, (char *)tc);
-	(void)ioctl(0, TIOCSETN, (char *)&sb);
-	(void)ioctl(0, TIOCLSET, (char *)&lflags);
+	ioctl(0, TIOCSLTC, (char *)ltc);
+	ioctl(0, TIOCSETC, (char *)tc);
+	ioctl(0, TIOCSETN, (char *)&sb);
+	ioctl(0, TIOCLSET, (char *)&lflags);
 }
 
 void
 lostpeer(signo)
 	int signo;
 {
-	(void)signal(SIGPIPE, SIG_IGN);
+	signal(SIGPIPE, SIG_IGN);
 	msg("\007connection closed.");
 	done(1);
 }
@@ -869,20 +869,20 @@
 copytochild(signo)
 	int signo;
 {
-	(void)kill(child, SIGURG);
+	kill(child, SIGURG);
 }
 
 void
 msg(str)
 	char *str;
 {
-	(void)fprintf(stderr, "rlogin: %s\r\n", str);
+	fprintf(stderr, "rlogin: %s\r\n", str);
 }
 
 void
 usage()
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	"usage: rlogin [-46%s]%s[-e char] [-i localname] [-l username] host\n",
 #ifdef KERBEROS
 #ifdef CRYPT
Index: rpcgen/rpc_scan.c
===================================================================
RCS file: /cvs/src/usr.bin/rpcgen/rpc_scan.c,v
retrieving revision 1.4
diff -u -u -r1.4 rpc_scan.c
--- rpcgen/rpc_scan.c	19 Jun 2004 16:40:36 -0000	1.4
+++ rpcgen/rpc_scan.c	7 Nov 2004 20:02:16 -0000
@@ -325,7 +325,7 @@
 	p++;
 	size = p - *str;
 	*val = alloc(size + 1);
-	(void) strncpy(*val, *str, size);
+	strncpy(*val, *str, size);
 	(*val)[size] = 0;
 	*str = p;
 }
Index: rpcinfo/rpcinfo.c
===================================================================
RCS file: /cvs/src/usr.bin/rpcinfo/rpcinfo.c,v
retrieving revision 1.2
diff -u -u -r1.2 rpcinfo.c
--- rpcinfo/rpcinfo.c	17 Jun 2003 04:29:31 -0000	1.2
+++ rpcinfo/rpcinfo.c	7 Nov 2004 20:02:16 -0000
@@ -264,11 +264,11 @@
 				minvers = 0;
 				maxvers = MAX_VERS;
 			} else {
-				(void) pstatus(client, prognum, MAX_VERS);
+				pstatus(client, prognum, MAX_VERS);
 				exit(1);
 			}
 		} else {
-			(void) pstatus(client, prognum, (u_long)0);
+			pstatus(client, prognum, (u_long)0);
 			exit(1);
 		}
 		clnt_destroy(client);
@@ -311,7 +311,7 @@
 		if (pstatus(client, prognum, vers) < 0)
 			failure = 1;
 	}
-	(void) close(sock); /* Close it up again */
+	close(sock); /* Close it up again */
 	if (failure)
 		exit(1);
 }
@@ -390,15 +390,15 @@
 				minvers = 0;
 				maxvers = MAX_VERS;
 			} else {
-				(void) pstatus(client, prognum, MAX_VERS);
+				pstatus(client, prognum, MAX_VERS);
 				exit(1);
 			}
 		} else {
-			(void) pstatus(client, prognum, MIN_VERS);
+			pstatus(client, prognum, MIN_VERS);
 			exit(1);
 		}
 		clnt_destroy(client);
-		(void) close(sock);
+		close(sock);
 		sock = RPC_ANYSOCK; /* Re-initialize it for later */
 		for (vers = minvers; vers <= maxvers; vers++) {
 			addr.sin_port = htons(portnum);
@@ -416,7 +416,7 @@
 			if (pstatus(client, prognum, vers) < 0)
 				failure = 1;
 			clnt_destroy(client);
-			(void) close(sock);
+			close(sock);
 			sock = RPC_ANYSOCK;
 		}
 	}
Index: rsh/rsh.c
===================================================================
RCS file: /cvs/src/usr.bin/rsh/rsh.c,v
retrieving revision 1.5
diff -u -u -r1.5 rsh.c
--- rsh/rsh.c	22 Jul 2004 14:50:19 -0000	1.5
+++ rsh/rsh.c	7 Nov 2004 20:02:16 -0000
@@ -300,14 +300,14 @@
 			warn("setsockopt");
 	}
 
-	(void)setuid(uid);
+	setuid(uid);
 	omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGTERM));
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-		(void)signal(SIGINT, sendsig);
+		signal(SIGINT, sendsig);
 	if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
-		(void)signal(SIGQUIT, sendsig);
+		signal(SIGQUIT, sendsig);
 	if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
-		(void)signal(SIGTERM, sendsig);
+		signal(SIGTERM, sendsig);
 
 	if (!nflag) {
 		pid = fork();
@@ -315,7 +315,7 @@
 			err(1, "fork");
 	}
         else
-		(void)shutdown(rem, 1);
+		shutdown(rem, 1);
 
 #ifdef KERBEROS
 #ifdef CRYPT
@@ -323,14 +323,14 @@
 #endif
 #endif
 	{
-		(void)ioctl(rfd2, FIONBIO, &one);
-		(void)ioctl(rem, FIONBIO, &one);
+		ioctl(rfd2, FIONBIO, &one);
+		ioctl(rem, FIONBIO, &one);
 	}
 
 	talk(nflag, omask, pid, rem, timeout);
 
 	if (!nflag)
-		(void)kill(pid, SIGKILL);
+		kill(pid, SIGKILL);
 	exit(0);
 }
 
@@ -348,7 +348,7 @@
 	int nfds, srval;
 
 	if (!nflag && pid == 0) {
-		(void)close(rfd2);
+		close(rfd2);
 
 reread:		errno = 0;
 		if ((cc = read(0, buf, sizeof buf)) <= 0)
@@ -387,14 +387,14 @@
 			goto reread;
 		goto rewrite;
 done:
-		(void)shutdown(rem, 1);
+		shutdown(rem, 1);
 		exit(0);
 	}
 
 	tvtimeout.tv_sec = timeout;
 	tvtimeout.tv_usec = 0;
 
-	(void)sigsetmask(omask);
+	sigsetmask(omask);
 	if (rfd2 >= FD_SETSIZE || rem >= FD_SETSIZE)
 		errx(1, "descriptor too big");
 	FD_ZERO(&readfrom);
@@ -430,7 +430,7 @@
 				if (errno != EWOULDBLOCK)
 					FD_CLR(rfd2, &readfrom);
 			} else
-				(void)write(2, buf, cc);
+				write(2, buf, cc);
 		}
 		if (FD_ISSET(rem, &ready)) {
 			errno = 0;
@@ -446,7 +446,7 @@
 				if (errno != EWOULDBLOCK)
 					FD_CLR(rem, &readfrom);
 			} else
-				(void)write(1, buf, cc);
+				write(1, buf, cc);
 		}
 	} while (FD_ISSET(rfd2, &readfrom) || FD_ISSET(rem, &readfrom));
 }
@@ -470,11 +470,11 @@
 #ifdef KERBEROS
 #ifdef CRYPT
 	if (doencrypt)
-		(void)des_enc_write(rfd2, &signo, 1, schedule, &cred.session);
+		des_enc_write(rfd2, &signo, 1, schedule, &cred.session);
 	else
 #endif
 #endif
-		(void)write(rfd2, &signo, 1);
+		write(rfd2, &signo, 1);
 }
 
 char *
@@ -490,7 +490,7 @@
 	if (!(args = malloc((u_int)cc)))
 		err(1, NULL);
 	for (p = args, ap = argv; *ap; ++ap) {
-		(void)strcpy(p, *ap);
+		strcpy(p, *ap);
 		for (p = strcpy(p, *ap); *p; ++p);
 		if (ap[1])
 			*p++ = ' ';
@@ -502,7 +502,7 @@
 usage()
 {
 
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: rsh [-46] [-ndK%s]%s[-l login] [-t timeout] host [command]\n",
 #ifdef KERBEROS
 #ifdef CRYPT
Index: rup/rup.c
===================================================================
RCS file: /cvs/src/usr.bin/rup/rup.c,v
retrieving revision 1.3
diff -u -u -r1.3 rup.c
--- rup/rup.c	14 Sep 2004 18:36:40 -0000	1.3
+++ rup/rup.c	7 Nov 2004 20:02:16 -0000
@@ -226,7 +226,7 @@
 		allhosts();
 	else {
 		for (; optind < argc; optind++)
-			(void) onehost(argv[optind]);
+			onehost(argv[optind]);
 	}
 	exit(0);
 }
Index: ruptime/ruptime.c
===================================================================
RCS file: /cvs/src/usr.bin/ruptime/ruptime.c,v
retrieving revision 1.7
diff -u -u -r1.7 ruptime.c
--- ruptime/ruptime.c	23 Jul 2004 09:24:00 -0000	1.7
+++ ruptime/ruptime.c	7 Nov 2004 20:02:16 -0000
@@ -125,7 +125,7 @@
 			continue;
 		}
 		cc = read(fd, buf, sizeof(struct whod));
-		(void)close(fd);
+		close(fd);
 
 		if (cc < WHDRSIZE)
 			continue;
@@ -154,18 +154,18 @@
 	if (nhosts == 0)
 		errx(1, "no hosts in %s", _PATH_RWHODIR);
 
-	(void)time(&now);
+	time(&now);
 	qsort(hs, nhosts, sizeof(hs[0]), cmp);
 	for (i = 0; i < nhosts; i++) {
 		hsp = &hs[i];
 		if (LEFTEARTH(hsp))
 			continue;
 		if (ISDOWN(hsp)) {
-			(void)printf("%-12.12s%s\n", hsp->hs_wd->wd_hostname,
+			printf("%-12.12s%s\n", hsp->hs_wd->wd_hostname,
 			    interval(now - hsp->hs_wd->wd_recvtime, "down"));
 			continue;
 		}
-		(void)printf(
+		printf(
 		    "%-12.12s%s,  %4d user%s  load %*.2f, %*.2f, %*.2f\n",
 		    hsp->hs_wd->wd_hostname,
 		    interval((time_t)hsp->hs_wd->wd_sendtime -
@@ -189,7 +189,7 @@
 	int days, hours, minutes;
 
 	if (tval < 0) {
-		(void)snprintf(resbuf, sizeof(resbuf), "   %s ??:??", updown);
+		snprintf(resbuf, sizeof(resbuf), "   %s ??:??", updown);
 		return (resbuf);
 	}
 						/* round to minutes. */
@@ -199,10 +199,10 @@
 	days = hours / 24;
 	hours %= 24;
 	if (days)
-		(void)snprintf(resbuf, sizeof(resbuf),
+		snprintf(resbuf, sizeof(resbuf),
 		    "%s %3d+%02d:%02d", updown, days, hours, minutes);
 	else
-		(void)snprintf(resbuf, sizeof(resbuf),
+		snprintf(resbuf, sizeof(resbuf),
 		    "%s     %2d:%02d", updown, hours, minutes);
 	return (resbuf);
 }
@@ -264,6 +264,6 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: ruptime [-alrut]\n");
+	fprintf(stderr, "usage: ruptime [-alrut]\n");
 	exit(1);
 }
Index: rusers/rusers.c
===================================================================
RCS file: /cvs/src/usr.bin/rusers/rusers.c,v
retrieving revision 1.3
diff -u -u -r1.3 rusers.c
--- rusers/rusers.c	17 Jul 2004 21:10:42 -0000	1.3
+++ rusers/rusers.c	7 Nov 2004 20:02:16 -0000
@@ -237,7 +237,7 @@
 		allhosts();
 	else {
 		for (; optind < argc; optind++)
-			(void)onehost(argv[optind]);
+			onehost(argv[optind]);
 	}
 	exit(0);
 }
Index: rwho/rwho.c
===================================================================
RCS file: /cvs/src/usr.bin/rwho/rwho.c,v
retrieving revision 1.3
diff -u -u -r1.3 rwho.c
--- rwho/rwho.c	3 Nov 2003 19:31:33 -0000	1.3
+++ rwho/rwho.c	7 Nov 2004 20:02:16 -0000
@@ -88,7 +88,7 @@
 	int f, n, i;
 	int d_first;
 
-	(void) setlocale(LC_TIME, "");
+	setlocale(LC_TIME, "");
 	d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 
 	while ((ch = getopt(argc, argv, "a")) != -1)
@@ -109,7 +109,7 @@
 	if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL)
 		err(1, "%s", _PATH_RWHODIR);
 	mp = myutmp;
-	(void)time(&now);
+	time(&now);
 	while ((dp = readdir(dirp))) {
 		if (dp->d_ino == 0 || strncmp(dp->d_name, "whod.", 5))
 			continue;
@@ -118,11 +118,11 @@
 			continue;
 		cc = read(f, (char *)&wd, sizeof (struct whod));
 		if (cc < WHDRSIZE) {
-			(void) close(f);
+			close(f);
 			continue;
 		}
 		if (down(w,now)) {
-			(void) close(f);
+			close(f);
 			continue;
 		}
 		cc -= WHDRSIZE;
@@ -135,10 +135,10 @@
 			if (nusers >= NUSERS)
 				errx(1, "too many users");
 			mp->myutmp = we->we_utmp; mp->myidle = we->we_idle;
-			(void) strcpy(mp->myhost, w->wd_hostname);
+			strcpy(mp->myhost, w->wd_hostname);
 			nusers++; we++; mp++;
 		}
-		(void) close(f);
+		close(f);
 	}
 	qsort((char *)myutmp, nusers, sizeof (struct myutmp), utmpcmp);
 	mp = myutmp;
@@ -157,7 +157,7 @@
 		strftime(cbuf, sizeof(cbuf),
 			 d_first ? "%e %b %R" : "%b %e %R",
 			 localtime((time_t *)&mp->myutmp.out_time));
-		(void)sprintf(buf, "%s:%-.*s", mp->myhost,
+		sprintf(buf, "%s:%-.*s", mp->myhost,
 		   sizeof(mp->myutmp.out_line), mp->myutmp.out_line);
 		printf("%-*.*s %-*s %s",
 		   UT_NAMESIZE, sizeof(mp->myutmp.out_name),
Index: sed/main.c
===================================================================
RCS file: /cvs/src/usr.bin/sed/main.c,v
retrieving revision 1.3
diff -u -u -r1.3 main.c
--- sed/main.c	4 Oct 2003 20:36:50 -0000	1.3
+++ sed/main.c	7 Nov 2004 20:02:16 -0000
@@ -113,7 +113,7 @@
 	int c, fflag;
 	char *temp_arg;
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	fflag = 0;
 	inplace = NULL;
@@ -175,7 +175,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n",
 		"usage: sed script [-Ean] [-i extension] [file ...]",
 		"       sed [-an] [-i extension] [-e script] ... [-f script_file] ... [file ...]");
 	exit(1);
@@ -214,7 +214,7 @@
 			if ((snprintf(string_ident,
 			    sizeof(string_ident), "\"%s\"", script->s)) >=
 			    sizeof(string_ident) - 1)
-				(void)strcpy(string_ident +
+				strcpy(string_ident +
 				    sizeof(string_ident) - 6, " ...\"");
 			fname = string_ident;
 			s = script->s;
@@ -231,7 +231,7 @@
 			return (p);
 		}
 		script = script->next;
-		(void)fclose(f);
+		fclose(f);
 		state = ST_EOF;
 		goto again;
 	case ST_STRING:
@@ -302,7 +302,7 @@
 
 	for (;;) {
 		if (curfile != NULL && (c = getc(curfile)) != EOF) {
-			(void)ungetc(c, curfile);
+			ungetc(c, curfile);
 			break;
 		}
 		/* If we are here then either eof or no files are open yet */
Index: sed/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/sed/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- sed/misc.c	4 Oct 2003 20:36:50 -0000	1.3
+++ sed/misc.c	7 Nov 2004 20:02:16 -0000
@@ -66,6 +66,6 @@
 	s = regerror(errcode, preg, NULL, 0);
 	if ((oe = malloc(s)) == NULL)
 		err(1, "malloc");
-	(void)regerror(errcode, preg, oe, s);
+	regerror(errcode, preg, oe, s);
 	return (oe);
 }
Index: sed/process.c
===================================================================
RCS file: /cvs/src/usr.bin/sed/process.c,v
retrieving revision 1.5
diff -u -u -r1.5 process.c
--- sed/process.c	4 Nov 2003 15:48:16 -0000	1.5
+++ sed/process.c	7 Nov 2004 20:02:16 -0000
@@ -127,7 +127,7 @@
 				pd = 1;
 				psl = 0;
 				if (cp->a2 == NULL || lastaddr)
-					(void)printf("%s", cp->t);
+					printf("%s", cp->t);
 				break;
 			case 'd':
 				pd = 1;
@@ -159,7 +159,7 @@
 				cspace(&HS, ps, psl, 0);
 				break;
 			case 'i':
-				(void)printf("%s", cp->t);
+				printf("%s", cp->t);
 				break;
 			case 'l':
 				lputs(ps);
@@ -249,7 +249,7 @@
 			case '}':
 				break;
 			case '=':
-				(void)printf("%lu\n", linenum);
+				printf("%lu\n", linenum);
 			}
 			cp = cp->next;
 		} /* for all cp */
@@ -449,8 +449,8 @@
 			if ((f = fopen(appends[i].s, "r")) == NULL)
 				break;
 			while ((count = fread(buf, sizeof(char), sizeof(buf), f)))
-				(void)fwrite(buf, sizeof(char), count, stdout);
-			(void)fclose(f);
+				fwrite(buf, sizeof(char), count, stdout);
+			fclose(f);
 			break;
 		}
 	if (ferror(stdout))
@@ -479,30 +479,30 @@
 
 	for (count = 0; *s; ++s) {
 		if (count + 5 >= termwidth) {
-			(void)printf("\\\n");
+			printf("\\\n");
 			count = 0;
 		}
 		if (isprint((unsigned char)*s) && *s != '\\') {
-			(void)putchar(*s);
+			putchar(*s);
 			count++;
 		} else if (*s == '\n') {
-			(void)putchar('$');
-			(void)putchar('\n');
+			putchar('$');
+			putchar('\n');
 			count = 0;
 		} else {
 			escapes = "\\\a\b\f\r\t\v";
-			(void)putchar('\\');
+			putchar('\\');
 			if ((p = strchr(escapes, *s))) {
-				(void)putchar("\\abfrtv"[p - escapes]);
+				putchar("\\abfrtv"[p - escapes]);
 				count += 2;
 			} else {
-				(void)printf("%03o", *(u_char *)s);
+				printf("%03o", *(u_char *)s);
 				count += 4;
 			}
 		}
 	}
-	(void)putchar('$');
-	(void)putchar('\n');
+	putchar('$');
+	putchar('\n');
 	if (ferror(stdout))
 		errx(1, "stdout: %s", strerror(errno ? errno : EIO));
 }
Index: size/size.c
===================================================================
RCS file: /cvs/src/usr.bin/size/size.c,v
retrieving revision 1.3
diff -u -u -r1.3 size.c
--- size/size.c	4 Oct 2003 20:36:50 -0000	1.3
+++ size/size.c	7 Nov 2004 20:02:16 -0000
@@ -85,28 +85,28 @@
 		return (1);
 	}
 	if (read(fd, &head, sizeof(head)) != sizeof(head) || N_BADMAG(head)) {
-		(void)close(fd);
+		close(fd);
 		warnx("%s: not in a.out format", name);
 		return (1);
 	}
-	(void)close(fd);
+	close(fd);
 
 	if (first) {
 		first = 0;
-		(void)printf("text\tdata\tbss\tdec\thex\n");
+		printf("text\tdata\tbss\tdec\thex\n");
 	}
 	total = head.a_text + head.a_data + head.a_bss;
-	(void)printf("%lu\t%lu\t%lu\t%lu\t%lx", (u_long)head.a_text,
+	printf("%lu\t%lu\t%lu\t%lu\t%lx", (u_long)head.a_text,
 	    (u_long)head.a_data, (u_long)head.a_bss, total, total);
 	if (count > 1)
-		(void)printf("\t%s", name);
-	(void)printf("\n");
+		printf("\t%s", name);
+	printf("\n");
 	return (0);
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: size [file ...]\n");
+	fprintf(stderr, "usage: size [file ...]\n");
 	exit(1);
 }
Index: split/split.c
===================================================================
RCS file: /cvs/src/usr.bin/split/split.c,v
retrieving revision 1.4
diff -u -u -r1.4 split.c
--- split/split.c	25 Oct 2003 14:14:52 -0000	1.4
+++ split/split.c	7 Nov 2004 20:02:16 -0000
@@ -356,9 +356,9 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: split [-a sufflen] [-b byte_count] [-l line_count] [-p pattern]\n");
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "             [file [prefix]]\n");
 	exit(EX_USAGE);
 }
Index: stat/stat.c
===================================================================
RCS file: /cvs/src/usr.bin/stat/stat.c,v
retrieving revision 1.5
diff -u -u -r1.5 stat.c
--- stat/stat.c	9 Jul 2004 19:13:40 -0000	1.5
+++ stat/stat.c	7 Nov 2004 20:02:16 -0000
@@ -150,7 +150,7 @@
 
 #define addchar(s, c, nl) \
 	do { \
-		(void)fputc((c), (s)); \
+		fputc((c), (s)); \
 		(*nl) = ((c) == '\n'); \
 	} while (0/*CONSTCOND*/)
 
@@ -290,7 +290,7 @@
 usage(const char *synopsis)
 {
 
-	(void)fprintf(stderr, "usage: %s %s\n", getprogname(), synopsis);
+	fprintf(stderr, "usage: %s %s\n", getprogname(), synopsis);
 	exit(1);
 }
 
@@ -481,8 +481,8 @@
 	}
 
 	if (!nl && !nonl)
-		(void)fputc('\n', stdout);
-	(void)fflush(stdout);
+		fputc('\n', stdout);
+	fflush(stdout);
 }
 
 /*
@@ -699,7 +699,7 @@
 			case S_IFREG:
 				if (st->st_mode &
 				    (S_IXUSR | S_IXGRP | S_IXOTH))
-					(void)strcat(sdata, "*");
+					strcat(sdata, "*");
 				break;
 			case S_IFLNK:	(void)strcat(sdata, "@");	break;
 			case S_IFSOCK:	(void)strcat(sdata, "=");	break;
@@ -729,9 +729,9 @@
 		small = 0;
 		data = 0;
 		if (file == NULL)
-			(void)strncpy(path, "(stdin)", sizeof(path));
+			strncpy(path, "(stdin)", sizeof(path));
 		else
-			(void)strncpy(path, file, sizeof(path));
+			strncpy(path, file, sizeof(path));
 		sdata = path;
 		formats = FMTF_STRING;
 		if (ofmt == 0)
@@ -781,17 +781,17 @@
 	 * Assemble the format string for passing to printf(3).
 	 */
 	lfmt[0] = '\0';
-	(void)strcat(lfmt, "%");
+	strcat(lfmt, "%");
 	if (flags & FLAG_POUND)
-		(void)strcat(lfmt, "#");
+		strcat(lfmt, "#");
 	if (flags & FLAG_SPACE)
-		(void)strcat(lfmt, " ");
+		strcat(lfmt, " ");
 	if (flags & FLAG_PLUS)
-		(void)strcat(lfmt, "+");
+		strcat(lfmt, "+");
 	if (flags & FLAG_MINUS)
-		(void)strcat(lfmt, "-");
+		strcat(lfmt, "-");
 	if (flags & FLAG_ZERO)
-		(void)strcat(lfmt, "0");
+		strcat(lfmt, "0");
 
 	/*
 	 * Only the timespecs support the FLOAT output format, and that
@@ -803,10 +803,10 @@
 		 */
 		if (prec == 0) {
 			if (size != -1) {
-				(void)snprintf(tmp, sizeof(tmp), "%d", size);
-				(void)strcat(lfmt, tmp);
+				snprintf(tmp, sizeof(tmp), "%d", size);
+				strcat(lfmt, tmp);
 			}
-			(void)strcat(lfmt, "d");
+			strcat(lfmt, "d");
 			return (snprintf(buf, blen, lfmt, ts.tv_sec));
 		}
 
@@ -827,23 +827,23 @@
 		 * Any leftover size that's legitimate will be used.
 		 */
 		if (size > 0) {
-			(void)snprintf(tmp, sizeof(tmp), "%d", size);
-			(void)strcat(lfmt, tmp);
+			snprintf(tmp, sizeof(tmp), "%d", size);
+			strcat(lfmt, tmp);
 		}
-		(void)strcat(lfmt, "d");
+		strcat(lfmt, "d");
 
 		/*
 		 * The stuff after the decimal point always needs zero
 		 * filling.
 		 */
-		(void)strcat(lfmt, ".%0");
+		strcat(lfmt, ".%0");
 
 		/*
 		 * We can "print" at most nine digits of precision.  The
 		 * rest we will pad on at the end.
 		 */
-		(void)snprintf(tmp, sizeof(tmp), "%dd", prec > 9 ? 9 : prec);
-		(void)strcat(lfmt, tmp);
+		snprintf(tmp, sizeof(tmp), "%dd", prec > 9 ? 9 : prec);
+		strcat(lfmt, tmp);
 
 		/*
 		 * For precision of less that nine digits, trim off the
@@ -858,7 +858,7 @@
 		 */
 		l = snprintf(buf, blen, lfmt, ts.tv_sec, ts.tv_nsec);
 		for (; prec > 9 && l < blen; prec--, l++)
-			(void)strcat(buf, "0");
+			strcat(buf, "0");
 		return (l);
 	}
 
@@ -866,12 +866,12 @@
 	 * Add on size and precision, if specified, to the format.
 	 */
 	if (size != -1) {
-		(void)snprintf(tmp, sizeof(tmp), "%d", size);
-		(void)strcat(lfmt, tmp);
+		snprintf(tmp, sizeof(tmp), "%d", size);
+		strcat(lfmt, tmp);
 	}
 	if (prec != -1) {
-		(void)snprintf(tmp, sizeof(tmp), ".%d", prec);
-		(void)strcat(lfmt, tmp);
+		snprintf(tmp, sizeof(tmp), ".%d", prec);
+		strcat(lfmt, tmp);
 	}
 
 	/*
@@ -880,7 +880,7 @@
 	if (ofmt == FMTF_STRING) {
 		if (sdata == NULL)
 			errx(1, "%.*s: bad format", (int)flen, fmt);
-		(void)strcat(lfmt, "s");
+		strcat(lfmt, "s");
 		return (snprintf(buf, blen, lfmt, sdata));
 	}
 
@@ -894,7 +894,7 @@
 	/*
 	 * The four "numeric" output forms.
 	 */
-	(void)strcat(lfmt, "ll");
+	strcat(lfmt, "ll");
 	switch (ofmt) {
 	case FMTF_DECIMAL:	(void)strcat(lfmt, "d");	break;
 	case FMTF_OCTAL:		(void)strcat(lfmt, "o");	break;
Index: strings/strings.c
===================================================================
RCS file: /cvs/src/usr.bin/strings/strings.c,v
retrieving revision 1.3
diff -u -u -r1.3 strings.c
--- strings/strings.c	4 Oct 2003 20:36:51 -0000	1.3
+++ strings/strings.c	7 Nov 2004 20:02:16 -0000
@@ -75,7 +75,7 @@
 	u_char *bfr;
 	char *file, *p;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	/*
 	 * for backward compatibility, allow '-' to specify 'a' flag; no
@@ -204,7 +204,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: strings [-afo] [-n length] [file ... ]\n");
 	exit(1);
 }
Index: strip/strip.c
===================================================================
RCS file: /cvs/src/usr.bin/strip/strip.c,v
retrieving revision 1.4
diff -u -u -r1.4 strip.c
--- strip/strip.c	3 Nov 2003 19:31:33 -0000	1.4
+++ strip/strip.c	7 Nov 2004 20:02:16 -0000
@@ -244,6 +244,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: strip [-dx] file ...\n");
+	fprintf(stderr, "usage: strip [-dx] file ...\n");
 	exit(1);
 }
Index: su/su.c
===================================================================
RCS file: /cvs/src/usr.bin/su/su.c,v
retrieving revision 1.5
diff -u -u -r1.5 su.c
--- su/su.c	19 Jun 2004 18:55:48 -0000	1.5
+++ su/su.c	7 Nov 2004 20:02:16 -0000
@@ -158,7 +158,7 @@
 		user = argv[optind++];
 
 	if (strlen(user) > MAXLOGNAME - 1) {
-		(void)fprintf(stderr, "su: username too long.\n");
+		fprintf(stderr, "su: username too long.\n");
 		exit(1);
 	}
 		
@@ -190,7 +190,7 @@
 	prio = getpriority(PRIO_PROCESS, 0);
 	if (errno)
 		prio = 0;
-	(void)setpriority(PRIO_PROCESS, 0, -2);
+	setpriority(PRIO_PROCESS, 0, -2);
 	openlog("su", LOG_CONS, 0);
 
 	/* get current login name and shell */
@@ -346,7 +346,7 @@
 		    iscsh = strcmp(p, "tcsh") ? NO : YES;
 	}
 
-	(void)setpriority(PRIO_PROCESS, 0, prio);
+	setpriority(PRIO_PROCESS, 0, prio);
 
 #ifdef LOGIN_CAP
 	/* Set everything now except the environment & umask */
@@ -383,21 +383,21 @@
 			/* set the su'd user's environment & umask */
 			setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV);
 #else
-			(void)setenv("PATH", _PATH_DEFPATH, 1);
+			setenv("PATH", _PATH_DEFPATH, 1);
 #endif
 			if (p)
-				(void)setenv("TERM", p, 1);
+				setenv("TERM", p, 1);
 #ifdef KERBEROS5
 			if (ccname)
-				(void)setenv("KRB5CCNAME", ccname, 1);
+				setenv("KRB5CCNAME", ccname, 1);
 #endif
 			if (chdir(pwd->pw_dir) < 0)
 				errx(1, "no directory");
 		}
 		if (asthem || pwd->pw_uid)
-			(void)setenv("USER", pwd->pw_name, 1);
-		(void)setenv("HOME", pwd->pw_dir, 1);
-		(void)setenv("SHELL", shell, 1);
+			setenv("USER", pwd->pw_name, 1);
+		setenv("HOME", pwd->pw_dir, 1);
+		setenv("SHELL", shell, 1);
 	}
 	if (iscsh == YES) {
 		if (fastlogin)
@@ -424,7 +424,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: su [-] [-%s] %s[login [args]]\n",
+	fprintf(stderr, "usage: su [-] [-%s] %s[login [args]]\n",
 	    KERBEROS_ARG("K") COMMON_ARG("flm"),
 #ifdef LOGIN_CAP
 	    "[-c class] "
@@ -549,7 +549,7 @@
 	if (p != NULL)
 		ccname = strdup(p);
 	else
-		(void)asprintf(&ccname, "%s%lu", KRB5_DEFAULT_CCROOT,
+		asprintf(&ccname, "%s%lu", KRB5_DEFAULT_CCROOT,
 		    (unsigned long)ruid);
 	if (ccname == NULL)
 		return (errno);
@@ -591,7 +591,7 @@
 			return (rv);
 		}
 		*p++ = '\0';
-		(void)asprintf(su_principal_name, "%s/%s@%s", principal_name,
+		asprintf(su_principal_name, "%s/%s@%s", principal_name,
 		    superuser, p);
 		free(principal_name);
 	} else 
Index: symorder/symorder.c
===================================================================
RCS file: /cvs/src/usr.bin/symorder/symorder.c,v
retrieving revision 1.3
diff -u -u -r1.3 symorder.c
--- symorder/symorder.c	4 Oct 2003 20:36:51 -0000	1.3
+++ symorder/symorder.c	7 Nov 2004 20:02:16 -0000
@@ -126,7 +126,7 @@
 		if (++nsym >= sizeof order / sizeof order[0])
 			break;
 	}
-	(void)fclose(f);
+	fclose(f);
 
 	if (xfilename != NULL) {
 		if ((xfile = fopen(xfilename, "r")) == NULL)
@@ -142,7 +142,7 @@
 			if (++nexclude >= sizeof exclude / sizeof exclude[0])
 				break;
 		}
-		(void)fclose(xfile);
+		fclose(xfile);
 	}
 
 	kfile = argv[1];
@@ -158,13 +158,13 @@
 		badfmt("bad magic number");
 	if (exec.a_syms == 0)
 		badfmt("stripped");
-	(void)fstat(fileno(f), &stb);
+	fstat(fileno(f), &stb);
 	if (stb.st_size < N_STROFF(exec) + sizeof(off_t))
 		badfmt("no string table");
 
 	/* seek to and read the symbol table */
 	sa = N_SYMOFF(exec);
-	(void)fseek(f, sa, SEEK_SET);
+	fseek(f, sa, SEEK_SET);
 	n = exec.a_syms;
 	if (!(symtab = (struct nlist *)malloc(n)))
 		err(ERREXIT, NULL);
@@ -215,7 +215,7 @@
 		} else if (clean)
 			symfound++;
 		symp->n_un.n_strx -= sizeof(int);
-		(void)strcpy(t, &strings[symp->n_un.n_strx]);
+		strcpy(t, &strings[symp->n_un.n_strx]);
 		symp->n_un.n_strx = (t - newstrings) + sizeof(int);
 		t += strlen(t) + 1;
 	}
@@ -225,12 +225,12 @@
 	n = symkept * sizeof(struct nlist);
 
 	/* fix exec sym size */
-	(void)lseek(o, (off_t)0, SEEK_SET);
+	lseek(o, (off_t)0, SEEK_SET);
 	exec.a_syms = n;
 	if (write(o, (void *)&exec, sizeof(exec)) != sizeof(exec))
 		err(ERREXIT, "%s", kfile);
 
-	(void)lseek(o, sa, SEEK_SET);
+	lseek(o, sa, SEEK_SET);
 	if (write(o, (void *)symtab, n) != n)
 		err(ERREXIT, "%s", kfile);
 	if (write(o, (void *)&strtabsize, sizeof(int)) != sizeof(int))
@@ -242,7 +242,7 @@
 	ftruncate(o, lseek(o, (off_t)0, SEEK_CUR));
 
 	if ((i = nsym - symfound) > 0) {
-		(void)printf("symorder: %d symbol%s not found:\n",
+		printf("symorder: %d symbol%s not found:\n",
 		    i, i == 1 ? "" : "s");
 		for (i = 0; i < nsym; i++)
 			if (order[i].n_value == 0)
@@ -334,7 +334,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: symorder [-c] [-m] [-t] [-x excludelist] symlist file\n");
 	exit(ERREXIT);
 }
Index: systat/ifstat.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/ifstat.c,v
retrieving revision 1.1
diff -u -u -r1.1 ifstat.c
--- systat/ifstat.c	8 Nov 2003 09:30:32 -0000	1.1
+++ systat/ifstat.c	7 Nov 2004 20:02:16 -0000
@@ -261,7 +261,7 @@
 		error = gettimeofday(&new_tv, (struct timezone *)0);
 		if (error) 
 			IFSTAT_ERR(2, "error getting time of day");
-		(void)getifmibdata(ifp->if_row, &ifp->if_mib);
+		getifmibdata(ifp->if_row, &ifp->if_mib);
 
 
                 new_inb = ifp->if_mib.ifmd_data.ifi_ibytes;
@@ -329,8 +329,8 @@
 
 		newstr = (char *)ifp->if_name;
 		ptr = newstr + pad_len;
-		(void)memset((void *)newstr, (int)' ', IF_NAMESIZE);
-		(void)strncpy(ptr, (const char *)&ifp->if_mib.ifmd_name,
+		memset((void *)newstr, (int)' ', IF_NAMESIZE);
+		strncpy(ptr, (const char *)&ifp->if_mib.ifmd_name,
 			      str_len);
 	}
 
Index: systat/iostat.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/iostat.c,v
retrieving revision 1.3
diff -u -u -r1.3 iostat.c
--- systat/iostat.c	4 Oct 2003 20:36:51 -0000	1.3
+++ systat/iostat.c	7 Nov 2004 20:02:16 -0000
@@ -313,7 +313,7 @@
 				wmove(wnd, row + 3, 0);
 				winsertln(wnd);
 			}
-			(void) devstats(row + 3, col, i);
+			devstats(row + 3, col, i);
 			col += COLWIDTH;
 		}
 }
Index: systat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/main.c,v
retrieving revision 1.5
diff -u -u -r1.5 main.c
--- systat/main.c	8 Nov 2003 09:30:32 -0000	1.5
+++ systat/main.c	7 Nov 2004 20:02:16 -0000
@@ -81,7 +81,7 @@
 {
 	char errbuf[_POSIX2_LINE_MAX];
 
-	(void) setlocale(LC_TIME, "");
+	setlocale(LC_TIME, "");
 
 	argc--, argv++;
 	while (argc > 0) {
@@ -176,7 +176,7 @@
 	struct itimerval ctv;
 
 	/* Get the load average over the last minute. */
-	(void) getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0]));
+	getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0]));
 	(*curcmd->c_fetch)();
 	if (curcmd->c_flags & CF_LOADAV) {
 		j = 5.0*avenrun[0] + 0.5;
@@ -205,7 +205,7 @@
 load(void)
 {
 
-	(void) getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0]));
+	getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0]));
 	mvprintw(CMDLINE, 0, "%4.1f %4.1f %4.1f",
 	    avenrun[0], avenrun[1], avenrun[2]);
 	clrtoeol();
@@ -233,7 +233,7 @@
 
 	if (wnd) {
 		getyx(stdscr, oy, ox);
-		(void) vsnprintf(buf, sizeof(buf), fmt, ap);
+		vsnprintf(buf, sizeof(buf), fmt, ap);
 		clrtoeol();
 		standout();
 		mvaddstr(CMDLINE, 0, buf);
@@ -241,7 +241,7 @@
 		move(oy, ox);
 		refresh();
 	} else {
-		(void) vfprintf(stderr, fmt, ap);
+		vfprintf(stderr, fmt, ap);
 		fprintf(stderr, "\n");
 	}
 	va_end(ap);
Index: systat/vmstat.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.7
diff -u -u -r1.7 vmstat.c
--- systat/vmstat.c	2 Apr 2004 05:46:03 -0000	1.7
+++ systat/vmstat.c	7 Nov 2004 20:02:16 -0000
@@ -134,7 +134,7 @@
 closekre(WINDOW *w)
 {
 
-	(void) close(ut);
+	close(ut);
 	if (w == NULL)
 		return;
 	wclear(w);
@@ -275,7 +275,7 @@
 
 	time(&now);
 	tp = localtime(&now);
-	(void) strftime(buf, sizeof(buf),
+	strftime(buf, sizeof(buf),
 			d_first ? "%e %b %R" : "%b %e %R", tp);
 	getinfo(&s, state);
 }
Index: tail/forward.c
===================================================================
RCS file: /cvs/src/usr.bin/tail/forward.c,v
retrieving revision 1.3
diff -u -u -r1.3 forward.c
--- tail/forward.c	4 Oct 2003 20:36:51 -0000	1.3
+++ tail/forward.c	7 Nov 2004 20:02:16 -0000
@@ -180,7 +180,7 @@
 			ierr();
 			return;
 		}
-		(void)fflush(stdout);
+		fflush(stdout);
 		if (! fflag)
 			break;
 		clearerr(fp);
@@ -231,7 +231,7 @@
 			break;
 
 		case USE_SLEEP:
-                	(void) usleep(250000);
+                	usleep(250000);
 	                clearerr(fp);
 			break;
 		}
@@ -239,7 +239,7 @@
 		if (Fflag && fileno(fp) != STDIN_FILENO) {
 			while (stat(fname, &sb2) != 0)
 				/* file was rotated, wait until it reappears */
-				(void)sleep(1);
+				sleep(1);
 			if (sb2.st_ino != sbp->st_ino ||
 			    sb2.st_dev != sbp->st_dev ||
 			    sb2.st_rdev != sbp->st_rdev ||
Index: tail/tail.c
===================================================================
RCS file: /cvs/src/usr.bin/tail/tail.c,v
retrieving revision 1.3
diff -u -u -r1.3 tail.c
--- tail/tail.c	4 Oct 2003 20:36:52 -0000	1.3
+++ tail/tail.c	7 Nov 2004 20:02:16 -0000
@@ -165,17 +165,17 @@
 				continue;
 			}
 			if (argc > 1) {
-				(void)printf("%s==> %s <==\n",
+				printf("%s==> %s <==\n",
 				    first ? "" : "\n", fname);
 				first = 0;
-				(void)fflush(stdout);
+				fflush(stdout);
 			}
 
 			if (rflag)
 				reverse(fp, style, off, &sb);
 			else
 				forward(fp, style, off, &sb);
-			(void)fclose(fp);
+			fclose(fp);
 		}
 	else {
 		fname = "stdin";
@@ -264,7 +264,7 @@
 				errx(1, "illegal option -- %s", *argv);
 			}
 			*p++ = *argv[0];
-			(void)strcpy(p, ap);
+			strcpy(p, ap);
 			*argv = start;
 			continue;
 
@@ -294,7 +294,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 	    "usage: tail [-F | -f | -r] [-b # | -c # | -n #] [file ...]\n");
 	exit(1);
 }
Index: talk/init_disp.c
===================================================================
RCS file: /cvs/src/usr.bin/talk/init_disp.c,v
retrieving revision 1.3
diff -u -u -r1.3 init_disp.c
--- talk/init_disp.c	4 Oct 2003 20:36:52 -0000	1.3
+++ talk/init_disp.c	7 Nov 2004 20:02:16 -0000
@@ -76,9 +76,9 @@
 
 	if (initscr() == NULL)
 		errx(1, "Terminal type unset or lacking necessary features.");
-	(void) sigaction(SIGTSTP, (struct sigaction *)0, &sa);
+	sigaction(SIGTSTP, (struct sigaction *)0, &sa);
 	sigaddset(&sa.sa_mask, SIGALRM);
-	(void) sigaction(SIGTSTP, &sa, (struct sigaction *)0);
+	sigaction(SIGTSTP, &sa, (struct sigaction *)0);
 	curses_initialized = 1;
 	clear();
 	refresh();
Index: talk/invite.c
===================================================================
RCS file: /cvs/src/usr.bin/talk/invite.c,v
retrieving revision 1.4
diff -u -u -r1.4 invite.c
--- talk/invite.c	19 Aug 2004 23:32:02 -0000	1.4
+++ talk/invite.c	7 Nov 2004 20:02:16 -0000
@@ -90,7 +90,7 @@
 	setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
 	message("Waiting for your party to respond");
 	signal(SIGALRM, re_invite);
-	(void) setjmp(invitebuf);
+	setjmp(invitebuf);
 	while ((new_sockt = accept(sockt, 0, 0)) < 0) {
 		if (errno == EINTR)
 			continue;
Index: talk/talk.c
===================================================================
RCS file: /cvs/src/usr.bin/talk/talk.c,v
retrieving revision 1.3
diff -u -u -r1.3 talk.c
--- talk/talk.c	4 Oct 2003 20:36:52 -0000	1.3
+++ talk/talk.c	7 Nov 2004 20:02:16 -0000
@@ -59,7 +59,7 @@
 int
 main(int argc, char **argv)
 {
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	get_names(argc, argv);
 	check_writeable();
Index: tcopy/tcopy.c
===================================================================
RCS file: /cvs/src/usr.bin/tcopy/tcopy.c,v
retrieving revision 1.3
diff -u -u -r1.3 tcopy.c
--- tcopy/tcopy.c	4 Oct 2003 20:36:52 -0000	1.3
+++ tcopy/tcopy.c	7 Nov 2004 20:02:16 -0000
@@ -137,7 +137,7 @@
 	}
 
 	if ((oldsig = signal(SIGINT, SIG_IGN)) != SIG_IGN)
-		(void) signal(SIGINT, intr);
+		signal(SIGINT, intr);
 
 	needeof = 0;
 	for (lastnread = NOCOUNT;;) {
@@ -161,7 +161,7 @@
 			if (nread != 0)
 				fprintf(msg, "file %d: block size %d: ",
 				    filen, nread);
-			(void) fflush(stdout);
+			fflush(stdout);
 			lastrec = record;
 		}
 r1:		guesslen = 0;
@@ -201,7 +201,7 @@
 		lastnread = nread;
 	}
 	fprintf(msg, "total length: %qu bytes\n", tsize);
-	(void)signal(SIGINT, oldsig);
+	signal(SIGINT, oldsig);
 	if (op == COPY || op == COPYVERIFY) {
 		writeop(outp, MTWEOF);
 		writeop(outp, MTWEOF);
Index: telnet/commands.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.3
diff -u -u -r1.3 commands.c
--- telnet/commands.c	4 Oct 2003 20:36:52 -0000	1.3
+++ telnet/commands.c	7 Nov 2004 20:02:16 -0000
@@ -128,7 +128,7 @@
 		perror("fork");
 		break;
 	default:
-		(void) wait(&status);
+		wait(&status);
 		if (WIFEXITED(status))
 			return (WEXITSTATUS(status));
 	}
@@ -1238,12 +1238,12 @@
 		arg = argv[1];
 	else {
 		printf("new escape character: ");
-		(void) fgets(buf, sizeof(buf), stdin);
+		fgets(buf, sizeof(buf), stdin);
 		arg = buf;
 	}
 	if (arg[0] != '\0')
 		escape = arg[0];
-	(void) fflush(stdout);
+	fflush(stdout);
 	return 1;
 }
 
@@ -1253,7 +1253,7 @@
     crmod = !crmod;
     printf("Deprecated usage - please use 'toggle crmod' in the future.\n");
     printf("%s map carriage return on output.\n", crmod ? "Will" : "Won't");
-    (void) fflush(stdout);
+    fflush(stdout);
     return 1;
 }
 
@@ -1266,7 +1266,7 @@
 	long oldrows, oldcols, newrows, newcols, err_;
 
 	err_ = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
-	(void) kill(0, SIGTSTP);
+	kill(0, SIGTSTP);
 	/*
 	 * If we didn't get the window size before the SUSPEND, but we
 	 * can get them now (?), then send the NAWS to make sure that
@@ -1321,7 +1321,7 @@
 	    _exit(1);
 	}
     default:
-	    (void)wait((int *)0);	/* Wait for the shell to complete */
+	    wait((int *)0);	/* Wait for the shell to complete */
 
 	    if (TerminalWindowSize(&newrows, &newcols) && connected &&
 		(err_ || ((oldrows != newrows) || (oldcols != newcols)))) {
@@ -1338,9 +1338,9 @@
     extern int resettermname;
 
     if (connected) {
-	(void) shutdown(net, 2);
+	shutdown(net, 2);
 	printf("Connection closed.\n");
-	(void) NetClose(net);
+	NetClose(net);
 	connected = 0;
 	resettermname = 1;
 	/* reset options */
@@ -1356,7 +1356,7 @@
 void
 quit(void)
 {
-	(void) call(bye, "bye", "fromquit", 0);
+	call(bye, "bye", "fromquit", 0);
 	Exit(0);
 }
 
@@ -1364,7 +1364,7 @@
 logout(void)
 {
 	send_do(TELOPT_LOGOUT, 1);
-	(void) netflush();
+	netflush();
 	return 1;
 }
 
@@ -1811,7 +1811,7 @@
 	printf("No connection.\n");
     }
     printf("Escape character is '%s'.\n", control(escape));
-    (void) fflush(stdout);
+    fflush(stdout);
     return 1;
 }
 
@@ -1822,7 +1822,7 @@
 void
 ayt_status(void)
 {
-    (void) call(status, "status", "notmuch", 0);
+    call(status, "status", "notmuch", 0);
 }
 #endif
 
@@ -1922,9 +1922,9 @@
 	return 0;
     }
     if (argc < 2) {
-	(void) strcpy(line, "open ");
+	strcpy(line, "open ");
 	printf("(to) ");
-	(void) fgets(&line[strlen(line)], sizeof(line) - strlen(line), stdin);
+	fgets(&line[strlen(line)], sizeof(line) - strlen(line), stdin);
 	makeargv();
 	argc = margc;
 	argv = margv;
@@ -2011,7 +2011,7 @@
 	}
 	if (connect(net, (struct sockaddr *)&su, sizeof su) == -1) {
 	    perror(su.sun_path);
-	    (void) NetClose(net);
+	    NetClose(net);
 	    goto fail;
 	}
 	goto af_unix;
@@ -2064,17 +2064,17 @@
 				  _hostname, sizeof(_hostname) - 1, NULL, 0,
 				  NI_NAMEREQD);
 	if (gni_err != 0)
-	    (void) strncpy(_hostname, hostp, sizeof(_hostname) - 1);
+	    strncpy(_hostname, hostp, sizeof(_hostname) - 1);
 	_hostname[sizeof(_hostname)-1] = '\0';
 	hostname = _hostname;
     } else {
 	/* hostname has FQDN */
 	if (srcroute != 0)
-	    (void) strncpy(_hostname, hostname, sizeof(_hostname) - 1);
+	    strncpy(_hostname, hostname, sizeof(_hostname) - 1);
 	else if (res->ai_canonname != NULL)
 	  strcpy(_hostname, res->ai_canonname);
 	else
-	  (void) strncpy(_hostname, hostp, sizeof(_hostname) - 1);
+	  strncpy(_hostname, hostp, sizeof(_hostname) - 1);
 	_hostname[sizeof(_hostname)-1] = '\0';
 	hostname = _hostname;
     }
@@ -2157,22 +2157,22 @@
 	        if (family == AF_UNSPEC && af_error == 0 &&
 		    switch_af(&res) == 1) {
 		    af_error = 1;
-		    (void) NetClose(net);
+		    NetClose(net);
 		    goto af_again;
 		}
 #endif
 		perror("bind");
-		(void) NetClose(net);
+		NetClose(net);
 		goto fail;
 	    }
 	}
 #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 	if (setpolicy(net, res, ipsec_policy_in) < 0) {
-		(void) NetClose(net);
+		NetClose(net);
 		goto fail;
 	}
 	if (setpolicy(net, res, ipsec_policy_out) < 0) {
-		(void) NetClose(net);
+		NetClose(net);
 		goto fail;
 	}
 #endif
@@ -2188,11 +2188,11 @@
 	    warn("connect to address %s", sockaddr_ntop(res->ai_addr));
 	    if (next != NULL) {
 		res = next;
-		(void) NetClose(net);
+		NetClose(net);
 		continue;
 	    }
 	    warnx("Unable to connect to remote host");
-	    (void) NetClose(net);
+	    NetClose(net);
 	    goto fail;
 	}
 	connected++;
@@ -2218,10 +2218,10 @@
 	env_define("USER", user);
 	env_export("USER");
     }
-    (void) call(status, "status", "notmuch", 0);
+    call(status, "status", "notmuch", 0);
     if (setjmp(peerdied) == 0)
 	telnet(user);
-    (void) NetClose(net);
+    NetClose(net);
     ExitString("Connection closed by foreign host.\n",1);
     /*NOTREACHED*/
  fail:
@@ -2327,8 +2327,8 @@
     if (!top) {
 	putchar('\n');
     } else {
-	(void) signal(SIGINT, SIG_DFL);
-	(void) signal(SIGQUIT, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
+	signal(SIGQUIT, SIG_DFL);
     }
     for (;;) {
 	if (rlogin == _POSIX_VDISABLE)
@@ -2350,7 +2350,7 @@
 		printf("%s> ", prompt);
 	    if (fgets(line, sizeof(line), stdin) == NULL) {
 		if (feof(stdin) || ferror(stdin)) {
-		    (void) quit();
+		    quit();
 		    /*NOTREACHED*/
 		}
 		break;
Index: telnet/main.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/main.c,v
retrieving revision 1.2
diff -u -u -r1.2 main.c
--- telnet/main.c	17 Jun 2003 04:29:32 -0000	1.2
+++ telnet/main.c	7 Nov 2004 20:02:16 -0000
@@ -274,7 +274,7 @@
 		else
 			return (1);
 	}
-	(void)setjmp(toplevel);
+	setjmp(toplevel);
 	for (;;) {
 			command(1, 0, 0);
 	}
Index: telnet/network.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/network.c,v
retrieving revision 1.2
diff -u -u -r1.2 network.c
--- telnet/network.c	17 Jun 2003 04:29:32 -0000	1.2
+++ telnet/network.c	7 Nov 2004 20:02:16 -0000
@@ -90,7 +90,7 @@
 
     if (value < 0) {
 	perror("select");
-	(void) quit();
+	quit();
 	/* NOTREACHED */
     }
     if (FD_ISSET(net, &excepts)) {
@@ -147,7 +147,7 @@
 	if (errno != ENOBUFS && errno != EWOULDBLOCK) {
 	    setcommandmode();
 	    perror(hostname);
-	    (void)NetClose(net);
+	    NetClose(net);
 	    ring_clear_mark(&netoring);
 	    longjmp(peerdied, -1);
 	    /*NOTREACHED*/
@@ -164,7 +164,7 @@
 	 * up the other half.
 	 */
 	if ((n1 == n) && ring_full_consecutive(&netoring)) {
-	    (void) netflush();
+	    netflush();
 	}
 	return 1;
     } else {
Index: telnet/sys_bsd.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/sys_bsd.c,v
retrieving revision 1.2
diff -u -u -r1.2 sys_bsd.c
--- telnet/sys_bsd.c	17 Jun 2003 04:29:32 -0000	1.2
+++ telnet/sys_bsd.c	7 Nov 2004 20:02:16 -0000
@@ -220,9 +220,9 @@
 TerminalFlushOutput(void)
 {
 #ifdef	TIOCFLUSH
-    (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);
+    ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);
 #else
-    (void) ioctl(fileno(stdout), TCFLSH, (char *) 0);
+    ioctl(fileno(stdout), TCFLSH, (char *) 0);
 #endif
 }
 
@@ -589,16 +589,16 @@
 
     if (f != -1) {
 #ifdef  SIGINT
-	(void) signal(SIGINT, intr);
+	signal(SIGINT, intr);
 #endif
 #ifdef  SIGQUIT
-	(void) signal(SIGQUIT, intr2);
+	signal(SIGQUIT, intr2);
 #endif
 #ifdef	SIGTSTP
-	(void) signal(SIGTSTP, susp);
+	signal(SIGTSTP, susp);
 #endif	/* SIGTSTP */
 #ifdef	SIGINFO
-	(void) signal(SIGINFO, ayt);
+	signal(SIGINFO, ayt);
 #endif
 #if	defined(USE_TERMIO) && defined(NOKERNINFO)
 	tmp_tc.c_lflag |= NOKERNINFO;
@@ -640,20 +640,20 @@
 #endif
     } else {
 #ifdef	SIGINFO
-	(void) signal(SIGINFO, (void (*)(int))ayt_status);
+	signal(SIGINFO, (void (*)(int))ayt_status);
 #endif
 #ifdef  SIGINT
-	(void) signal(SIGINT, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
 #endif
 #ifdef  SIGQUIT
-	(void) signal(SIGQUIT, SIG_DFL);
+	signal(SIGQUIT, SIG_DFL);
 #endif
 #ifdef	SIGTSTP
-	(void) signal(SIGTSTP, SIG_DFL);
+	signal(SIGTSTP, SIG_DFL);
 # ifndef SOLARIS
-	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
+	sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
 # else	SOLARIS
-	(void) sigrelse(SIGTSTP);
+	sigrelse(SIGTSTP);
 # endif	SOLARIS
 #endif	/* SIGTSTP */
 #ifndef USE_TERMIO
@@ -880,17 +880,17 @@
 void
 sys_telnet_init(void)
 {
-    (void) signal(SIGINT, intr);
-    (void) signal(SIGQUIT, intr2);
-    (void) signal(SIGPIPE, deadpeer);
+    signal(SIGINT, intr);
+    signal(SIGQUIT, intr2);
+    signal(SIGPIPE, deadpeer);
 #ifdef	SIGWINCH
-    (void) signal(SIGWINCH, sendwin);
+    signal(SIGWINCH, sendwin);
 #endif
 #ifdef	SIGTSTP
-    (void) signal(SIGTSTP, susp);
+    signal(SIGTSTP, susp);
 #endif
 #ifdef	SIGINFO
-    (void) signal(SIGINFO, ayt);
+    signal(SIGINFO, ayt);
 #endif
 
     setconnmode(0);
@@ -986,7 +986,7 @@
     if (FD_ISSET(net, xbitsp)) {
 	FD_CLR(net, xbitsp);
 	SYNCHing = 1;
-	(void) ttyflush(1);	/* flush already enqueued data */
+	ttyflush(1);	/* flush already enqueued data */
     }
 
     /*
Index: telnet/telnet.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/telnet.c,v
retrieving revision 1.2
diff -u -u -r1.2 telnet.c
--- telnet/telnet.c	17 Jun 2003 04:29:32 -0000	1.2
+++ telnet/telnet.c	7 Nov 2004 20:02:16 -0000
@@ -1096,7 +1096,7 @@
 	}
     }
     slc_end_reply();
-    (void)slc_update();
+    slc_update();
     setconnmode(1);	/* Make sure the character values are set */
 }
 
@@ -1587,7 +1587,7 @@
 		     */
 		printoption("RCVD", IAC, DM);
 		SYNCHing = 1;
-		(void) ttyflush(1);
+		ttyflush(1);
 		SYNCHing = stilloob();
 		settimer(gotDM);
 		break;
@@ -2018,7 +2018,7 @@
     NETADD(TELOPT_TM);
     flushline = 1;
     flushout = 1;
-    (void) ttyflush(1);			/* Flush/drop output */
+    ttyflush(1);			/* Flush/drop output */
     /* do printoption AFTER flush, otherwise the output gets tossed... */
     printoption("SENT", DO, TELOPT_TM);
 }
Index: telnet/utilities.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/utilities.c,v
retrieving revision 1.2
diff -u -u -r1.2 utilities.c
--- telnet/utilities.c	17 Jun 2003 04:29:32 -0000	1.2
+++ telnet/utilities.c	7 Nov 2004 20:02:16 -0000
@@ -718,13 +718,13 @@
 
     if (TTYBYTES() == 0) {
 	FD_SET(tout, &o);
-	(void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
+	select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
 			(struct timeval *) 0);	/* wait for TTLOWAT */
     } else {
 	while (TTYBYTES()) {
-	    (void) ttyflush(0);
+	    ttyflush(0);
 	    FD_SET(tout, &o);
-	    (void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
+	    select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
 				(struct timeval *) 0);	/* wait for TTLOWAT */
 	}
     }
@@ -735,7 +735,7 @@
 {
     setconnmode(0);
     do {
-	(void)telrcv();			/* Process any incoming data */
+	telrcv();			/* Process any incoming data */
 	EmptyTerminal();
     } while (ring_full_count(&netiring));	/* While there is any */
     setcommandmode();
Index: tftp/main.c
===================================================================
RCS file: /cvs/src/usr.bin/tftp/main.c,v
retrieving revision 1.5
diff -u -u -r1.5 main.c
--- tftp/main.c	30 Aug 2004 18:06:50 -0000	1.5
+++ tftp/main.c	7 Nov 2004 20:02:16 -0000
@@ -156,7 +156,7 @@
 		setpeer(argc, argv);
 	}
 	if (setjmp(toplevel) != 0)
-		(void)putchar('\n');
+		putchar('\n');
 	command();
 }
 
@@ -217,10 +217,10 @@
 		/* res->ai_addr <= sizeof(peeraddr) is guaranteed */
 		memcpy(&peeraddr, res->ai_addr, res->ai_addrlen);
 		if (res->ai_canonname) {
-			(void) strncpy(hostname, res->ai_canonname,
+			strncpy(hostname, res->ai_canonname,
 				sizeof(hostname));
 		} else
-			(void) strncpy(hostname, host, sizeof(hostname));
+			strncpy(hostname, host, sizeof(hostname));
 		hostname[sizeof(hostname)-1] = 0;
 		connected = 1;
 	}
Index: tftp/tftp.c
===================================================================
RCS file: /cvs/src/usr.bin/tftp/tftp.c,v
retrieving revision 1.5
diff -u -u -r1.5 tftp.c
--- tftp/tftp.c	3 Sep 2004 20:38:01 -0000	1.5
+++ tftp/tftp.c	7 Nov 2004 20:02:16 -0000
@@ -126,7 +126,7 @@
 			dp->th_block = htons((u_short)block);
 		}
 		timeout = 0;
-		(void) setjmp(timeoutbuf);
+		setjmp(timeoutbuf);
 send_data:
 		if (trace)
 			tpacket("sent", dp, size + 4);
@@ -240,7 +240,7 @@
 			block++;
 		}
 		timeout = 0;
-		(void) setjmp(timeoutbuf);
+		setjmp(timeoutbuf);
 send_ack:
 		if (trace)
 			tpacket("sent", ap, size);
@@ -311,7 +311,7 @@
 abort:						/* ok to ack, since user */
 	ap->th_opcode = htons((u_short)ACK);	/* has seen err msg */
 	ap->th_block = htons((u_short)block);
-	(void) sendto(f, ackbuf, 4, 0, (struct sockaddr *)&peer,
+	sendto(f, ackbuf, 4, 0, (struct sockaddr *)&peer,
 	    peer.ss_len);
 	write_behind(file, convert);		/* flush last buffer */
 	fclose(file);
@@ -426,14 +426,14 @@
 startclock(void)
 {
 
-	(void)gettimeofday(&tstart, NULL);
+	gettimeofday(&tstart, NULL);
 }
 
 static void
 stopclock(void)
 {
 
-	(void)gettimeofday(&tstop, NULL);
+	gettimeofday(&tstop, NULL);
 }
 
 static void
Index: tftp/tftpsubs.c
===================================================================
RCS file: /cvs/src/usr.bin/tftp/tftpsubs.c,v
retrieving revision 1.3
diff -u -u -r1.3 tftpsubs.c
--- tftp/tftpsubs.c	4 Oct 2003 20:36:52 -0000	1.3
+++ tftp/tftpsubs.c	7 Nov 2004 20:02:16 -0000
@@ -174,7 +174,7 @@
 	bfs[current].counter = ct;      /* set size of data to write */
 	current = !current;             /* switch to other buffer */
 	if (bfs[current].counter != BF_FREE)     /* if not free */
-		(void)write_behind(file, convert); /* flush it */
+		write_behind(file, convert); /* flush it */
 	bfs[current].counter = BF_ALLOC;        /* mark as alloc'd */
 	*dpp =  (struct tftphdr *)bfs[current].buf;
 	return ct;                      /* this is a lie of course */
@@ -252,11 +252,11 @@
 	int fromlen;
 
 	while (1) {
-		(void) ioctl(f, FIONREAD, &i);
+		ioctl(f, FIONREAD, &i);
 		if (i) {
 			j++;
 			fromlen = sizeof from;
-			(void) recvfrom(f, rbuf, sizeof (rbuf), 0,
+			recvfrom(f, rbuf, sizeof (rbuf), 0,
 				(struct sockaddr *)&from, &fromlen);
 		} else {
 			return(j);
Index: top/machine.c
===================================================================
RCS file: /cvs/src/usr.bin/top/machine.c,v
retrieving revision 1.12
diff -u -u -r1.12 machine.c
--- top/machine.c	4 Jun 2004 11:21:53 -0000	1.12
+++ top/machine.c	7 Nov 2004 20:02:16 -0000
@@ -252,7 +252,7 @@
 
 
     /* get the list of symbols we want to access in the kernel */
-    (void) kvm_nlist(kd, nlst);
+    kvm_nlist(kd, nlst);
     if (nlst[0].n_type == 0)
     {
 	fprintf(stderr, "top: nlist failed\n");
@@ -265,7 +265,7 @@
 	return(-1);
     }
 
-    (void) getkval(nlst[X_CCPU].n_value,   (int *)(&ccpu),	sizeof(ccpu),
+    getkval(nlst[X_CCPU].n_value,   (int *)(&ccpu),	sizeof(ccpu),
 	    nlst[X_CCPU].n_name);
 
     /* stash away certain offsets for later use */
@@ -338,12 +338,12 @@
     size_t bt_size;
 
     /* get the cp_time array */
-    (void) getkval(cp_time_offset, (int *)cp_time, sizeof(cp_time),
+    getkval(cp_time_offset, (int *)cp_time, sizeof(cp_time),
 		   nlst[X_CP_TIME].n_name);
-    (void) getkval(avenrun_offset, (int *)avenrun, sizeof(avenrun),
+    getkval(avenrun_offset, (int *)avenrun, sizeof(avenrun),
 		   nlst[X_AVENRUN].n_name);
 
-    (void) getkval(lastpid_offset, (int *)(&lastpid), sizeof(lastpid),
+    getkval(lastpid_offset, (int *)(&lastpid), sizeof(lastpid),
 		   "!");
 
     /* convert load averages to doubles */
@@ -391,7 +391,7 @@
 		perror("sysctlbyname: vm.vmstats");
 		exit(1);
 	}
-        (void) getkval(bufspace_offset, (int *)(&bufspace), sizeof(bufspace),
+        getkval(bufspace_offset, (int *)(&bufspace), sizeof(bufspace),
 		   "_bufspace");
 
 	/* convert memory stats to Kbytes */
@@ -481,7 +481,7 @@
 	pref = (struct kinfo_proc **) realloc(pref, sizeof(struct kinfo_proc *)
 		* (onproc = nproc));
     if (pref == NULL || pbase == NULL) {
-	(void) fprintf(stderr, "top: Out of memory.\n");
+	fprintf(stderr, "top: Out of memory.\n");
 	quit(23);
     }
     /* get a pointer to the states summary array */
@@ -577,11 +577,11 @@
 	char *comm = TP(pp, td_comm);
 #define COMSIZ sizeof(TP(pp, td_comm))
 	char buf[COMSIZ];
-	(void) strncpy(buf, comm, COMSIZ);
+	strncpy(buf, comm, COMSIZ);
 	comm[0] = wrapper[0];
-	(void) strncpy(&comm[1], buf, COMSIZ - 2);
+	strncpy(&comm[1], buf, COMSIZ - 2);
 	comm[COMSIZ - 2] = '\0';
-	(void) strncat(comm, &wrapper[1], COMSIZ - 1);
+	strncat(comm, &wrapper[1], COMSIZ - 1);
 	comm[COMSIZ - 1] = '\0';
     }
 
@@ -685,7 +685,7 @@
 	if (nlst->n_type == 0)
 	{
 	    /* this one wasn't found */
-	    (void) fprintf(stderr, "kernel: no symbol named `%s'\n",
+	    fprintf(stderr, "kernel: no symbol named `%s'\n",
 			   nlst->n_name);
 	    i = 1;
 	}
Index: tput/tput.c
===================================================================
RCS file: /cvs/src/usr.bin/tput/tput.c,v
retrieving revision 1.3
diff -u -u -r1.3 tput.c
--- tput/tput.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tput/tput.c	7 Nov 2004 20:02:16 -0000
@@ -100,7 +100,7 @@
 		if (tgetstr(p, &cptr))
 			argv = process(p, buf, argv);
 		else if ((n = tgetnum(p)) != -1)
-			(void)printf("%d\n", n);
+			printf("%d\n", n);
 		else
 			exitval = !tgetflag(p);
 	}
@@ -116,7 +116,7 @@
 	for (p = buf; *p && *p != ':'; ++p);
 	savech = *(savep = p);
 	for (*p = '\0'; p >= buf && *p != '|'; --p);
-	(void)printf("%s\n", p + 1);
+	printf("%s\n", p + 1);
 	*savep = savech;
 }
 
@@ -166,7 +166,7 @@
 	/* And print them. */
 	switch (arg_need) {
 	case 0:
-		(void)tputs(str, 1, outc);
+		tputs(str, 1, outc);
 		break;
 	case 1:
 		arg_cols = 0;
@@ -175,7 +175,7 @@
 			errx(2, errfew, 1, cap);
 		arg_rows = atoi(*argv);
 
-		(void)tputs(tgoto(str, arg_cols, arg_rows), 1, outc);
+		tputs(tgoto(str, arg_cols, arg_rows), 1, outc);
 		break;
 	case 2:
 		if (*++argv == NULL || *argv[0] == '\0')
@@ -186,7 +186,7 @@
 			errx(2, errfew, 2, cap);
 		arg_rows = atoi(*argv);
 
-		(void) tputs(tgoto(str, arg_cols, arg_rows), arg_rows, outc);
+		tputs(tgoto(str, arg_cols, arg_rows), arg_rows, outc);
 		break;
 
 	default:
@@ -198,6 +198,6 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: tput [-T term] attribute ...\n");
+	fprintf(stderr, "usage: tput [-T term] attribute ...\n");
 	exit(1);
 }
Index: tr/tr.c
===================================================================
RCS file: /cvs/src/usr.bin/tr/tr.c,v
retrieving revision 1.3
diff -u -u -r1.3 tr.c
--- tr/tr.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tr/tr.c	7 Nov 2004 20:02:16 -0000
@@ -94,7 +94,7 @@
 	int ch, cnt, lastch, *p;
 	int cflag, dflag, sflag, isstring2;
 
-	(void)setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	cflag = dflag = sflag = 0;
 	while ((ch = getopt(argc, argv, "cdsu")) != -1)
@@ -146,7 +146,7 @@
 		for (lastch = OOBCH; (ch = getchar()) != EOF;)
 			if (!string1[ch] && (!string2[ch] || lastch != ch)) {
 				lastch = ch;
-				(void)putchar(ch);
+				putchar(ch);
 			}
 		exit(0);
 	}
@@ -163,7 +163,7 @@
 
 		while ((ch = getchar()) != EOF)
 			if (!string1[ch])
-				(void)putchar(ch);
+				putchar(ch);
 		exit(0);
 	}
 
@@ -177,7 +177,7 @@
 		for (lastch = OOBCH; (ch = getchar()) != EOF;)
 			if (!string1[ch] || lastch != ch) {
 				lastch = ch;
-				(void)putchar(ch);
+				putchar(ch);
 			}
 		exit(0);
 	}
@@ -207,12 +207,12 @@
 		while (next(&s1)) {
 			string1[s1.lastch] = ch = s2.lastch;
 			string2[ch] = 1;
-			(void)next(&s2);
+			next(&s2);
 		}
 	else
 		while (next(&s1)) {
 			string1[s1.lastch] = ch = s2.lastch;
-			(void)next(&s2);
+			next(&s2);
 		}
 
 	if (cflag)
@@ -224,12 +224,12 @@
 			ch = string1[ch];
 			if (!string2[ch] || lastch != ch) {
 				lastch = ch;
-				(void)putchar(ch);
+				putchar(ch);
 			}
 		}
 	else
 		while ((ch = getchar()) != EOF)
-			(void)putchar(string1[ch]);
+			putchar(string1[ch]);
 	exit (0);
 }
 
@@ -250,7 +250,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n",
 		"usage: tr [-csu] string1 string2",
 		"       tr [-cu] -d string1",
 		"       tr [-cu] -s string1",
Index: truss/main.c
===================================================================
RCS file: /cvs/src/usr.bin/truss/main.c,v
retrieving revision 1.4
diff -u -u -r1.4 main.c
--- truss/main.c	4 Nov 2003 15:34:41 -0000	1.4
+++ truss/main.c	7 Nov 2004 20:02:16 -0000
@@ -278,8 +278,8 @@
   if (sigexit) {
     if (sigexit == SIGQUIT)
       exit(sigexit);
-    (void) signal(sigexit, SIG_DFL);
-    (void) kill(getpid(), sigexit);
+    signal(sigexit, SIG_DFL);
+    kill(getpid(), sigexit);
   }
   return 0;
 }
Index: tset/map.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/map.c,v
retrieving revision 1.5
diff -u -u -r1.5 map.c
--- tset/map.c	30 Aug 2004 18:06:50 -0000	1.5
+++ tset/map.c	7 Nov 2004 20:02:16 -0000
@@ -158,21 +158,21 @@
 	}
 
 #ifdef MAPDEBUG
-	(void)printf("port: %s\n", mapp->porttype ? mapp->porttype : "ANY");
-	(void)printf("type: %s\n", mapp->type);
-	(void)printf("conditional: ");
+	printf("port: %s\n", mapp->porttype ? mapp->porttype : "ANY");
+	printf("type: %s\n", mapp->type);
+	printf("conditional: ");
 	p = "";
 	if (mapp->conditional & GT) {
-		(void)printf("GT");
+		printf("GT");
 		p = "/";
 	}
 	if (mapp->conditional & EQ) {
-		(void)printf("%sEQ", p);
+		printf("%sEQ", p);
 		p = "/";
 	}
 	if (mapp->conditional & LT)
-		(void)printf("%sLT", p);
-	(void)printf("\nspeed: %d\n", mapp->speed);
+		printf("%sLT", p);
+	printf("\nspeed: %d\n", mapp->speed);
 #endif
 }
 
Index: tset/misc.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/misc.c,v
retrieving revision 1.3
diff -u -u -r1.3 misc.c
--- tset/misc.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tset/misc.c	7 Nov 2004 20:02:16 -0000
@@ -57,7 +57,7 @@
 			err(1, "write to stderr");
 	if (nr != 0)
 		err(1, "%s", file);
-	(void)close(fd);
+	close(fd);
 }
 
 int
Index: tset/set.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/set.c,v
retrieving revision 1.3
diff -u -u -r1.3 set.c
--- tset/set.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tset/set.c	7 Nov 2004 20:02:16 -0000
@@ -263,9 +263,9 @@
 	}
 
 	if (settle) {
-		(void)putc('\r', stderr);
-		(void)fflush(stderr);
-		(void)sleep(1);			/* Settle the terminal. */
+		putc('\r', stderr);
+		fflush(stderr);
+		sleep(1);			/* Settle the terminal. */
 	}
 }
 
@@ -287,7 +287,7 @@
 	Set_tab = tgetstr("st", &capsp);
 
 	if (Set_tab && (clear_tabs = tgetstr("ct", &capsp))) {
-		(void)putc('\r', stderr);	/* Force to left margin. */
+		putc('\r', stderr);	/* Force to left margin. */
 		tputs(clear_tabs, 0, outc);
 	}
 
@@ -308,7 +308,7 @@
 			if (*tg_out != 'O')
 				tputs(tg_out, 1, outc);
 			else
-				(void)fprintf(stderr, "%s", "        ");
+				fprintf(stderr, "%s", "        ");
 			/* Set the tab. */
 			tputs(Set_tab, 0, outc);
 		}
Index: tset/term.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/term.c,v
retrieving revision 1.4
diff -u -u -r1.4 term.c
--- tset/term.c	30 Aug 2004 18:06:50 -0000	1.4
+++ tset/term.c	7 Nov 2004 20:02:16 -0000
@@ -126,19 +126,19 @@
 
 	/* We can get recalled; if so, don't continue uselessly. */
 	if (feof(stdin) || ferror(stdin)) {
-		(void)fprintf(stderr, "\n");
+		fprintf(stderr, "\n");
 		exit(1);
 	}
 	for (;;) {
 		if (dflt)
-			(void)fprintf(stderr, "Terminal type? [%s] ", dflt);
+			fprintf(stderr, "Terminal type? [%s] ", dflt);
 		else
-			(void)fprintf(stderr, "Terminal type? ");
-		(void)fflush(stderr);
+			fprintf(stderr, "Terminal type? ");
+		fflush(stderr);
 
 		if (fgets(answer, sizeof(answer), stdin) == NULL) {
 			if (dflt == NULL) {
-				(void)fprintf(stderr, "\n");
+				fprintf(stderr, "\n");
 				exit(1);
 			}
 			return (dflt);
Index: tset/tset.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/tset.c,v
retrieving revision 1.3
diff -u -u -r1.3 tset.c
--- tset/tset.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tset/tset.c	7 Nov 2004 20:02:16 -0000
@@ -155,12 +155,12 @@
 
 #ifdef TIOCGWINSZ
 		/* Set window size */
-		(void)ioctl(STDERR_FILENO, TIOCGWINSZ, &win);
+		ioctl(STDERR_FILENO, TIOCGWINSZ, &win);
 		if (win.ws_row == 0 && win.ws_col == 0 &&
 		    Lines > 0 && Columns > 0) {
 			win.ws_row = Lines;
 			win.ws_col = Columns;
-			(void)ioctl(STDERR_FILENO, TIOCSWINSZ, &win);
+			ioctl(STDERR_FILENO, TIOCSWINSZ, &win);
 		}
 #endif
 		set_control_chars();
@@ -175,10 +175,10 @@
 	}
 
 	if (noset)
-		(void)printf("%s\n", ttype);
+		printf("%s\n", ttype);
 	else {
 		if (showterm)
-			(void)fprintf(stderr, "Terminal type is %s.\n", ttype);
+			fprintf(stderr, "Terminal type is %s.\n", ttype);
 		/*
 		 * If erase, kill and interrupt characters could have been
 		 * modified and not -Q, display the changes.
@@ -191,7 +191,7 @@
 	}
 
 	if (Sflag) {
-		(void)printf("%s ", ttype);
+		printf("%s ", ttype);
 		if (strlen(tcapbuf) > 0)
 			wrtermcap(tcapbuf);
 	}
@@ -238,17 +238,17 @@
 	if (old == new && old == def)
 		return;
 
-	(void)fprintf(stderr, "%s %s ", name, old == new ? "is" : "set to");
+	fprintf(stderr, "%s %s ", name, old == new ? "is" : "set to");
 
 	if (new == 010)
-		(void)fprintf(stderr, "backspace.\n");
+		fprintf(stderr, "backspace.\n");
 	else if (new == 0177)
-		(void)fprintf(stderr, "delete.\n");
+		fprintf(stderr, "delete.\n");
 	else if (new < 040) {
 		new ^= 0100;
-		(void)fprintf(stderr, "control-%c (^%c).\n", new, new);
+		fprintf(stderr, "control-%c (^%c).\n", new, new);
 	} else
-		(void)fprintf(stderr, "%c.\n", new);
+		fprintf(stderr, "%c.\n", new);
 }
 
 /*
@@ -280,7 +280,7 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n",
 "usage: tset  [-IQrSs] [-] [-e ch] [-i ch] [-k ch] [-m mapping] [terminal]",
 "       reset [-IQrSs] [-] [-e ch] [-i ch] [-k ch] [-m mapping] [terminal]");
 	exit(1);
Index: tset/wrterm.c
===================================================================
RCS file: /cvs/src/usr.bin/tset/wrterm.c,v
retrieving revision 1.4
diff -u -u -r1.4 wrterm.c
--- tset/wrterm.c	30 Aug 2004 18:06:50 -0000	1.4
+++ tset/wrterm.c	7 Nov 2004 20:02:16 -0000
@@ -62,10 +62,10 @@
 	sep = "";
 	while ((p = strsep(&bp, "|")) != NULL)
 		if (*p != '\0' && strpbrk(p, " \t") == NULL) {
-			(void)printf("%s%s", sep, p);
+			printf("%s%s", sep, p);
 			sep = "|";
 		}
-	(void)putchar(':');
+	putchar(':');
 
 	/*
 	 * Output fields, transforming any dangerous characters.  Skip
@@ -79,34 +79,34 @@
 		while ((ch = *p++) != '\0')
 			switch(ch) {
 			case '\033':
-				(void)printf("\\E");
+				printf("\\E");
 			case  ' ':		/* No spaces. */
-				(void)printf("\\040");
+				printf("\\040");
 				break;
 			case '!':		/* No csh history chars. */
-				(void)printf("\\041");
+				printf("\\041");
 				break;
 			case ',':		/* No csh history chars. */
-				(void)printf("\\054");
+				printf("\\054");
 				break;
 			case '"':		/* No quotes. */
-				(void)printf("\\042");
+				printf("\\042");
 				break;
 			case '\'':		/* No quotes. */
-				(void)printf("\\047");
+				printf("\\047");
 				break;
 			case '`':		/* No quotes. */
-				(void)printf("\\140");
+				printf("\\140");
 				break;
 			case '\\':		/* Anything following is OK. */
 			case '^':
-				(void)putchar(ch);
+				putchar(ch);
 				if ((ch = *p++) == '\0')
 					break;
 				/* FALLTHROUGH */
 			default:
-				(void)putchar(ch);
+				putchar(ch);
 		}
-		(void)putchar(':');
+		putchar(':');
 	}
 }
Index: tsort/tsort.c
===================================================================
RCS file: /cvs/src/usr.bin/tsort/tsort.c,v
retrieving revision 1.3
diff -u -u -r1.3 tsort.c
--- tsort/tsort.c	4 Oct 2003 20:36:53 -0000	1.3
+++ tsort/tsort.c	7 Nov 2004 20:02:16 -0000
@@ -170,7 +170,7 @@
 			add_arc(bufs[0].b_buf, bufs[1].b_buf);
 		n = !n;
 	}
-	(void)fclose(fp);
+	fclose(fp);
 	if (n)
 		errx(1, "odd data count");
 
@@ -358,7 +358,7 @@
 	register NODE **np;
 	register int i;
 
-	(void)printf("%s\n", n->n_name);
+	printf("%s\n", n->n_name);
 	for (np = n->n_arcs, i = n->n_narcs; --i >= 0; np++)
 		--(*np)->n_refcnt;
 	n->n_narcs = 0;
@@ -388,7 +388,7 @@
 		if (*np == to) {
 			if (depth + 1 > longest_len) {
 				longest_len = depth + 1;
-				(void)memcpy((char *)longest_cycle,
+				memcpy((char *)longest_cycle,
 				    (char *)cycle_buf,
 				    longest_len * sizeof(NODE *));
 			}
@@ -398,7 +398,7 @@
 			len = find_cycle(*np, to, longest_len, depth + 1);
 
 			if (debug)
-				(void)printf("%*s %s->%s %d\n", depth, "",
+				printf("%*s %s->%s %d\n", depth, "",
 				    from->n_name, to->n_name, len);
 
 			if (len == 0)
@@ -418,6 +418,6 @@
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: tsort [-dlq] [file]\n");
+	fprintf(stderr, "usage: tsort [-dlq] [file]\n");
 	exit(1);
 }
Index: ul/ul.c
===================================================================
RCS file: /cvs/src/usr.bin/ul/ul.c,v
retrieving revision 1.3
diff -u -u -r1.3 ul.c
--- ul/ul.c	4 Oct 2003 20:36:54 -0000	1.3
+++ ul/ul.c	7 Nov 2004 20:02:16 -0000
@@ -126,7 +126,7 @@
 
 	case 0:
 		/* No such terminal type - assume dumb */
-		(void)strcpy(termcap, "dumb:os:col#80:cr=^M:sf=^J:am:");
+		strcpy(termcap, "dumb:os:col#80:cr=^M:sf=^J:am:");
 		break;
 	}
 	initcap();
@@ -293,7 +293,7 @@
 	putchar('\n');
 	if (iflag && hadmodes)
 		iattr();
-	(void)fflush(stdout);
+	fflush(stdout);
 	if (upln)
 		upln--;
 	initbuf();
Index: unifdef/unifdef.c
===================================================================
RCS file: /cvs/src/usr.bin/unifdef/unifdef.c,v
retrieving revision 1.2
diff -u -u -r1.2 unifdef.c
--- unifdef/unifdef.c	17 Jun 2003 04:29:33 -0000	1.2
+++ unifdef/unifdef.c	7 Nov 2004 20:02:16 -0000
@@ -278,7 +278,7 @@
 		filename = *argv;
 		if ((input = fopen(filename, "r")) != NULL) {
 			process();
-			(void) fclose(input);
+			fclose(input);
 		} else
 			err(2, "can't open %s", *argv);
 	} else {
Index: uniq/uniq.c
===================================================================
RCS file: /cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.3
diff -u -u -r1.3 uniq.c
--- uniq/uniq.c	4 Oct 2003 20:36:54 -0000	1.3
+++ uniq/uniq.c	7 Nov 2004 20:02:16 -0000
@@ -70,7 +70,7 @@
 	char *prevline, *thisline, *p;
 	int iflag = 0, comp;
 
-	(void) setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 
 	obsolete(argv);
 	while ((ch = getopt(argc, argv, "cdif:s:u")) != -1)
@@ -186,9 +186,9 @@
 {
 
 	if (cflag && *str)
-		(void)fprintf(ofp, "%4d %s\n", repeats + 1, str);
+		fprintf(ofp, "%4d %s\n", repeats + 1, str);
 	if ((dflag && repeats) || (uflag && !repeats))
-		(void)fprintf(ofp, "%s\n", str);
+		fprintf(ofp, "%s\n", str);
 }
 
 char *
@@ -240,7 +240,7 @@
 			errx(1, "malloc");
 		*p++ = '-';
 		*p++ = ap[0] == '+' ? 's' : 'f';
-		(void)strcpy(p, ap + 1);
+		strcpy(p, ap + 1);
 		*argv = start;
 	}
 }
@@ -248,7 +248,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: uniq [-c | -d | -u] [-i] [-f fields] [-s chars] [input [output]]\n");
 	exit(1);
 }
Index: uudecode/uudecode.c
===================================================================
RCS file: /cvs/src/usr.bin/uudecode/uudecode.c,v
retrieving revision 1.2
diff -u -u -r1.2 uudecode.c
--- uudecode/uudecode.c	17 Jun 2003 04:29:33 -0000	1.2
+++ uudecode/uudecode.c	7 Nov 2004 20:02:16 -0000
@@ -420,7 +420,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: uudecode [-cimprs] [file ...]\n"
 "       uudecode [-i] -o output_file [file]\n"
 "       b64decode [-cimprs] [file ...]\n"
Index: uuencode/uuencode.c
===================================================================
RCS file: /cvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.2
diff -u -u -r1.2 uuencode.c
--- uuencode/uuencode.c	17 Jun 2003 04:29:33 -0000	1.2
+++ uuencode/uuencode.c	7 Nov 2004 20:02:16 -0000
@@ -170,7 +170,7 @@
 	register char *p;
 	char buf[80];
 
-	(void)fprintf(output, "begin %o %s\n", mode, *av);
+	fprintf(output, "begin %o %s\n", mode, *av);
 	while ((n = fread(buf, 1, 45, stdin))) {
 		ch = ENC(n);
 		if (fputc(ch, output) == EOF)
@@ -204,13 +204,13 @@
 	}
 	if (ferror(stdin))
 		errx(1, "read error");
-	(void)fprintf(output, "%c\nend\n", ENC('\0'));
+	fprintf(output, "%c\nend\n", ENC('\0'));
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr,
+	fprintf(stderr,
 "usage: uuencode [-m] [-o outfile] [infile] remotefile\n"
 "       b64encode [-o outfile] [infile] remotefile\n");
 	exit(1);
Index: vis/vis.c
===================================================================
RCS file: /cvs/src/usr.bin/vis/vis.c,v
retrieving revision 1.3
diff -u -u -r1.3 vis.c
--- vis/vis.c	4 Oct 2003 20:36:54 -0000	1.3
+++ vis/vis.c	7 Nov 2004 20:02:16 -0000
@@ -55,7 +55,7 @@
 	FILE *fp;
 	int ch;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	while ((ch = getopt(argc, argv, "nwctsobfF:ld")) != -1)
 		switch((char)ch) {
@@ -152,7 +152,7 @@
 			*cp++ = '\n';
 			*cp = '\0';
 		} else
-			(void) vis(buff, (char)c, eflags, (char)rachar);
+			vis(buff, (char)c, eflags, (char)rachar);
 
 		cp = buff;
 		if (fold) {
Index: w/pr_time.c
===================================================================
RCS file: /cvs/src/usr.bin/w/pr_time.c,v
retrieving revision 1.3
diff -u -u -r1.3 pr_time.c
--- w/pr_time.c	4 Oct 2003 20:36:54 -0000	1.3
+++ w/pr_time.c	7 Nov 2004 20:02:17 -0000
@@ -61,7 +61,7 @@
 
 	/* If more than a week, use day-month-year. */
 	if (diff > 86400 * 7)
-		(void)strcpy(fmt, "%d%b%y");
+		strcpy(fmt, "%d%b%y");
 
 	/* If not today, use day-hour-am/pm. */
 	else if (tm.tm_mday != tp.tm_mday ||
@@ -69,16 +69,16 @@
 		 tm.tm_year != tp.tm_year) {
 	/* The line below does not take DST into consideration */
 	/* else if (*now / 86400 != *started / 86400) { */
-		(void)strcpy(fmt, use_ampm ? "%a%I%p" : "%a%H");
+		strcpy(fmt, use_ampm ? "%a%I%p" : "%a%H");
 	}
 
 	/* Default is hh:mm{am,pm}. */
 	else {
-		(void)strcpy(fmt, use_ampm ? "%l:%M%p" : "%k:%M");
+		strcpy(fmt, use_ampm ? "%l:%M%p" : "%k:%M");
 	}
 
-	(void)strftime(buf, sizeof(buf), fmt, &tp);
-	(void)printf("%-7.7s", buf);
+	strftime(buf, sizeof(buf), fmt, &tp);
+	printf("%-7.7s", buf);
 }
 
 /*
@@ -92,7 +92,7 @@
 	/* If idle more than 36 hours, print as a number of days. */
 	if (idle >= 36 * 3600) {
 		int days = idle / 86400;
-		(void)printf(" %dday%s ", days, days > 1 ? "s" : " " );
+		printf(" %dday%s ", days, days > 1 ? "s" : " " );
 		if (days >= 100)
 			return (2);
 		if (days >= 10)
@@ -101,15 +101,15 @@
 
 	/* If idle more than an hour, print as HH:MM. */
 	else if (idle >= 3600)
-		(void)printf(" %2d:%02d ",
+		printf(" %2d:%02d ",
 		    (int)(idle / 3600), (int)((idle % 3600) / 60));
 
 	else if (idle / 60 == 0)
-		(void)printf("     - ");
+		printf("     - ");
 
 	/* Else print the minutes idle. */
 	else
-		(void)printf("    %2d ", (int)(idle / 60));
+		printf("    %2d ", (int)(idle / 60));
 
 	return (0); /* not idle longer than 9 days */
 }
Index: w/w.c
===================================================================
RCS file: /cvs/src/usr.bin/w/w.c,v
retrieving revision 1.6
diff -u -u -r1.6 w.c
--- w/w.c	25 Oct 2004 22:04:18 -0000	1.6
+++ w/w.c	7 Nov 2004 20:02:17 -0000
@@ -131,7 +131,7 @@
 	char *memf, *nlistf, *p, *x;
 	char buf[MAXHOSTNAMELEN], errbuf[_POSIX2_LINE_MAX];
 
-	(void)setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 	use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0');
 	use_comma = (*nl_langinfo(RADIXCHAR) != ',');
 
@@ -194,7 +194,7 @@
 	if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL)
 		errx(1, "%s", errbuf);
 
-	(void)time(&now);
+	time(&now);
 	if ((ut = fopen(_PATH_UTMP, "r")) == NULL)
 		err(1, "%s", _PATH_UTMP);
 
@@ -238,7 +238,7 @@
 			mib[0] = CTL_MACHDEP;
 			mib[1] = CPU_CONSDEV;
 			size = sizeof(dev_t);
-			(void)sysctl(mib, 2, &ep->tdev, &size, NULL, 0);
+			sysctl(mib, 2, &ep->tdev, &size, NULL, 0);
 		}
 #endif
 		touched = stp->st_atime;
@@ -249,12 +249,12 @@
 		if ((ep->idle = now - touched) < 0)
 			ep->idle = 0;
 	}
-	(void)fclose(ut);
+	fclose(ut);
 
 	if (header || wcmd == 0) {
 		pr_header(&now, nusers);
 		if (wcmd == 0) {
-			(void)kvm_close(kd);
+			kvm_close(kd);
 			exit(0);
 		}
 
@@ -265,7 +265,7 @@
 #define HEADER_WHAT		"WHAT\n"
 #define WUSED  (UT_NAMESIZE + UT_LINESIZE + UT_HOSTSIZE + \
 		sizeof(HEADER_LOGIN_IDLE) + 3)	/* header width incl. spaces */ 
-		(void)printf("%-*.*s %-*.*s %-*.*s  %s", 
+		printf("%-*.*s %-*.*s %-*.*s  %s", 
 				UT_NAMESIZE, UT_NAMESIZE, HEADER_USER,
 				UT_LINESIZE, UT_LINESIZE, HEADER_TTY,
 				UT_HOSTSIZE, UT_HOSTSIZE, HEADER_FROM,
@@ -384,7 +384,7 @@
 			}
 		}
 		if (x) {
-			(void)snprintf(buf, sizeof(buf), "%s:%s", p, x);
+			snprintf(buf, sizeof(buf), "%s:%s", p, x);
 			p = buf;
 		}
 		if (dflag) {
@@ -395,11 +395,11 @@
 				    dkp->kp_thread.td_comm, MAXCOMLEN);
 				if (ptr == NULL)
 					ptr = "-";
-				(void)printf("\t\t%-9d %s\n",
+				printf("\t\t%-9d %s\n",
 				    dkp->kp_proc.p_pid, ptr);
 			}
 		}
-		(void)printf("%-*.*s %-*.*s %-*.*s ",
+		printf("%-*.*s %-*.*s %-*.*s ",
 		    UT_NAMESIZE, UT_NAMESIZE, ep->utmp.ut_name,
 		    UT_LINESIZE, UT_LINESIZE,
 		    strncmp(ep->utmp.ut_line, "tty", 3) &&
@@ -408,9 +408,9 @@
 		    UT_HOSTSIZE, UT_HOSTSIZE, *p ? p : "-");
 		pr_attime(&ep->utmp.ut_time, &now);
 		longidle = pr_idle(ep->idle);
-		(void)printf("%.*s\n", argwidth - longidle, ep->args);
+		printf("%.*s\n", argwidth - longidle, ep->args);
 	}
-	(void)kvm_close(kd);
+	kvm_close(kd);
 	exit(0);
 }
 
@@ -427,10 +427,10 @@
 	/*
 	 * Print time of day.
 	 */
-	(void)strftime(buf, sizeof(buf)	- 1,
+	strftime(buf, sizeof(buf)	- 1,
 		       use_ampm	? "%l:%M%p" : "%k:%M", localtime(nowp));
 	buf[sizeof(buf) - 1] = '\0';
-	(void)printf("%s ", buf);
+	printf("%s ", buf);
 
 	/*
 	 * Print how long system has been up.
@@ -450,35 +450,35 @@
 		uptime %= 3600;
 		mins = uptime / 60;
 		secs = uptime % 60;
-		(void)printf(" up");
+		printf(" up");
 		if (days > 0)
-			(void)printf(" %d day%s,", days, days > 1 ? "s" : "");
+			printf(" %d day%s,", days, days > 1 ? "s" : "");
 		if (hrs > 0 && mins > 0)
-			(void)printf(" %2d:%02d,", hrs, mins);
+			printf(" %2d:%02d,", hrs, mins);
 		else if (hrs > 0)
-			(void)printf(" %d hr%s,", hrs, hrs > 1 ? "s" : "");
+			printf(" %d hr%s,", hrs, hrs > 1 ? "s" : "");
 		else if (mins > 0)
-			(void)printf(" %d min%s,", mins, mins > 1 ? "s" : "");
+			printf(" %d min%s,", mins, mins > 1 ? "s" : "");
 		else
-			(void)printf(" %d sec%s,", secs, secs > 1 ? "s" : "");
+			printf(" %d sec%s,", secs, secs > 1 ? "s" : "");
 	}
 
 	/* Print number of users logged in on system */
-	(void)printf(" %d user%s", nusers, nusers == 1 ? "" : "s");
+	printf(" %d user%s", nusers, nusers == 1 ? "" : "s");
 
 	/*
 	 * Print 1, 5, and 15 minute load averages.
 	 */
 	if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) == -1)
-		(void)printf(", no load average information available\n");
+		printf(", no load average information available\n");
 	else {
-		(void)printf(", load averages:");
+		printf(", load averages:");
 		for (i = 0; i < (sizeof(avenrun) / sizeof(avenrun[0])); i++) {
 			if (use_comma && i > 0)
-				(void)printf(",");
-			(void)printf(" %.2f", avenrun[i]);
+				printf(",");
+			printf(" %.2f", avenrun[i]);
 		}
-		(void)printf("\n");
+		printf("\n");
 	}
 }
 
@@ -488,7 +488,7 @@
 	static struct stat sb;
 	char ttybuf[MAXPATHLEN];
 
-	(void)snprintf(ttybuf, sizeof(ttybuf), "%s%.*s", _PATH_DEV, sz, line);
+	snprintf(ttybuf, sizeof(ttybuf), "%s%.*s", _PATH_DEV, sz, line);
 	if (stat(ttybuf, &sb)) {
 		warn("%s", ttybuf);
 		return (NULL);
@@ -500,10 +500,10 @@
 usage(int wcmd)
 {
 	if (wcmd)
-		(void)fprintf(stderr,
+		fprintf(stderr,
 		    "usage: w [-dhin] [-M core] [-N system] [user ...]\n");
 	else
-		(void)fprintf(stderr, "usage: uptime\n");
+		fprintf(stderr, "usage: uptime\n");
 	exit(1);
 }
 
Index: wall/ttymsg.c
===================================================================
RCS file: /cvs/src/usr.bin/wall/ttymsg.c,v
retrieving revision 1.2
diff -u -u -r1.2 ttymsg.c
--- wall/ttymsg.c	17 Jun 2003 04:29:33 -0000	1.2
+++ wall/ttymsg.c	7 Nov 2004 20:02:17 -0000
@@ -73,7 +73,7 @@
 	strlcpy(device + sizeof(_PATH_DEV) - 1, line, sizeof(device));
 	if (strchr(device + sizeof(_PATH_DEV) - 1, '/')) {
 		/* A slash is an attempt to break security... */
-		(void) snprintf(errbuf, sizeof(errbuf),
+		snprintf(errbuf, sizeof(errbuf),
 		    "Too many '/' in \"%s\"", device);
 		return (errbuf);
 	}
@@ -85,7 +85,7 @@
 	if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) {
 		if (errno == EBUSY || errno == EACCES)
 			return (NULL);
-		(void) snprintf(errbuf, sizeof(errbuf), "%s: %s", device,
+		snprintf(errbuf, sizeof(errbuf), "%s: %s", device,
 		    strerror(errno));
 		return (errbuf);
 	}
@@ -119,27 +119,27 @@
 			int cpid;
 
 			if (forked) {
-				(void) close(fd);
+				close(fd);
 				_exit(1);
 			}
 			cpid = fork();
 			if (cpid < 0) {
-				(void) snprintf(errbuf, sizeof(errbuf),
+				snprintf(errbuf, sizeof(errbuf),
 				    "fork: %s", strerror(errno));
-				(void) close(fd);
+				close(fd);
 				return (errbuf);
 			}
 			if (cpid) {	/* parent */
-				(void) close(fd);
+				close(fd);
 				return (NULL);
 			}
 			forked++;
 			/* wait at most tmout seconds */
-			(void) signal(SIGALRM, SIG_DFL);
-			(void) signal(SIGTERM, SIG_DFL); /* XXX */
-			(void) sigsetmask(0);
-			(void) alarm((u_int)tmout);
-			(void) fcntl(fd, F_SETFL, 0);	/* clear O_NONBLOCK */
+			signal(SIGALRM, SIG_DFL);
+			signal(SIGTERM, SIG_DFL); /* XXX */
+			sigsetmask(0);
+			alarm((u_int)tmout);
+			fcntl(fd, F_SETFL, 0);	/* clear O_NONBLOCK */
 			continue;
 		}
 		/*
@@ -148,15 +148,15 @@
 		 */
 		if (errno == ENODEV || errno == EIO)
 			break;
-		(void) close(fd);
+		close(fd);
 		if (forked)
 			_exit(1);
-		(void) snprintf(errbuf, sizeof(errbuf),
+		snprintf(errbuf, sizeof(errbuf),
 		    "%s: %s", device, strerror(errno));
 		return (errbuf);
 	}
 
-	(void) close(fd);
+	close(fd);
 	if (forked)
 		_exit(0);
 	return (NULL);
Index: wall/wall.c
===================================================================
RCS file: /cvs/src/usr.bin/wall/wall.c,v
retrieving revision 1.3
diff -u -u -r1.3 wall.c
--- wall/wall.c	4 Oct 2003 20:36:54 -0000	1.3
+++ wall/wall.c	7 Nov 2004 20:02:17 -0000
@@ -90,7 +90,7 @@
 	char line[sizeof(utmp.ut_line) + 1];
 	char username[sizeof(utmp.ut_name) + 1];
 
-	(void)setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	while ((ch = getopt(argc, argv, "g:n")) != -1)
 		switch (ch) {
@@ -168,7 +168,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: wall [-g group] [file]\n");
+	fprintf(stderr, "usage: wall [-g group] [file]\n");
 	exit(1);
 }
 
@@ -187,10 +187,10 @@
 	const char *whom;
 	gid_t egid;
 
-	(void)snprintf(tmpname, sizeof(tmpname), "%s/wall.XXXXXX", _PATH_TMP);
+	snprintf(tmpname, sizeof(tmpname), "%s/wall.XXXXXX", _PATH_TMP);
 	if ((fd = mkstemp(tmpname)) == -1 || !(fp = fdopen(fd, "r+")))
 		err(1, "can't open temporary file");
-	(void)unlink(tmpname);
+	unlink(tmpname);
 
 	if (!nobanner) {
 		tty = ttyname(STDERR_FILENO);
@@ -199,8 +199,8 @@
 
 		if (!(whom = getlogin()))
 			whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
-		(void)gethostname(hostname, sizeof(hostname));
-		(void)time(&now);
+		gethostname(hostname, sizeof(hostname));
+		time(&now);
 		lt = localtime(&now);
 
 		/*
@@ -210,17 +210,17 @@
 		 * Which means that we may leave a non-blank character
 		 * in column 80, but that can't be helped.
 		 */
-		(void)fprintf(fp, "\r%79s\r\n", " ");
-		(void)snprintf(lbuf, sizeof(lbuf), 
+		fprintf(fp, "\r%79s\r\n", " ");
+		snprintf(lbuf, sizeof(lbuf), 
 		    "Broadcast Message from %s@%s",
 		    whom, hostname);
-		(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
-		(void)snprintf(lbuf, sizeof(lbuf),
+		fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
+		snprintf(lbuf, sizeof(lbuf),
 		    "        (%s) at %d:%02d %s...", tty,
 		    lt->tm_hour, lt->tm_min, lt->tm_zone);
-		(void)fprintf(fp, "%-79.79s\r\n", lbuf);
+		fprintf(fp, "%-79.79s\r\n", lbuf);
 	}
-	(void)fprintf(fp, "%79s\r\n", " ");
+	fprintf(fp, "%79s\r\n", " ");
 
 	if (fname) {
 		egid = getegid();
@@ -273,7 +273,7 @@
 				putc(ch, fp);
 			}
 		}
-	(void)fprintf(fp, "%79s\r\n", " ");
+	fprintf(fp, "%79s\r\n", " ");
 	rewind(fp);
 
 	if (fstat(fd, &sbuf))
@@ -283,5 +283,5 @@
 		err(1, "out of memory");
 	if (fread(mbuf, sizeof(*mbuf), mbufsize, fp) != mbufsize)
 		err(1, "can't read temporary file");
-	(void)close(fd);
+	close(fd);
 }
Index: wc/wc.c
===================================================================
RCS file: /cvs/src/usr.bin/wc/wc.c,v
retrieving revision 1.3
diff -u -u -r1.3 wc.c
--- wc/wc.c	4 Oct 2003 20:36:55 -0000	1.3
+++ wc/wc.c	7 Nov 2004 20:02:17 -0000
@@ -60,7 +60,7 @@
 {
 	int ch, errors, total;
 
-	(void) setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	while ((ch = getopt(argc, argv, "clmw")) != -1)
 		switch((char)ch) {
@@ -95,24 +95,24 @@
 		if (cnt((char *)NULL) != 0)
 			++errors;
 		else
-			(void)printf("\n");
+			printf("\n");
 	}
 	else do {
 		if (cnt(*argv) != 0)
 			++errors;
 		else
-			(void)printf(" %s\n", *argv);
+			printf(" %s\n", *argv);
 		++total;
 	} while(*++argv);
 
 	if (total > 1) {
 		if (doline)
-			(void)printf(" %7qu", tlinect);
+			printf(" %7qu", tlinect);
 		if (doword)
-			(void)printf(" %7qu", twordct);
+			printf(" %7qu", twordct);
 		if (dochar || domulti)
-			(void)printf(" %7qu", tcharct);
-		(void)printf(" total\n");
+			printf(" %7qu", tcharct);
+		printf(" total\n");
 	}
 	exit(errors == 0 ? 0 : 1);
 }
@@ -149,7 +149,7 @@
 			while ((len = read(fd, buf, MAXBSIZE))) {
 				if (len == -1) {
 					warn("%s: read", file);
-					(void)close(fd);
+					close(fd);
 					return (1);
 				}
 				charct += len;
@@ -158,12 +158,12 @@
 						++linect;
 			}
 			tlinect += linect;
-			(void)printf(" %7qu", linect);
+			printf(" %7qu", linect);
 			if (dochar) {
 				tcharct += charct;
-				(void)printf(" %7qu", charct);
+				printf(" %7qu", charct);
 			}
-			(void)close(fd);
+			close(fd);
 			return (0);
 		}
 		/*
@@ -173,13 +173,13 @@
 		if (dochar || domulti) {
 			if (fstat(fd, &sb)) {
 				warn("%s: fstat", file);
-				(void)close(fd);
+				close(fd);
 				return (1);
 			}
 			if (S_ISREG(sb.st_mode)) {
-				(void)printf(" %7lld", (long long)sb.st_size);
+				printf(" %7lld", (long long)sb.st_size);
 				tcharct += sb.st_size;
-				(void)close(fd);
+				close(fd);
 				return (0);
 			}
 		}
@@ -192,7 +192,7 @@
 	while ((nread = read(fd, buf + len, MAXBSIZE - len)) != 0) {
 		if (nread == -1) {
 			warn("%s: read", file);
-			(void)close(fd);
+			close(fd);
 			return (1);
 		}
 		len += nread;
@@ -230,23 +230,23 @@
 	}
 	if (doline) {
 		tlinect += linect;
-		(void)printf(" %7qu", linect);
+		printf(" %7qu", linect);
 	}
 	if (doword) {
 		twordct += wordct;
-		(void)printf(" %7qu", wordct);
+		printf(" %7qu", wordct);
 	}
 	if (dochar || domulti) {
 		tcharct += charct;
-		(void)printf(" %7qu", charct);
+		printf(" %7qu", charct);
 	}
-	(void)close(fd);
+	close(fd);
 	return (0);
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: wc [-clmw] [file ...]\n");
+	fprintf(stderr, "usage: wc [-clmw] [file ...]\n");
 	exit(1);
 }
Index: what/what.c
===================================================================
RCS file: /cvs/src/usr.bin/what/what.c,v
retrieving revision 1.3
diff -u -u -r1.3 what.c
--- what/what.c	4 Oct 2003 20:36:55 -0000	1.3
+++ what/what.c	7 Nov 2004 20:02:17 -0000
@@ -81,7 +81,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: what [-s] file ...\n");
+	fprintf(stderr, "usage: what [-s] file ...\n");
 	exit(1);
 }
 
Index: window/cmd.c
===================================================================
RCS file: /cvs/src/usr.bin/window/cmd.c,v
retrieving revision 1.2
diff -u -u -r1.2 cmd.c
--- window/cmd.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/cmd.c	7 Nov 2004 20:02:17 -0000
@@ -137,16 +137,16 @@
 			c_colon();
 			break;
 		case 'h':
-			(void) wwwrite(selwin, "\b", 1);
+			wwwrite(selwin, "\b", 1);
 			break;
 		case 'j':
-			(void) wwwrite(selwin, "\n", 1);
+			wwwrite(selwin, "\n", 1);
 			break;
 		case 'k':
-			(void) wwwrite(selwin, "\033A", 2);
+			wwwrite(selwin, "\033A", 2);
 			break;
 		case 'l':
-			(void) wwwrite(selwin, "\033C", 2);
+			wwwrite(selwin, "\033C", 2);
 			break;
 		case ctrl('e'):
 			wwscroll(selwin, 1);
@@ -197,7 +197,7 @@
 		default:
 			if (c == escapec) {
 				if (checkproc(selwin) >= 0) {
-					(void) write(selwin->ww_pty,
+					write(selwin->ww_pty,
 						&escapec, 1);
 					out = 1;
 				}
Index: window/cmd1.c
===================================================================
RCS file: /cvs/src/usr.bin/window/cmd1.c,v
retrieving revision 1.2
diff -u -u -r1.2 cmd1.c
--- window/cmd1.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/cmd1.c	7 Nov 2004 20:02:17 -0000
@@ -104,7 +104,7 @@
 	if (!terse)
 		wwputc('\n', cmdwin);
 	wwcurtowin(cmdwin);
-	(void) openwin(id, row, col, xrow-row+1, xcol-col+1, default_nline,
+	openwin(id, row, col, xrow-row+1, xcol-col+1, default_nline,
 		(char *) 0, 1, 1, default_shellfile, default_shell);
 }
 
Index: window/cmd2.c
===================================================================
RCS file: /cvs/src/usr.bin/window/cmd2.c,v
retrieving revision 1.2
diff -u -u -r1.2 cmd2.c
--- window/cmd2.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/cmd2.c	7 Nov 2004 20:02:17 -0000
@@ -111,7 +111,7 @@
 	wwprintf(w, "The escape character is %c.\n", escapec);
 	wwprintf(w, "(# represents one of the digits from 1 to 9.)\n\n");
 	if (help_print(w, "Short commands", help_shortcmd) >= 0)
-		(void) help_print(w, "Long commands", help_longcmd);
+		help_print(w, "Long commands", help_longcmd);
 	closeiwin(w);
 }
 
Index: window/cmd7.c
===================================================================
RCS file: /cvs/src/usr.bin/window/cmd7.c,v
retrieving revision 1.2
diff -u -u -r1.2 cmd7.c
--- window/cmd7.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/cmd7.c	7 Nov 2004 20:02:17 -0000
@@ -268,5 +268,5 @@
 	struct yb *yp;
 
 	for (yp = yb_head; yp; yp = yp->link)
-		(void) write(selwin->ww_pty, yp->line, yp->length);
+		write(selwin->ww_pty, yp->line, yp->length);
 }
Index: window/compress.c
===================================================================
RCS file: /cvs/src/usr.bin/window/compress.c,v
retrieving revision 1.2
diff -u -u -r1.2 compress.c
--- window/compress.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/compress.c	7 Nov 2004 20:02:17 -0000
@@ -296,7 +296,7 @@
 	tt.tt_flush = ccflush;
 	if (cc_trace) {
 		cc_trace_fp = fopen("window-trace", "a");
-		(void) fcntl(fileno(cc_trace_fp), F_SETFD, 1);
+		fcntl(fileno(cc_trace_fp), F_SETFD, 1);
 	}
 	ccreset();
 }
@@ -320,7 +320,7 @@
 	tt_obe = cc_tt_obe;
 	tt.tt_flush = 0;
 	if (cc_trace_fp != NULL) {
-		(void) fclose(cc_trace_fp);
+		fclose(cc_trace_fp);
 		cc_trace_fp = NULL;
 	}
 }
@@ -333,8 +333,8 @@
 	if (tt_ob != cc_buffer)
 		abort();
 	if (cc_trace_fp != NULL) {
-		(void) fwrite(tt_ob, 1, bufsize, cc_trace_fp);
-		(void) putc(-1, cc_trace_fp);
+		fwrite(tt_ob, 1, bufsize, cc_trace_fp);
+		putc(-1, cc_trace_fp);
 	}
 	tt.tt_flush = 0;
 	(*tt.tt_compress)(1);
@@ -388,7 +388,7 @@
 			}
 			ii++;
 			printf(" (%d", i);
-			(void) fflush(stdout);
+			fflush(stdout);
 		}
 #endif
 		n = cc_sweep(buffer, bufsize, pp, i);
@@ -683,7 +683,7 @@
 			}
 			i++;
 			printf(" (%d", (*pp)->length);
-			(void) fflush(stdout);
+			fflush(stdout);
 		}
 #endif
 		pp += cc_compress(output, pp, flag);
Index: window/context.c
===================================================================
RCS file: /cvs/src/usr.bin/window/context.c,v
retrieving revision 1.2
diff -u -u -r1.2 context.c
--- window/context.c	17 Jun 2003 04:29:33 -0000	1.2
+++ window/context.c	7 Nov 2004 20:02:17 -0000
@@ -90,7 +90,7 @@
 	cx.x_fp = fopen(filename, "r");
 	if (cx.x_fp == 0)
 		goto bad;
-	(void) fcntl(fileno(cx.x_fp), F_SETFD, 1);
+	fcntl(fileno(cx.x_fp), F_SETFD, 1);
 	cx.x_bol = 1;
 	cx.x_lineno = 0;
 	cx.x_errwin = 0;
@@ -123,7 +123,7 @@
 	case X_BUF:
 		break;
 	case X_FILE:
-		(void) fclose(cx.x_fp);
+		fclose(cx.x_fp);
 		str_free(cx.x_filename);
 		break;
 	}
Index: window/error.c
===================================================================
RCS file: /cvs/src/usr.bin/window/error.c,v
retrieving revision 1.2
diff -u -u -r1.2 error.c
--- window/error.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/error.c	7 Nov 2004 20:02:17 -0000
@@ -68,7 +68,7 @@
 	if ((w = x->x_errwin) == 0) {
 		char buf[512];
 
-		(void) sprintf(buf, "Errors from %s", x->x_filename);
+		sprintf(buf, "Errors from %s", x->x_filename);
 		if ((w = x->x_errwin = openiwin(ERRLINES, buf)) == 0) {
 			wwputs("Can't open error window.  ", cmdwin);
 			x->x_noerr = 1;
Index: window/lcmd1.c
===================================================================
RCS file: /cvs/src/usr.bin/window/lcmd1.c,v
retrieving revision 1.3
diff -u -u -r1.3 lcmd1.c
--- window/lcmd1.c	30 Aug 2004 18:06:50 -0000	1.3
+++ window/lcmd1.c	7 Nov 2004 20:02:17 -0000
@@ -310,12 +310,12 @@
 		return;
 	while (a->v_type != V_ERR) {
 		if (a->v_type == V_NUM) {
-			(void) sprintf(buf, "%d", a->v_num);
-			(void) write(w->ww_pty, buf, strlen(buf));
+			sprintf(buf, "%d", a->v_num);
+			write(w->ww_pty, buf, strlen(buf));
 		} else
-			(void) write(w->ww_pty, a->v_str, strlen(a->v_str));
+			write(w->ww_pty, a->v_str, strlen(a->v_str));
 		if ((++a)->v_type != V_ERR)
-			(void) write(w->ww_pty, " ", 1);
+			write(w->ww_pty, " ", 1);
 	}
 }
 
Index: window/lcmd2.c
===================================================================
RCS file: /cvs/src/usr.bin/window/lcmd2.c,v
retrieving revision 1.3
diff -u -u -r1.3 lcmd2.c
--- window/lcmd2.c	30 Aug 2004 18:06:50 -0000	1.3
+++ window/lcmd2.c	7 Nov 2004 20:02:17 -0000
@@ -116,13 +116,13 @@
 		return;
 	}
 
-	(void) gettimeofday(&timeval, (struct timezone *)0);
+	gettimeofday(&timeval, (struct timezone *)0);
 	timeval.tv_sec -= starttime.tv_sec;
 	if ((timeval.tv_usec -= starttime.tv_usec) < 0) {
 		timeval.tv_sec--;
 		timeval.tv_usec += 1000000;
 	}
-	(void) getrusage(a->v_type == V_STR
+	getrusage(a->v_type == V_STR
 			&& str_match(a->v_str, "children", 1)
 		? RUSAGE_CHILDREN : RUSAGE_SELF, &rusage);
 
@@ -158,7 +158,7 @@
 	register char *p = buf;
 
 	if (t->tv_sec > 60*60) {
-		(void) sprintf(p, "%ld:", t->tv_sec / (60*60));
+		sprintf(p, "%ld:", t->tv_sec / (60*60));
 		while (*p++)
 			;
 		p--;
@@ -166,14 +166,14 @@
 		fill++;
 	}
 	if (t->tv_sec > 60) {
-		(void) sprintf(p, fill ? "%02ld:" : "%ld:", t->tv_sec / 60);
+		sprintf(p, fill ? "%02ld:" : "%ld:", t->tv_sec / 60);
 		while (*p++)
 			;
 		p--;
 		t->tv_sec %= 60;
 		fill++;
 	}
-	(void) sprintf(p, fill ? "%02ld.%02d" : "%ld.%02ld",
+	sprintf(p, fill ? "%02ld.%02d" : "%ld.%02ld",
 		t->tv_sec, t->tv_usec / 10000);
 	return buf;
 }
@@ -387,12 +387,12 @@
 		return;
 	while (a->v_type != V_ERR) {
 		if (a->v_type == V_NUM) {
-			(void) sprintf(buf, "%d", a->v_num);
-			(void) wwwrite(w, buf, strlen(buf));
+			sprintf(buf, "%d", a->v_num);
+			wwwrite(w, buf, strlen(buf));
 		} else
-			(void) wwwrite(w, a->v_str, strlen(a->v_str));
+			wwwrite(w, a->v_str, strlen(a->v_str));
 		if ((++a)->v_type != V_ERR)
-			(void) wwwrite(w, " ", 1);
+			wwwrite(w, " ", 1);
 	}
-	(void) wwwrite(w, "\r\n", 2);
+	wwwrite(w, "\r\n", 2);
 }
Index: window/main.c
===================================================================
RCS file: /cvs/src/usr.bin/window/main.c,v
retrieving revision 1.3
diff -u -u -r1.3 main.c
--- window/main.c	30 Aug 2004 18:06:50 -0000	1.3
+++ window/main.c	7 Nov 2004 20:02:17 -0000
@@ -75,9 +75,9 @@
 				break;
 			case 'c':
 				if (cmd != 0) {
-					(void) fprintf(stderr,
+					fprintf(stderr,
 						"Only one -c allowed.\n");
-					(void) usage();
+					usage();
 				}
 				cmd = next(argv);
 				break;
@@ -97,15 +97,15 @@
 				xflag++;
 				break;
 			default:
-				(void) usage();
+				usage();
 			}
 		} else
-			(void) usage();
+			usage();
 	}
 	if ((p = getenv("SHELL")) == 0)
 		p = _PATH_BSHELL;
 	if ((default_shellfile = str_cpy(p)) == 0) {
-		(void) fprintf(stderr, "Out of memory.\n");
+		fprintf(stderr, "Out of memory.\n");
 		exit(1);
 	}
 	if (p = strrchr(default_shellfile, '/'))
@@ -116,10 +116,10 @@
 	default_shell[1] = 0;
 	default_nline = NLINE;
 	default_smooth = 1;
-	(void) gettimeofday(&starttime, (struct timezone *)0);
-	(void) setlocale(LC_CTYPE, "");
+	gettimeofday(&starttime, (struct timezone *)0);
+	setlocale(LC_CTYPE, "");
 	if (wwinit() < 0) {
-		(void) fprintf(stderr, "%s.\n", wwerror());
+		fprintf(stderr, "%s.\n", wwerror());
 		exit(1);
 	}
 
@@ -145,12 +145,12 @@
 	}
 #endif
 	if (debug || xflag)
-		(void) wwsettty(0, &wwnewtty);
+		wwsettty(0, &wwnewtty);
 
 	if ((cmdwin = wwopen(wwbaud > 2400 ? WWO_REVERSE : 0, 1, wwncol,
 			     0, 0, 0)) == 0) {
 		wwflush();
-		(void) fprintf(stderr, "%s.\r\n", wwerror());
+		fprintf(stderr, "%s.\r\n", wwerror());
 		goto bad;
 	}
 	cmdwin->ww_mapnl = 1;
@@ -160,13 +160,13 @@
 	if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
 	    == 0) {
 		wwflush();
-		(void) fprintf(stderr, "%s.\r\n", wwerror());
+		fprintf(stderr, "%s.\r\n", wwerror());
 		goto bad;
 	}
 	wwadd(framewin, &wwhead);
 	if ((boxwin = wwopen(WWO_GLASS, wwnrow, wwncol, 0, 0, 0)) == 0) {
 		wwflush();
-		(void) fprintf(stderr, "%s.\r\n", wwerror());
+		fprintf(stderr, "%s.\r\n", wwerror());
 		goto bad;
 	}
 	fgwin = framewin;
@@ -178,7 +178,7 @@
 	setterse(tflag);
 	setcmd(1);
 	if (cmd != 0)
-		(void) dolongcmd(cmd, (struct value *)0, 0);
+		dolongcmd(cmd, (struct value *)0, 0);
 	if (!fflag)
 		if (dflag || doconfig() < 0)
 			dodefault();
@@ -194,7 +194,7 @@
 
 usage()
 {
-	(void) fprintf(stderr, "usage: window [-e escape-char] [-c command] [-t] [-f] [-d]\n");
+	fprintf(stderr, "usage: window [-e escape-char] [-c command] [-t] [-f] [-d]\n");
 	exit(1);
 	return 0;			/* for lint */
 }
Index: window/mloop.c
===================================================================
RCS file: /cvs/src/usr.bin/window/mloop.c,v
retrieving revision 1.2
diff -u -u -r1.2 mloop.c
--- window/mloop.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/mloop.c	7 Nov 2004 20:02:17 -0000
@@ -51,7 +51,7 @@
 				closewin(wwcurwin);
 			setcmd(1);
 			if (wwpeekc() == escapec)
-				(void) wwgetc();
+				wwgetc();
 			error("Process died.");
 		} else {
 			register struct ww *w = wwcurwin;
@@ -69,14 +69,14 @@
 #if defined(sun) && !defined(BSD)
 				/* workaround for SunOS pty bug */
 				while (--n >= 0)
-					(void) write(w->ww_pty, wwibp++, 1);
+					write(w->ww_pty, wwibp++, 1);
 #else
-				(void) write(w->ww_pty, wwibp, n);
+				write(w->ww_pty, wwibp, n);
 				wwibp = p;
 #endif
 			}
 			if (wwpeekc() == escapec) {
-				(void) wwgetc();
+				wwgetc();
 				setcmd(1);
 			}
 		}
Index: window/parser1.c
===================================================================
RCS file: /cvs/src/usr.bin/window/parser1.c,v
retrieving revision 1.2
diff -u -u -r1.2 parser1.c
--- window/parser1.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/parser1.c	7 Nov 2004 20:02:17 -0000
@@ -44,7 +44,7 @@
 {
 	char flag = 1;
 
-	(void) s_gettok();
+	s_gettok();
 	for (;;) {
 		p_statementlist(flag);
 		if (token == T_EOF || p_abort())
@@ -54,10 +54,10 @@
 		while (token != T_EOL && token != T_EOF) {
 			if (token == T_STR)
 				str_free(token_str);
-			(void) s_gettok();
+			s_gettok();
 		}
 		if (token == T_EOL)
-			(void) s_gettok();
+			s_gettok();
 		p_clearerr();
 	}
 }
@@ -74,7 +74,7 @@
 {
 	switch (token) {
 	case T_EOL:
-		(void) s_gettok();
+		s_gettok();
 		return 0;
 	case T_IF:
 		return p_if(flag);
@@ -90,7 +90,7 @@
 	char true = 0;
 
 top:
-	(void) s_gettok();
+	s_gettok();
 
 	if (p_expr(&t, flag) < 0) {
 		p_synerror();
@@ -113,7 +113,7 @@
 		return -1;
 	}
 
-	(void) s_gettok();
+	s_gettok();
 	p_statementlist(flag && true);
 	if (p_erred())
 		return -1;
@@ -122,14 +122,14 @@
 		goto top;
 
 	if (token == T_ELSE) {
-		(void) s_gettok();
+		s_gettok();
 		p_statementlist(flag && !true);
 		if (p_erred())
 			return -1;
 	}
 
 	if (token == T_ENDIF) {
-		(void) s_gettok();
+		s_gettok();
 		return 0;
 	}
 
@@ -148,12 +148,12 @@
 	case T_NUM:
 		t.v_type = V_NUM;
 		t.v_num = token_num;
-		(void) s_gettok();
+		s_gettok();
 		break;
 	case T_STR:
 		t.v_type = V_STR;
 		t.v_str = token_str;
-		(void) s_gettok();
+		s_gettok();
 		break;
 	default:
 		if (p_expr(&t, flag) < 0)
@@ -175,7 +175,7 @@
 		str_free(cmd);
 	val_free(t);
 	if (token == T_EOL)
-		(void) s_gettok();
+		s_gettok();
 	else if (token != T_EOF) {
 		p_synerror();
 		return -1;
Index: window/parser2.c
===================================================================
RCS file: /cvs/src/usr.bin/window/parser2.c,v
retrieving revision 1.2
diff -u -u -r1.2 parser2.c
--- window/parser2.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/parser2.c	7 Nov 2004 20:02:17 -0000
@@ -74,7 +74,7 @@
 		vp->v_type = V_ERR;
 
 	if (token == T_LP)
-		(void) s_gettok();
+		s_gettok();
 	i = 0;
 	for (;;) {
 		ap = 0;
@@ -100,7 +100,7 @@
 			if (p_convstr(&t) < 0)
 				goto abort;
 			tmp = t.v_type == V_STR ? t.v_str : 0;
-			(void) s_gettok();
+			s_gettok();
 			if (p_expr(&t, flag) < 0) {
 				if (tmp)
 					str_free(tmp);
@@ -170,13 +170,13 @@
 		else
 			val_free(t);
 		if (token == T_COMMA)
-			(void) s_gettok();
+			s_gettok();
 	}
 
 	if (p_erred())
 		flag = 0;
 	if (token == T_RP)
-		(void) s_gettok();
+		s_gettok();
 	else if (token != T_EOL && token != T_EOF)
 		flag = 0;		/* look for legal follow set */
 	v->v_type = V_ERR;
@@ -211,7 +211,7 @@
 struct value *v;
 char flag;
 {
-	(void) s_gettok();
+	s_gettok();
 
 	if (p_expr(v, flag) < 0) {
 		p_synerror();
Index: window/parser3.c
===================================================================
RCS file: /cvs/src/usr.bin/window/parser3.c,v
retrieving revision 1.2
diff -u -u -r1.2 parser3.c
--- window/parser3.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/parser3.c	7 Nov 2004 20:02:17 -0000
@@ -108,7 +108,7 @@
 		flag = 0;
 		break;
 	}
-	(void) s_gettok();
+	s_gettok();
 	v->v_type = V_ERR;
 	if ((flag && true ? p_expr1(v, 1) : p_expr1(&t, 0)) < 0)
 		return -1;
@@ -117,7 +117,7 @@
 		p_synerror();
 		return -1;
 	}
-	(void) s_gettok();
+	s_gettok();
 	return flag && !true ? p_expr1(v, 1) : p_expr1(&t, 0);
 }
 
@@ -149,7 +149,7 @@
 		}
 		if (token != T_OROR)
 			return 0;
-		(void) s_gettok();
+		s_gettok();
 		if (p_expr2(v, flag && !true) < 0)
 			return -1;
 	}
@@ -183,7 +183,7 @@
 		}
 		if (token != T_ANDAND)
 			return 0;
-		(void) s_gettok();
+		s_gettok();
 		if (p_expr3_10(3, v, flag && true) < 0)
 			return -1;
 	}
Index: window/parser4.c
===================================================================
RCS file: /cvs/src/usr.bin/window/parser4.c,v
retrieving revision 1.2
diff -u -u -r1.2 parser4.c
--- window/parser4.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/parser4.c	7 Nov 2004 20:02:17 -0000
@@ -142,7 +142,7 @@
 			flag = 0;
 
 		op = token;
-		(void) s_gettok();
+		s_gettok();
 		if ((level == 10 ? p_expr11(&r, flag)
 		     : p_expr3_10(level + 1, &r, flag)) < 0) {
 			p_synerror();
Index: window/parser5.c
===================================================================
RCS file: /cvs/src/usr.bin/window/parser5.c,v
retrieving revision 1.2
diff -u -u -r1.2 parser5.c
--- window/parser5.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/parser5.c	7 Nov 2004 20:02:17 -0000
@@ -74,7 +74,7 @@
 		return p_expr12(v, flag);
 	}
 	op = token;
-	(void) s_gettok();
+	s_gettok();
 	if (p_expr11(v, flag) < 0)
 		return -1;
 	switch (v->v_type) {
@@ -157,7 +157,7 @@
 			v->v_type = V_NUM;
 			v->v_num = token_num;
 		}
-		(void) s_gettok();
+		s_gettok();
 		break;
 	case T_STR:
 		if (flag) {
@@ -165,10 +165,10 @@
 			v->v_str = token_str;
 		} else
 			str_free(token_str);
-		(void) s_gettok();
+		s_gettok();
 		break;
 	case T_LP:
-		(void) s_gettok();
+		s_gettok();
 		if (p_expr(v, flag) < 0) {
 			p_synerror();
 			return -1;
@@ -178,7 +178,7 @@
 			val_free(*v);
 			return -1;
 		}
-		(void) s_gettok();
+		s_gettok();
 		break;
 	default:
 		return -1;
Index: window/scanner.c
===================================================================
RCS file: /cvs/src/usr.bin/window/scanner.c,v
retrieving revision 1.2
diff -u -u -r1.2 scanner.c
--- window/scanner.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/scanner.c	7 Nov 2004 20:02:17 -0000
@@ -230,7 +230,7 @@
 		break;
 	case 1:				/* got # */
 		if (c == '\n' || c == EOF) {
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			state = 0;
 		}
 		break;
@@ -245,7 +245,7 @@
 		case '\\':
 			switch (c = s_gettok1()) {
 			case -2:
-				(void) s_ungetc(' ');
+				s_ungetc(' ');
 			case -1:
 				break;
 			default:
@@ -259,7 +259,7 @@
 					*p++ = c;
 				break;
 			}
-			(void) s_ungetc(c);
+			s_ungetc(c);
 		case EOF:
 			*p = 0;
 			cx.x_token = T_STR;
@@ -298,7 +298,7 @@
 	case 3:				/* " quoted string */
 		switch (c) {
 		case '\n':
-			(void) s_ungetc(c);
+			s_ungetc(c);
 		case EOF:
 		case '"':
 			state = 2;
@@ -322,7 +322,7 @@
 	case 4:				/* ' quoted string */
 		switch (c) {
 		case '\n':
-			(void) s_ungetc(c);
+			s_ungetc(c);
 		case EOF:
 		case '\'':
 			state = 2;
@@ -360,7 +360,7 @@
 			state = 11;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			state = -1;
 			cx.x_token = T_NUM;
 		}
@@ -372,7 +372,7 @@
 			cx.x_val.v_num = cx.x_val.v_num * 10 + c - '0';
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			state = -1;
 			cx.x_token = T_NUM;
 		}
@@ -390,7 +390,7 @@
 			cx.x_val.v_num = cx.x_val.v_num * 16 + c - 'A' + 10;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			state = -1;
 			cx.x_token = T_NUM;
 		}
@@ -402,7 +402,7 @@
 			cx.x_val.v_num = cx.x_val.v_num * 8 + c - '0';
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			state = -1;
 			cx.x_token = T_NUM;
 		}
@@ -418,7 +418,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_GT;
 			state = -1;
 		}
@@ -434,7 +434,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_LT;
 			state = -1;
 		}
@@ -446,7 +446,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_ASSIGN;
 			state = -1;
 		}
@@ -458,7 +458,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_NOT;
 			state = -1;
 		}
@@ -470,7 +470,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_AND;
 			state = -1;
 		}
@@ -482,7 +482,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_OR;
 			state = -1;
 		}
@@ -494,7 +494,7 @@
 			state = -1;
 			break;
 		default:
-			(void) s_ungetc(c);
+			s_ungetc(c);
 			cx.x_token = T_DOLLAR;
 			state = -1;
 		}
@@ -537,13 +537,13 @@
 	n = c - '0';
 	c = s_getc();			/* got \[0-7] */
 	if (c < '0' || c > '7') {
-		(void) s_ungetc(c);
+		s_ungetc(c);
 		return n;
 	}
 	n = n * 8 + c - '0';
 	c = s_getc();			/* got \[0-7][0-7] */
 	if (c < '0' || c > '7') {
-		(void) s_ungetc(c);
+		s_ungetc(c);
 		return n;
 	}
 	return n * 8 + c - '0';
Index: window/startup.c
===================================================================
RCS file: /cvs/src/usr.bin/window/startup.c,v
retrieving revision 1.2
diff -u -u -r1.2 startup.c
--- window/startup.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/startup.c	7 Nov 2004 20:02:17 -0000
@@ -52,7 +52,7 @@
 
 	if ((home = getenv("HOME")) == 0)
 		home = ".";
-	(void) sprintf(buf, "%.*s/%s",
+	sprintf(buf, "%.*s/%s",
 		(sizeof buf - sizeof runcom) / sizeof (char) - 1,
 		home, runcom);
 	return dosource(buf);
@@ -78,15 +78,15 @@
 setvars()
 {
 	/* try to use a random ordering to balance the tree */
-	(void) var_setnum("nrow", wwnrow);
-	(void) var_setnum("ncol", wwncol);
-	(void) var_setnum("baud", wwbaud);
-	(void) var_setnum("m_rev", WWM_REV);
-	(void) var_setnum("m_blk", WWM_BLK);
-	(void) var_setnum("m_ul", WWM_UL);
-	(void) var_setnum("m_grp", WWM_GRP);
-	(void) var_setnum("m_dim", WWM_DIM);
-	(void) var_setnum("m_usr", WWM_USR);
-	(void) var_setstr("term", wwterm);
-	(void) var_setnum("modes", wwavailmodes);
+	var_setnum("nrow", wwnrow);
+	var_setnum("ncol", wwncol);
+	var_setnum("baud", wwbaud);
+	var_setnum("m_rev", WWM_REV);
+	var_setnum("m_blk", WWM_BLK);
+	var_setnum("m_ul", WWM_UL);
+	var_setnum("m_grp", WWM_GRP);
+	var_setnum("m_dim", WWM_DIM);
+	var_setnum("m_usr", WWM_USR);
+	var_setstr("term", wwterm);
+	var_setnum("modes", wwavailmodes);
 }
Index: window/string.c
===================================================================
RCS file: /cvs/src/usr.bin/window/string.c,v
retrieving revision 1.2
diff -u -u -r1.2 string.c
--- window/string.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/string.c	7 Nov 2004 20:02:17 -0000
@@ -84,7 +84,7 @@
 {
 	char buf[30];
 
-	(void) sprintf(buf, "%d", i);
+	sprintf(buf, "%d", i);
 	return str_cpy(buf);
 }
 
Index: window/ttzapple.c
===================================================================
RCS file: /cvs/src/usr.bin/window/ttzapple.c,v
retrieving revision 1.2
diff -u -u -r1.2 ttzapple.c
--- window/ttzapple.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/ttzapple.c	7 Nov 2004 20:02:17 -0000
@@ -327,7 +327,7 @@
 	if (zz_debug) {
 		char buf[100];
 		zz_setmodes(WWM_REV);
-		(void) sprintf(buf, "%02x=", t);
+		sprintf(buf, "%02x=", t);
 		ttputs(buf);
 		tt.tt_col += 3;
 	}
@@ -347,7 +347,7 @@
 	if (zz_debug) {
 		char buf[100];
 		zz_setmodes(WWM_REV);
-		(void) sprintf(buf, "%02x>", t);
+		sprintf(buf, "%02x>", t);
 		ttputs(buf);
 		tt.tt_col += 3;
 	}
Index: window/win.c
===================================================================
RCS file: /cvs/src/usr.bin/window/win.c,v
retrieving revision 1.2
diff -u -u -r1.2 win.c
--- window/win.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/win.c	7 Nov 2004 20:02:17 -0000
@@ -181,7 +181,7 @@
 	w->ww_unctrl = 1;
 	w->ww_id = -1;
 	w->ww_center = 1;
-	(void) setlabel(w, label);
+	setlabel(w, label);
 	addwin(w, 1);
 	reframe();
 	return w;
@@ -333,7 +333,7 @@
 waitnl(w)
 struct ww *w;
 {
-	(void) waitnl1(w, "[Type any key to continue]");
+	waitnl1(w, "[Type any key to continue]");
 }
 
 more(w, always)
Index: window/wwclose.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwclose.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwclose.c
--- window/wwclose.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwclose.c	7 Nov 2004 20:02:17 -0000
@@ -45,9 +45,9 @@
 {
 	wwindex[w->ww_index] = 0;
 	if (w->ww_pty >= 0)
-		(void) close(w->ww_pty);
+		close(w->ww_pty);
 	if (w->ww_socket >= 0)
-		(void) close(w->ww_socket);
+		close(w->ww_socket);
 	wwfree((char **)w->ww_win, w->ww_w.t);
 	wwfree((char **)w->ww_buf, w->ww_b.t);
 	if (w->ww_fmap != 0)
Index: window/wwdump.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwdump.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwdump.c
--- window/wwdump.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwdump.c	7 Nov 2004 20:02:17 -0000
@@ -68,7 +68,7 @@
 	(*tt.tt_clear)();
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
 		(*tt.tt_move)(i, w->ww_i.l);
-		(void) sprintf(buf, "%d", w->ww_nvis[i]);
+		sprintf(buf, "%d", w->ww_nvis[i]);
 		(*tt.tt_write)(buf, strlen(buf));
 	}
 }
Index: window/wwend.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwend.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwend.c
--- window/wwend.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwend.c	7 Nov 2004 20:02:17 -0000
@@ -46,12 +46,12 @@
 wwend(exit)
 {
 	if (tt.tt_checkpoint) {
-		(void) alarm(0);
+		alarm(0);
 		wwdocheckpoint = 0;
 	}
 	xxend();
-	(void) signal(SIGIO, SIG_DFL);
-	(void) wwsettty(0, &wwoldtty);
+	signal(SIGIO, SIG_DFL);
+	wwsettty(0, &wwoldtty);
 #ifdef TERMINFO
 	if (exit)
 		wwterminfoend();
Index: window/wwenviron.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwenviron.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwenviron.c
--- window/wwenviron.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwenviron.c	7 Nov 2004 20:02:17 -0000
@@ -61,7 +61,7 @@
 		goto bad;
 	if (ioctl(i, TIOCNOTTY, (char *)0) < 0)
 		goto bad;
-	(void) close(i);
+	close(i);
 #endif
 	if ((i = wp->ww_socket) < 0) {
 		if ((i = open(wp->ww_ttyname, 2)) < 0)
@@ -71,30 +71,30 @@
 		if (wwsetttysize(i, wp->ww_w.nr, wp->ww_w.nc) < 0)
 			goto bad;
 	}
-	(void) dup2(i, 0);
-	(void) dup2(i, 1);
-	(void) dup2(i, 2);
-	(void) close(i);
+	dup2(i, 0);
+	dup2(i, 1);
+	dup2(i, 2);
+	close(i);
 #ifdef TIOCSCTTY
-	(void) setsid();
-	(void) ioctl(0, TIOCSCTTY, 0);
+	setsid();
+	ioctl(0, TIOCSCTTY, 0);
 #else
-	(void) ioctl(0, TIOCSPGRP, (char *)&pgrp);
-	(void) setpgrp(pgrp, pgrp);
+	ioctl(0, TIOCSPGRP, (char *)&pgrp);
+	setpgrp(pgrp, pgrp);
 #endif
 	/* SIGPIPE is the only one we ignore */
-	(void) signal(SIGPIPE, SIG_DFL);
-	(void) sigsetmask(0);
+	signal(SIGPIPE, SIG_DFL);
+	sigsetmask(0);
 	/*
 	 * Two conditions that make destructive setenv ok:
 	 * 1. setenv() copies the string,
 	 * 2. we've already called tgetent which copies the termcap entry.
 	 */
-	(void) sprintf(buf, "%sco#%d:li#%d:%s",
+	sprintf(buf, "%sco#%d:li#%d:%s",
 		WWT_TERMCAP, wp->ww_w.nc, wp->ww_w.nr, wwwintermcap);
-	(void) setenv("TERMCAP", buf, 1);
-	(void) sprintf(buf, "%d", wp->ww_id + 1);
-	(void) setenv("WINDOW_ID", buf, 1);
+	setenv("TERMCAP", buf, 1);
+	sprintf(buf, "%d", wp->ww_id + 1);
+	setenv("WINDOW_ID", buf, 1);
 	return 0;
 bad:
 	wwerrno = WWE_SYS;
Index: window/wwflush.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwflush.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwflush.c
--- window/wwflush.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwflush.c	7 Nov 2004 20:02:17 -0000
@@ -70,25 +70,25 @@
 	do {
 		(*tt.tt_checkpoint)();
 #ifndef OLD_TTY
-		(void) tcdrain(1);
+		tcdrain(1);
 #endif
-		(void) alarm(3);
+		alarm(3);
 		for (wwdocheckpoint = 0; !wwdocheckpoint && tt.tt_ack == 0;)
-			(void) sigpause(s);
+			sigpause(s);
 	} while (tt.tt_ack == 0);
-	(void) alarm(0);
+	alarm(0);
 	wwdocheckpoint = 0;
 	if (tt.tt_ack < 0) {
 		wwcopyscreen(wwcs, wwos);
-		(void) alarm(1);
+		alarm(1);
 		wwreset();
 		wwupdate();
 		wwflush();
 	} else {
 		wwcopyscreen(wwos, wwcs);
-		(void) alarm(3);
+		alarm(3);
 	}
-	(void) sigsetmask(s);
+	sigsetmask(s);
 }
 
 wwcopyscreen(s1, s2)
Index: window/wwgets.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwgets.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwgets.c
--- window/wwgets.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwgets.c	7 Nov 2004 20:02:17 -0000
@@ -108,5 +108,5 @@
 	register i;
 
 	for (i = isctrl(c) ? strlen(unctrl(c)) : 1; --i >= 0;)
-		(void) wwwrite(w, "\b \b", 3);
+		wwwrite(w, "\b \b", 3);
 }
Index: window/wwinit.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwinit.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwinit.c
--- window/wwinit.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwinit.c	7 Nov 2004 20:02:17 -0000
@@ -288,11 +288,11 @@
 	if ((j = tgetnum("kn")) >= 0) {
 		char cap[32];
 
-		(void) sprintf(kp, "kn#%d:", j);
+		sprintf(kp, "kn#%d:", j);
 		for (; *kp; kp++)
 			;
 		for (i = 1; i <= j; i++) {
-			(void) sprintf(cap, "k%d", i);
+			sprintf(cap, "k%d", i);
 			wwaddcap(cap, &kp);
 			cap[0] = 'l';
 			wwaddcap(cap, &kp);
@@ -303,7 +303,7 @@
 	 * since tt_init() has already made its own copy of it and
 	 * wwterm now points to the copy.
 	 */
-	(void) setenv("TERM", WWT_TERM, 1);
+	setenv("TERM", WWT_TERM, 1);
 #ifdef TERMINFO
 	if (wwterminfoinit() < 0)
 		goto bad;
@@ -316,18 +316,18 @@
 		}
 	fcntl(0, F_SETOWN, getpid());
 	/* catch typeahead before ASYNC was set */
-	(void) kill(getpid(), SIGIO);
+	kill(getpid(), SIGIO);
 	wwstart1();
-	(void) sigsetmask(s);
+	sigsetmask(s);
 	return 0;
 bad:
 	/*
 	 * Don't bother to free storage.  We're supposed
 	 * to exit when wwinit fails anyway.
 	 */
-	(void) signal(SIGIO, SIG_DFL);
-	(void) wwsettty(0, &wwoldtty);
-	(void) sigsetmask(s);
+	signal(SIGIO, SIG_DFL);
+	wwsettty(0, &wwoldtty);
+	sigsetmask(s);
 	return -1;
 }
 
@@ -391,7 +391,7 @@
 {
 	register i;
 
-	(void) wwsettty(0, &wwnewtty);
+	wwsettty(0, &wwnewtty);
 	signal(SIGIO, wwrint);
 	for (i = 0; i < wwnrow; i++)
 		wwtouched[i] = WWU_TOUCHED;
Index: window/wwiomux.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwiomux.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwiomux.c
--- window/wwiomux.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwiomux.c	7 Nov 2004 20:02:17 -0000
@@ -93,7 +93,7 @@
 				wwcurtowin(wwcurwin);
 			wwupdate();
 			wwflush();
-			(void) setjmp(wwjmpbuf);
+			setjmp(wwjmpbuf);
 			wwsetjmp = 1;
 			if (wwinterrupt()) {
 				wwsetjmp = 0;
@@ -109,7 +109,7 @@
 			 * in the kernel.)
 			 * I don't like this one bit.
 			 */
-			(void) fcntl(0, F_SETFL, wwnewtty.ww_fflags);
+			fcntl(0, F_SETFL, wwnewtty.ww_fflags);
 			tv.tv_sec = 30;
 			tv.tv_usec = 0;
 		} else {
@@ -143,11 +143,11 @@
 				n = read(w->ww_pty, p, w->ww_obe - p);
 				if (n < 0) {
 					wwnwreade++;
-					(void) close(w->ww_pty);
+					close(w->ww_pty);
 					w->ww_pty = -1;
 				} else if (n == 0) {
 					wwnwreadz++;
-					(void) close(w->ww_pty);
+					close(w->ww_pty);
 					w->ww_pty = -1;
 				} else if (!w->ww_ispty) {
 					wwnwreadd++;
Index: window/wwopen.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwopen.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwopen.c
--- window/wwopen.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwopen.c	7 Nov 2004 20:02:17 -0000
@@ -105,8 +105,8 @@
 			wwerrno = WWE_SYS;
 			goto bad;
 		}
-		(void) fcntl(d[0], F_SETFD, 1);
-		(void) fcntl(d[1], F_SETFD, 1);
+		fcntl(d[0], F_SETFD, 1);
+		fcntl(d[1], F_SETFD, 1);
 		w->ww_pty = d[0];
 		w->ww_socket = d[1];
 	}
@@ -180,9 +180,9 @@
 		if (w->ww_ob != 0)
 			free(w->ww_ob);
 		if (w->ww_pty >= 0)
-			(void) close(w->ww_pty);
+			close(w->ww_pty);
 		if (w->ww_socket >= 0)
-			(void) close(w->ww_socket);
+			close(w->ww_socket);
 		free((char *)w);
 	}
 	return 0;
Index: window/wwprintf.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwprintf.c,v
retrieving revision 1.3
diff -u -u -r1.3 wwprintf.c
--- window/wwprintf.c	24 Jan 2004 22:40:58 -0000	1.3
+++ window/wwprintf.c	7 Nov 2004 20:02:17 -0000
@@ -49,6 +49,6 @@
 
 	va_start(ap, fmt);
 	/* buffer can overflow */
-	(void) wwwrite(w, buf, vsprintf(buf, fmt, ap));
+	wwwrite(w, buf, vsprintf(buf, fmt, ap));
 	va_end(ap);
 }
Index: window/wwpty.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwpty.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwpty.c
--- window/wwpty.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwpty.c	7 Nov 2004 20:02:17 -0000
@@ -55,7 +55,7 @@
 #define _PQRS	8
 #define _0_9	9
 
-	(void) strcpy(w->ww_ttyname, PTY);
+	strcpy(w->ww_ttyname, PTY);
 	for (c = 'p'; c <= 'u'; c++) {
 		w->ww_ttyname[_PT] = 'p';
 		w->ww_ttyname[_PQRS] = c;
@@ -69,15 +69,15 @@
 				continue;
 			w->ww_ttyname[_PT] = 't';
 			if ((tty = open(w->ww_ttyname, 2)) < 0) {
-				(void) close(w->ww_pty);
+				close(w->ww_pty);
 				continue;
 			}
-			(void) close(tty);
+			close(tty);
 			if (ioctl(w->ww_pty, TIOCPKT, (char *)&on) < 0) {
-				(void) close(w->ww_pty);
+				close(w->ww_pty);
 				continue;
 			}
-			(void) fcntl(w->ww_pty, F_SETFD, 1);
+			fcntl(w->ww_pty, F_SETFD, 1);
 			return 0;
 		}
 	}
Index: window/wwputc.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwputc.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwputc.c
--- window/wwputc.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwputc.c	7 Nov 2004 20:02:17 -0000
@@ -44,5 +44,5 @@
 char c;
 struct ww *w;
 {
-	(void) wwwrite(w, &c, sizeof c);
+	wwwrite(w, &c, sizeof c);
 }
Index: window/wwputs.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwputs.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwputs.c
--- window/wwputs.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwputs.c	7 Nov 2004 20:02:17 -0000
@@ -48,5 +48,5 @@
 
 	while (*p++)
 		;
-	(void) wwwrite(w, s, p - s - 1);
+	wwwrite(w, s, p - s - 1);
 }
Index: window/wwrint.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwrint.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwrint.c
--- window/wwrint.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwrint.c	7 Nov 2004 20:02:17 -0000
@@ -64,11 +64,11 @@
 	wwnread++;
 #if defined(OLD_TTY) || defined(VMIN_BUG)
 	/* we have set c_cc[VMIN] to 0 */
-	(void) fcntl(0, F_SETFL, O_NONBLOCK|wwnewtty.ww_fflags);
+	fcntl(0, F_SETFL, O_NONBLOCK|wwnewtty.ww_fflags);
 #endif
 	n = read(0, wwibq, wwibe - wwibq);
 #if defined(OLD_TTY) || defined(VMIN_BUG)
-	(void) fcntl(0, F_SETFL, wwnewtty.ww_fflags);
+	fcntl(0, F_SETFL, wwnewtty.ww_fflags);
 #endif
 	if (n > 0) {
 		if (tt.tt_rint)
@@ -81,7 +81,7 @@
 			 * as the case may be.
 			 */
 			if (tt.tt_checkpoint && !wwdocheckpoint)
-				(void) alarm(1);
+				alarm(1);
 			wwsetintr();
 		}
 	} else if (n == 0)
Index: window/wwscroll.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwscroll.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwscroll.c
--- window/wwscroll.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwscroll.c	7 Nov 2004 20:02:17 -0000
@@ -59,7 +59,7 @@
 	n = abs(top - w->ww_b.t);
 	if (n < w->ww_i.nr) {
 		while (--n >= 0) {
-			(void) wwscroll1(w, w->ww_i.t, w->ww_i.b, dir, 0);
+			wwscroll1(w, w->ww_i.t, w->ww_i.b, dir, 0);
 			w->ww_buf += dir;
 			w->ww_b.t -= dir;
 			w->ww_b.b -= dir;
Index: window/wwsize.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwsize.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwsize.c
--- window/wwsize.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwsize.c	7 Nov 2004 20:02:17 -0000
@@ -177,7 +177,7 @@
 	 * Fool with pty.
 	 */
 	if (w->ww_ispty && w->ww_pty >= 0)
-		(void) wwsetttysize(w->ww_pty, nrow, ncol);
+		wwsetttysize(w->ww_pty, nrow, ncol);
 	return 0;
 bad:
 	if (win != 0)
Index: window/wwspawn.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwspawn.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwspawn.c
--- window/wwspawn.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwspawn.c	7 Nov 2004 20:02:17 -0000
@@ -76,9 +76,9 @@
 			ret = pid;
 		}
 	}
-	(void) sigsetmask(s);
+	sigsetmask(s);
 	if (wp->ww_socket >= 0) {
-		(void) close(wp->ww_socket);
+		close(wp->ww_socket);
 		wp->ww_socket = -1;
 	}
 	return ret;
Index: window/wwsuspend.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwsuspend.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwsuspend.c
--- window/wwsuspend.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwsuspend.c	7 Nov 2004 20:02:17 -0000
@@ -48,9 +48,9 @@
 
 	oldsig = signal(SIGTSTP, SIG_IGN);
 	wwend(0);
-	(void) signal(SIGTSTP, SIG_DFL);
-	(void) kill(0, SIGTSTP);
-	(void) signal(SIGTSTP, SIG_IGN);
+	signal(SIGTSTP, SIG_DFL);
+	kill(0, SIGTSTP);
+	signal(SIGTSTP, SIG_IGN);
 	wwstart();
-	(void) signal(SIGTSTP, oldsig);
+	signal(SIGTSTP, oldsig);
 }
Index: window/wwterminfo.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwterminfo.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwterminfo.c
--- window/wwterminfo.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwterminfo.c	7 Nov 2004 20:02:17 -0000
@@ -62,26 +62,26 @@
 	char buf[2048];
 
 		/* make the directory */
-	(void) sprintf(wwterminfopath, "%swwinXXXXXX", _PATH_TMP);
+	sprintf(wwterminfopath, "%swwinXXXXXX", _PATH_TMP);
 	if (mkdtemp(wwterminfopath) < 0 ||
 	    chmod(wwterminfopath, 00755) < 0) {
 		wwerrno = WWE_SYS;
 		return -1;
 	}
-	(void) setenv("TERMINFO", wwterminfopath, 1);
+	setenv("TERMINFO", wwterminfopath, 1);
 		/* make a termcap entry and turn it into terminfo */
-	(void) sprintf(buf, "%s/cap", wwterminfopath);
+	sprintf(buf, "%s/cap", wwterminfopath);
 	if ((fp = fopen(buf, "w")) == NULL) {
 		wwerrno = WWE_SYS;
 		return -1;
 	}
-	(void) fprintf(fp, "%sco#%d:li#%d:%s\n",
+	fprintf(fp, "%sco#%d:li#%d:%s\n",
 		WWT_TERMCAP, wwncol, wwnrow, wwwintermcap);
-	(void) fclose(fp);
-	(void) sprintf(buf,
+	fclose(fp);
+	sprintf(buf,
 		"cd %s; %s cap >info 2>/dev/null; %s info >/dev/null 2>&1",
 		wwterminfopath, _PATH_CAPTOINFO, _PATH_TIC);
-	(void) system(buf);
+	system(buf);
 	return 0;
 }
 
Index: window/wwtty.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwtty.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwtty.c
--- window/wwtty.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwtty.c	7 Nov 2004 20:02:17 -0000
@@ -101,7 +101,7 @@
 #else
 #ifdef sun
 	/* XXX, for buggy tty drivers that don't wait for output to drain */
-	(void) tcdrain(d);
+	tcdrain(d);
 #endif
 	if (tcsetattr(d, TCSADRAIN, &t->ww_termios) < 0)
 		goto bad;
Index: window/wwwrite.c
===================================================================
RCS file: /cvs/src/usr.bin/window/wwwrite.c,v
retrieving revision 1.2
diff -u -u -r1.2 wwwrite.c
--- window/wwwrite.c	17 Jun 2003 04:29:34 -0000	1.2
+++ window/wwwrite.c	7 Nov 2004 20:02:17 -0000
@@ -161,7 +161,7 @@
 				if (++w->ww_cur.r >= w->ww_w.b) {
 					w->ww_cur.r = w->ww_w.b - 1;
 					if (w->ww_w.b < w->ww_b.b) {
-						(void) wwscroll1(w, w->ww_i.t,
+						wwscroll1(w, w->ww_i.t,
 							w->ww_i.b, 1, 0);
 						w->ww_buf++;
 						w->ww_b.t--;
@@ -199,7 +199,7 @@
 				if (--w->ww_cur.r < w->ww_w.t) {
 					w->ww_cur.r = w->ww_w.t;
 					if (w->ww_w.t > w->ww_b.t) {
-						(void) wwscroll1(w, w->ww_i.t,
+						wwscroll1(w, w->ww_i.t,
 							w->ww_i.b, -1, 0);
 						w->ww_buf--;
 						w->ww_b.t++;
Index: write/write.c
===================================================================
RCS file: /cvs/src/usr.bin/write/write.c,v
retrieving revision 1.4
diff -u -u -r1.4 write.c
--- write/write.c	30 Aug 2004 18:06:50 -0000	1.4
+++ write/write.c	7 Nov 2004 20:02:17 -0000
@@ -71,7 +71,7 @@
 	int msgsok, myttyfd;
 	char tty[MAXPATHLEN], *mytty;
 
-	(void)setlocale(LC_CTYPE, "");
+	setlocale(LC_CTYPE, "");
 
 	/* check that sender has write enabled */
 	if (isatty(fileno(stdin)))
@@ -120,7 +120,7 @@
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: write user [tty]\n");
+	fprintf(stderr, "usage: write user [tty]\n");
 	exit(1);
 }
 
@@ -140,11 +140,11 @@
 	while (read(ufd, (char *) &u, sizeof(u)) == sizeof(u))
 		if (strncmp(user, u.ut_name, sizeof(u.ut_name)) == 0 &&
 		    strncmp(tty, u.ut_line, sizeof(u.ut_line)) == 0) {
-			(void)close(ufd);
+			close(ufd);
 			return(0);
 		}
 
-	(void)close(ufd);
+	close(ufd);
 	return(1);
 }
 
@@ -176,7 +176,7 @@
 	while (read(ufd, (char *) &u, sizeof(u)) == sizeof(u))
 		if (strncmp(user, u.ut_name, sizeof(u.ut_name)) == 0) {
 			++nloggedttys;
-			(void)strncpy(atty, u.ut_line, UT_LINESIZE);
+			strncpy(atty, u.ut_line, UT_LINESIZE);
 			atty[UT_LINESIZE] = '\0';
 			if (term_chk(atty, &msgsok, &atime, 0))
 				continue;	/* bad term? skip */
@@ -189,16 +189,16 @@
 			++nttys;
 			if (atime > bestatime) {
 				bestatime = atime;
-				(void)strcpy(tty, atty);
+				strcpy(tty, atty);
 			}
 		}
 
-	(void)close(ufd);
+	close(ufd);
 	if (nloggedttys == 0)
 		errx(1, "%s is not logged in", user);
 	if (nttys == 0) {
 		if (user_is_me) {		/* ok, so write to yourself! */
-			(void)strcpy(tty, mytty);
+			strcpy(tty, mytty);
 			return;
 		}
 		errx(1, "%s has messages disabled", user);
@@ -217,7 +217,7 @@
 	struct stat s;
 	char path[MAXPATHLEN];
 
-	(void)snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty);
+	snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty);
 	if (stat(path, &s) < 0) {
 		if (showerror)
 			warn("%s", path);
@@ -247,20 +247,20 @@
 			login = "???";
 	}
 
-	(void)snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty);
+	snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty);
 	if ((freopen(path, "w", stdout)) == NULL)
 		err(1, "%s", path);
 
-	(void)signal(SIGINT, done);
-	(void)signal(SIGHUP, done);
+	signal(SIGINT, done);
+	signal(SIGHUP, done);
 
 	/* print greeting */
 	if (gethostname(host, sizeof(host)) < 0)
-		(void)strcpy(host, "???");
+		strcpy(host, "???");
 	now = time((time_t *)NULL);
 	nows = ctime(&now);
 	nows[16] = '\0';
-	(void)printf("\r\n\007\007\007Message from %s@%s on %s at %s ...\r\n",
+	printf("\r\n\007\007\007Message from %s@%s on %s at %s ...\r\n",
 	    login, host, mytty, nows + 11);
 
 	while (fgets(line, sizeof(line), stdin) != NULL)
@@ -273,7 +273,7 @@
 void
 done(int n)
 {
-	(void)printf("EOF\r\n");
+	printf("EOF\r\n");
 	exit(0);
 }
 
Index: xargs/xargs.c
===================================================================
RCS file: /cvs/src/usr.bin/xargs/xargs.c,v
retrieving revision 1.3
diff -u -u -r1.3 xargs.c
--- xargs/xargs.c	27 Jul 2004 21:42:48 -0000	1.3
+++ xargs/xargs.c	7 Nov 2004 20:02:17 -0000
@@ -88,7 +88,7 @@
 	eofstr = "";
 	Jflag = nflag = 0;
 
-	(void)setlocale(LC_MESSAGES, "");
+	setlocale(LC_MESSAGES, "");
 
 	/*
 	 * POSIX.2 limits the exec line length to ARG_MAX - 2K.  Running that
@@ -471,9 +471,9 @@
 	 * followed by a prompt, then prompt them.
 	 */
 	if (tflag || pflag) {
-		(void)fprintf(stderr, "%s", *argv);
+		fprintf(stderr, "%s", *argv);
 		for (avec = argv + 1; *avec != NULL; ++avec)
-			(void)fprintf(stderr, " %s", *avec);
+			fprintf(stderr, " %s", *avec);
 		/*
 		 * If the user has asked to be prompted, do so.
 		 */
@@ -492,8 +492,8 @@
 			case 2:
 				break;
 			}
-		(void)fprintf(stderr, "\n");
-		(void)fflush(stderr);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
 exec:
 	childerr = 0;
@@ -540,8 +540,8 @@
 
 	if ((ttyfp = fopen(_PATH_TTY, "r")) == NULL)
 		return (2);	/* Indicate that the TTY failed to open. */
-	(void)fprintf(stderr, "?...");
-	(void)fflush(stderr);
+	fprintf(stderr, "?...");
+	fflush(stderr);
 	if ((response = fgetln(ttyfp, &rsize)) == NULL ||
 	    regcomp(&cre,
 #ifdef BOOTSTRAPPING
@@ -550,11 +550,11 @@
 		nl_langinfo(YESEXPR),
 #endif
 		REG_BASIC) != 0) {
-		(void)fclose(ttyfp);
+		fclose(ttyfp);
 		return (0);
 	}
 	match = regexec(&cre, response, 0, NULL, 0);
-	(void)fclose(ttyfp);
+	fclose(ttyfp);
 	regfree(&cre);
 	return (match == 0);
 }
