From 6521d648db5d5e42b8371f0d140332a72e353feb Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Thu, 22 Oct 1987 18:09:56 -0800
Subject: [PATCH] ANSI C; sprintf now returns an int.

SCCS-vsn: usr.bin/ar/ar.c 5.3
SCCS-vsn: old/pcc/cc/cc.c 4.15
SCCS-vsn: usr.bin/du/du.c 4.12
SCCS-vsn: bin/expr/expr.y 4.6
SCCS-vsn: bin/ln/ln.c 4.7
SCCS-vsn: bin/ls/ls.c 5.9
SCCS-vsn: libexec/mail.local/mail.local.c 4.30
SCCS-vsn: bin/mv/mv.c 5.5
SCCS-vsn: old/od/od.c 5.13
SCCS-vsn: old/pr/pr.c 4.7
SCCS-vsn: bin/ps/ps.c 5.11
SCCS-vsn: bin/rcp/rcp.c 5.9
SCCS-vsn: old/tar/tar.c 5.10
SCCS-vsn: usr.bin/wall/wall.c 5.4
SCCS-vsn: old/adb/adb.vax/output.c 4.6
SCCS-vsn: old/adb/adb.vax/output.c 4.6
SCCS-vsn: old/adb/adb.tahoe/output.c 1.2
SCCS-vsn: old/awk/run.c 4.7
SCCS-vsn: old/awk/tran.c 4.5
SCCS-vsn: old/make/gram.y 4.2
SCCS-vsn: old/make/misc.c 4.5
SCCS-vsn: usr.bin/diff/diff/diffdir.c 4.11
SCCS-vsn: usr.bin/diff/diff/diffreg.c 4.17
SCCS-vsn: old/as.vax/asexpr.c 5.4
SCCS-vsn: old/as.vax/asmain.c 5.3
SCCS-vsn: old/as.vax/assyms.c 5.2
SCCS-vsn: old/as.tahoe/asexpr.c 1.3
SCCS-vsn: old/as.tahoe/asexpr.c 1.3
SCCS-vsn: old/as.tahoe/asexpr.c 1.3
---
 usr/src/bin/expr/expr.y                 | 10 ++++-----
 usr/src/bin/ln/ln.c                     |  4 ++--
 usr/src/bin/ls/ls.c                     |  4 ++--
 usr/src/bin/mv/mv.c                     | 11 +++++-----
 usr/src/bin/ps/ps.c                     |  6 +++---
 usr/src/bin/rcp/rcp.c                   |  4 ++--
 usr/src/libexec/mail.local/mail.local.c |  8 ++++----
 usr/src/old/adb/adb.tahoe/output.c      |  4 ++--
 usr/src/old/adb/adb.vax/output.c        |  6 +++---
 usr/src/old/as.tahoe/asexpr.c           |  2 +-
 usr/src/old/as.vax/asexpr.c             |  4 ++--
 usr/src/old/as.vax/asmain.c             |  6 +++---
 usr/src/old/as.vax/assyms.c             |  4 ++--
 usr/src/old/awk/run.c                   | 16 +++++++--------
 usr/src/old/awk/tran.c                  |  6 +++---
 usr/src/old/make/gram.y                 |  4 ++--
 usr/src/old/make/misc.c                 |  6 +++---
 usr/src/old/od/od.c                     | 10 ++++-----
 usr/src/old/pcc/cc/cc.c                 |  4 ++--
 usr/src/old/pr/pr.c                     |  7 +++----
 usr/src/old/tar/tar.c                   | 27 ++++++++++++-------------
 usr/src/usr.bin/ar/ar.c                 |  4 ++--
 usr/src/usr.bin/diff/diff/diffdir.c     |  4 ++--
 usr/src/usr.bin/diff/diff/diffreg.c     |  4 ++--
 usr/src/usr.bin/du/du.c                 |  4 ++--
 usr/src/usr.bin/wall/wall.c             |  4 ++--
 26 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/usr/src/bin/expr/expr.y b/usr/src/bin/expr/expr.y
index 953978c54f..a8110ba867 100644
--- a/usr/src/bin/expr/expr.y
+++ b/usr/src/bin/expr/expr.y
@@ -127,7 +127,7 @@ char *arith(op, r1, r2) char *r1, *r2; {
 	case REM: i1 = i1 % i2; break;
 	}
 	rv = malloc(16);
-	sprintf(rv, "%D", i1);
+	(void)sprintf(rv, "%ld", i1);
 	return rv;
 }
 char *conj(op, r1, r2) char *r1, *r2; {
@@ -183,7 +183,7 @@ char *length(s) register char *s; {
 	while(*s++) ++i;
 
 	rv = malloc(8);
-	sprintf(rv, "%d", i);
+	(void)sprintf(rv, "%d", i);
 	return rv;
 }
 
@@ -194,7 +194,7 @@ char *index(s, t) char *s, *t; {
 	for(i = 0; s[i] ; ++i)
 		for(j = 0; t[j] ; ++j)
 			if(s[i]==t[j]) {
-				sprintf(rv = malloc(8), "%d", ++i);
+				(void)sprintf(rv = malloc(8), "%d", ++i);
 				return rv;
 			}
 	return "0";
@@ -204,7 +204,7 @@ char *match(s, p)
 {
 	register char *rv;
 
-	sprintf(rv = malloc(8), "%d", ematch(s, p));
+	(void)sprintf(rv = malloc(8), "%d", ematch(s, p));
 	if(nbra) {
 		rv = malloc(strlen(Mstring[0])+1);
 		strcpy(rv, Mstring[0]);
@@ -662,7 +662,7 @@ register	count;
 	return(1);
 }
 
-static char *sccsid = "@(#)expr.y	4.5 (Berkeley) %G%";
+static char *sccsid = "@(#)expr.y	4.6 (Berkeley) %G%";
 yyerror(s)
 
 {
diff --git a/usr/src/bin/ln/ln.c b/usr/src/bin/ln/ln.c
index d6a718da27..4051ed8263 100644
--- a/usr/src/bin/ln/ln.c
+++ b/usr/src/bin/ln/ln.c
@@ -1,4 +1,4 @@
-static	char sccsid[] = "@(#)ln.c 4.6 %G%";
+static	char sccsid[] = "@(#)ln.c 4.7 %G%";
 /*
  * ln
  */
@@ -73,7 +73,7 @@ linkit(from, to)
 			tail = from;
 		else
 			tail++;
-		sprintf(name, "%s/%s", to, tail);
+		(void)sprintf(name, "%s/%s", to, tail);
 		to = name;
 	}
 	if ((*linkf)(from, to) < 0) {
diff --git a/usr/src/bin/ls/ls.c b/usr/src/bin/ls/ls.c
index 47e3e9edff..1bf2abbffa 100644
--- a/usr/src/bin/ls/ls.c
+++ b/usr/src/bin/ls/ls.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)ls.c	5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)ls.c	5.9 (Berkeley) %G%";
 #endif not lint
 
 /*
@@ -69,7 +69,7 @@ char	*getname(), *getgroup();
 
 char	*ctime();
 char	*malloc(), *calloc(), *realloc();
-char	*sprintf(), *strcpy(), *strcat();
+char	*strcpy(), *strcat();
 
 main(argc, argv)
 	int argc;
diff --git a/usr/src/bin/mv/mv.c b/usr/src/bin/mv/mv.c
index 2c8fd89cfb..b3f0f758c7 100644
--- a/usr/src/bin/mv/mv.c
+++ b/usr/src/bin/mv/mv.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)mv.c	5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)mv.c	5.5 (Berkeley) %G%";
 #endif not lint
 
 /*
@@ -35,7 +35,6 @@ static char sccsid[] = "@(#)mv.c	5.4 (Berkeley) %G%";
 #define	ISDEV(st) \
 	(((st).st_mode&S_IFMT) == S_IFCHR || ((st).st_mode&S_IFMT) == S_IFBLK)
 
-char	*sprintf();
 char	*dname();
 struct	stat s1, s2;
 int	iflag = 0;	/* interactive mode */
@@ -107,7 +106,7 @@ movewithshortname(src, dest)
 			shortname);
 		return (1);
 	}
-	sprintf(target, "%s/%s", dest, shortname);
+	(void)sprintf(target, "%s/%s", dest, shortname);
 	return (move(src, target));
 }
 
@@ -291,8 +290,8 @@ Perror(s)
 	char *s;
 {
 	char buf[MAXPATHLEN + 10];
-	
-	sprintf(buf, "mv: %s", s);
+
+	(void)sprintf(buf, "mv: %s", s);
 	perror(buf);
 }
 
@@ -301,6 +300,6 @@ Perror2(s1, s2)
 {
 	char buf[MAXPATHLEN + 20];
 
-	sprintf(buf, "mv: %s: %s", s1, s2);
+	(void)sprintf(buf, "mv: %s: %s", s1, s2);
 	perror(buf);
 }
diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index c569a613a8..2ddaac9b27 100644
--- a/usr/src/bin/ps/ps.c
+++ b/usr/src/bin/ps/ps.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)ps.c	5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)ps.c	5.11 (Berkeley) %G%";
 #endif not lint
 
 #include <stdio.h>
@@ -707,7 +707,7 @@ printhdr()
 			fprintf(stderr, "ps: out of memory\n");
 			exit(1);
 		}
-		sprintf(hdr, lhdr, wcwidth, "WCHAN");
+		(void)sprintf(hdr, lhdr, wcwidth, "WCHAN");
 	} else if (vflg)
 		hdr = vhdr;
 	else if (uflg) {
@@ -716,7 +716,7 @@ printhdr()
 			fprintf(stderr, "ps: out of memory\n");
 			exit(1);
 		}
-		sprintf(hdr, uhdr, nflg ? " UID" : "USER    ");
+		(void)sprintf(hdr, uhdr, nflg ? " UID" : "USER    ");
 	} else
 		hdr = shdr;
 	if (lflg+vflg+uflg+sflg == 0)
diff --git a/usr/src/bin/rcp/rcp.c b/usr/src/bin/rcp/rcp.c
index dd6254964f..177d41087b 100644
--- a/usr/src/bin/rcp/rcp.c
+++ b/usr/src/bin/rcp/rcp.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)rcp.c	5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)rcp.c	5.9 (Berkeley) %G%";
 #endif not lint
 
 /*
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)rcp.c	5.8 (Berkeley) %G%";
 #include <errno.h>
 
 int	rem;
-char	*colon(), *index(), *rindex(), *malloc(), *strcpy(), *sprintf();
+char	*colon(), *index(), *rindex(), *malloc(), *strcpy();
 int	errs;
 int	lostconn();
 int	errno;
diff --git a/usr/src/libexec/mail.local/mail.local.c b/usr/src/libexec/mail.local/mail.local.c
index 9cf603a4c4..eaa945e0d9 100644
--- a/usr/src/libexec/mail.local/mail.local.c
+++ b/usr/src/libexec/mail.local/mail.local.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)mail.local.c	4.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)mail.local.c	4.30 (Berkeley) %G%";
 #endif
 
 #include <sys/param.h>
@@ -585,9 +585,9 @@ skip:
 	}
 	setuid(getuid());
 	if (any('!', name+1))
-		sprintf(cmd, "uux - %s!rmail \\(%s\\)", rsys, name+1);
+		(void)sprintf(cmd, "uux - %s!rmail \\(%s\\)", rsys, name+1);
 	else
-		sprintf(cmd, "uux - %s!rmail %s", rsys, name+1);
+		(void)sprintf(cmd, "uux - %s!rmail %s", rsys, name+1);
 	if ((rmf=popen(cmd, "w")) == NULL)
 		exit(1);
 	copylet(n, rmf, REMOTE);
@@ -670,7 +670,7 @@ sendmail(n, name, fromaddr)
 		return(0);
 	}
 	fchown(fd, pw->pw_uid, pw->pw_gid);
-	sprintf(buf, "%s@%d\n", name, ftell(malf)); 
+	(void)sprintf(buf, "%s@%d\n", name, ftell(malf));
 	copylet(n, malf, ORDINARY);
 	fclose(malf);
 	notifybiff(buf);
diff --git a/usr/src/old/adb/adb.tahoe/output.c b/usr/src/old/adb/adb.tahoe/output.c
index 7184e862af..dac48b138c 100644
--- a/usr/src/old/adb/adb.tahoe/output.c
+++ b/usr/src/old/adb/adb.tahoe/output.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static	char sccsid[] = "@(#)output.c	1.1 (Berkeley) %G%";
+static	char sccsid[] = "@(#)output.c	1.2 (Berkeley) %G%";
 #endif
 /*
  *
@@ -137,7 +137,7 @@ printf(fmat,a1)
 		    case 'f':
 		    case 'F':
 			dptr++;
-			sprintf(s=digits, "%*.*f", width, prec, *rptr); prec= -1; break;
+			(void)sprintf(s=digits, "%*.*f", width, prec, *rptr); prec= -1; break;
 #endif
 		    case 'm':
 			break;
diff --git a/usr/src/old/adb/adb.vax/output.c b/usr/src/old/adb/adb.vax/output.c
index 9f9cd36f3e..6f9cb815ec 100644
--- a/usr/src/old/adb/adb.vax/output.c
+++ b/usr/src/old/adb/adb.vax/output.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static	char sccsid[] = "@(#)output.c	4.5 %G%";
+static	char sccsid[] = "@(#)output.c	4.6 %G%";
 #endif
 /*
  *
@@ -172,7 +172,7 @@ printf(fmat,a1)
 		    case 'F':
 #ifdef vax
 			dptr++;
-			sprintf(s=digits,"%+.16e",*rptr); prec= -1; break;
+			(void)sprintf(s=digits,"%+.16e",*rptr); prec= -1; break;
 #else
 			vptr += 7;
 			s=ecvt(*rptr, prec, &decpt, &n);
@@ -321,7 +321,7 @@ L_INT lxy; char fmat; int base;
 #ifndef MULD2
 	register char *cp1;
 	cp1=digs; if ((lxy&0xFFFF0000L)==0xFFFF0000L) {*cp1++='-'; lxy= -lxy;}
-	sprintf(cp1,base==16 ? "%x" : "%D",lxy);
+	(void)sprintf(cp1,base==16 ? "%x" : "%D",lxy);
 	cp1=digs; while (*digitptr++= *cp1++); --digitptr;
 #else
 	L_REAL f ,g; long q;
diff --git a/usr/src/old/as.tahoe/asexpr.c b/usr/src/old/as.tahoe/asexpr.c
index 11aa8f4eda..f255d5f0cb 100644
--- a/usr/src/old/as.tahoe/asexpr.c
+++ b/usr/src/old/as.tahoe/asexpr.c
@@ -474,7 +474,7 @@ char *tok_to_name(token)
 		fixed = 1;
 	}
 	if (FIRSTTOKEN <= token && token <= LASTTOKEN){
-		sprintf(buf, "%s %s", tok_name[token]->tok_kind,
+		(void)sprintf(buf, "%s %s", tok_name[token]->tok_kind,
 			tok_name[token]->tok_name);
 		return(buf);
 	} else {
diff --git a/usr/src/old/as.vax/asexpr.c b/usr/src/old/as.vax/asexpr.c
index ecabb8c678..e317d90df9 100644
--- a/usr/src/old/as.vax/asexpr.c
+++ b/usr/src/old/as.vax/asexpr.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)asexpr.c	5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)asexpr.c	5.4 (Berkeley) %G%";
 #endif not lint
 
 #include <stdio.h>
@@ -499,7 +499,7 @@ char *tok_to_name(token)
 		fixed = 1;
 	}
 	if (FIRSTTOKEN <= token && token <= LASTTOKEN){
-		sprintf(buf, "%s %s", tok_name[token]->tok_kind,
+		(void)sprintf(buf, "%s %s", tok_name[token]->tok_kind,
 			tok_name[token]->tok_name);
 		return(buf);
 	} else {
diff --git a/usr/src/old/as.vax/asmain.c b/usr/src/old/as.vax/asmain.c
index c1acd8afd1..f8d32cc6ec 100644
--- a/usr/src/old/as.vax/asmain.c
+++ b/usr/src/old/as.vax/asmain.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)asmain.c	5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)asmain.c	5.3 (Berkeley) %G%";
 #endif not lint
 
 #include <stdio.h>
@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)asmain.c	5.2 (Berkeley) %G%";
 
 #include <sys/stat.h>
 
-#define	unix_lang_name "VAX/UNIX Assembler V%G% 5.2"
+#define	unix_lang_name "VAX/UNIX Assembler V%G% 5.3"
 /*
  *	variables to manage reading the assembly source files
  */
@@ -422,7 +422,7 @@ FILE *tempopen(tname, part)
 	char	*part;
 {
 	FILE	*file;
-	sprintf(tname, "%s%sas%s%05d",
+	(void)sprintf(tname, "%s%sas%s%05d",
 		tmpdirprefix,
 		(tmpdirprefix[strlen(tmpdirprefix)-1] != '/') ? "/" : "",
 		part,
diff --git a/usr/src/old/as.vax/assyms.c b/usr/src/old/as.vax/assyms.c
index c4d0992500..166cff362d 100644
--- a/usr/src/old/as.vax/assyms.c
+++ b/usr/src/old/as.vax/assyms.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)assyms.c	5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)assyms.c	5.2 (Berkeley) %G%";
 #endif not lint
 
 #include <stdio.h>
@@ -351,7 +351,7 @@ char *tagstring(tag)
 		case OKTOBUMP:		return("oktobump");
 		case ISET:		return("iset");
 		case ILSYM:		return("ilsym");
-		default:		sprintf(tagbuff,"%d", tag);
+		default:		(void)sprintf(tagbuff,"%d", tag);
 					return(tagbuff);
 	}
 }
diff --git a/usr/src/old/awk/run.c b/usr/src/old/awk/run.c
index 533b634a92..eae7cb1415 100644
--- a/usr/src/old/awk/run.c
+++ b/usr/src/old/awk/run.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)run.c	4.6 %G%";
+static char sccsid[] = "@(#)run.c	4.7 %G%";
 #endif
 
 #include "awk.def"
@@ -373,7 +373,7 @@ char *format(s,a) char *s; node *a;
 			break;
 		}
 		if (flag == 0) {
-			sprintf(p, "%s", fmt);
+			(void)sprintf(p, "%s", fmt);
 			p += strlen(p);
 			continue;
 		}
@@ -383,10 +383,10 @@ char *format(s,a) char *s; node *a;
 		a = a->nnext;
 		if (flag != 4)	/* watch out for converting to numbers! */
 			xf = getfval(x.optr);
-		if (flag==1) sprintf(p, fmt, xf);
-		else if (flag==2) sprintf(p, fmt, (long)xf);
-		else if (flag==3) sprintf(p, fmt, (int)xf);
-		else if (flag==4) sprintf(p, fmt, x.optr->sval==NULL ? "" : getsval(x.optr));
+		if (flag==1) (void)sprintf(p, fmt, xf);
+		else if (flag==2) (void)sprintf(p, fmt, (long)xf);
+		else if (flag==3) (void)sprintf(p, fmt, (int)xf);
+		else if (flag==4) (void)sprintf(p, fmt, x.optr->sval==NULL ? "" : getsval(x.optr));
 		tempfree(x);
 		p += strlen(p);
 		s++;
@@ -640,7 +640,7 @@ obj split(a,nnn) node **a;
 			while (*s!=' ' && *s!='\t' && *s!='\n' && *s!='\0');
 			temp = *s;
 			*s = '\0';
-			sprintf(num, "%d", n);
+			(void)sprintf(num, "%d", n);
 			if (isnumber(t))
 				setsymtab(num, tostring(t), atof(t), STR|NUM, ap->sval);
 			else
@@ -657,7 +657,7 @@ obj split(a,nnn) node **a;
 				s++;
 			temp = *s;
 			*s = '\0';
-			sprintf(num, "%d", n);
+			(void)sprintf(num, "%d", n);
 			if (isnumber(t))
 				setsymtab(num, tostring(t), atof(t), STR|NUM, ap->sval);
 			else
diff --git a/usr/src/old/awk/tran.c b/usr/src/old/awk/tran.c
index 4a1b0888ae..ea5de10377 100644
--- a/usr/src/old/awk/tran.c
+++ b/usr/src/old/awk/tran.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)tran.c	4.4 %G%";
+static char sccsid[] = "@(#)tran.c	4.5 %G%";
 #endif
 
 #include "stdio.h"
@@ -197,9 +197,9 @@ register cell *vp;
 		if (!(vp->tval&FLD))
 			strfree(vp->sval);
 		if ((long)vp->fval==vp->fval)
-			sprintf(s, "%.20g", vp->fval);
+			(void)sprintf(s, "%.20g", vp->fval);
 		else
-			sprintf(s, *OFMT, vp->fval);
+			(void)sprintf(s, *OFMT, vp->fval);
 		vp->sval = tostring(s);
 		vp->tval &= ~FLD;
 		vp->tval |= STR;
diff --git a/usr/src/old/make/gram.y b/usr/src/old/make/gram.y
index d11f470eac..5e0fd91339 100644
--- a/usr/src/old/make/gram.y
+++ b/usr/src/old/make/gram.y
@@ -1,5 +1,5 @@
 %{#include "defs"
-static	char *sccsid = "@(#)gram.y	4.1 (Berkeley) 81/02/28";
+static	char *sccsid = "@(#)gram.y	4.2 (Berkeley) 87/10/22";
 %}
 
 %term NAME SHELLINE START MACRODEF COLON DOUBLECOLON GREATER
@@ -83,7 +83,7 @@ namelist: NAME	= { lefts[0] = $1; nlefts = 1; }
 deplist:
 		{
 		char junk[10];
-		sprintf(junk, "%d", yylineno);
+		(void)sprintf(junk, "%d", yylineno);
 		fatal1("Must be a separator on rules line %s", junk);
 		}
 	| dlist
diff --git a/usr/src/old/make/misc.c b/usr/src/old/make/misc.c
index 620cb8d6c3..0bf0728a88 100644
--- a/usr/src/old/make/misc.c
+++ b/usr/src/old/make/misc.c
@@ -1,4 +1,4 @@
-static	char *sccsid = "@(#)misc.c	4.4 (Berkeley) 87/05/21";
+static	char *sccsid = "@(#)misc.c	4.5 (Berkeley) 87/10/22";
 #include "defs"
 
 FSTATIC struct nameblock *hashtab[HASHSIZE];
@@ -254,7 +254,7 @@ fatal1(s, t)
 char *s, *t;
 {
 char buf[BUFSIZ];
-sprintf(buf, s, t);
+(void)sprintf(buf, s, t);
 fatal(buf);
 }
 
@@ -281,7 +281,7 @@ char *s;
 char buf[50];
 extern int yylineno;
 
-sprintf(buf, "line %d: %s", yylineno, s);
+(void)sprintf(buf, "line %d: %s", yylineno, s);
 fatal(buf);
 }
 
diff --git a/usr/src/old/od/od.c b/usr/src/old/od/od.c
index 0ef8908a39..23d77ee4cd 100644
--- a/usr/src/old/od/od.c
+++ b/usr/src/old/od/od.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)od.c	5.12 (Berkeley) %G%";
+static char *sccsid = "@(#)od.c	5.13 (Berkeley) %G%";
 /*
  * od -- octal, hex, decimal, character dump of data in a file.
  *
@@ -438,12 +438,12 @@ struct dfmt *d;
 
 #if	vax
 	if ((((struct l *)f)->n[0] & 0xff00) == 0x8000)	/* Vax illegal f.p. */
-		sprintf(fbuf, "    %08x %08x",
+		(void)sprintf(fbuf, "    %08x %08x",
 			((struct l *)f)->n[0], ((struct l *)f)->n[1]);
 	else
 #endif
 
-		sprintf(fbuf, "%21.14e", *f);
+		(void)sprintf(fbuf, "%21.14e", *f);
 	printf(d->df_fmt, fbuf);
 	return(d->df_size);
 }
@@ -456,10 +456,10 @@ struct dfmt *d;
 
 #if	vax
 	if ((*(long *)f & 0xff00) == 0x8000)	/* Vax illegal f.p. form */
-		sprintf(fbuf, "      %08x", *(long *)f);
+		(void)sprintf(fbuf, "      %08x", *(long *)f);
 	else
 #endif
-		sprintf(fbuf, "%14.7e", *f);
+		(void)sprintf(fbuf, "%14.7e", *f);
 	printf(d->df_fmt, fbuf);
 	return(d->df_size);
 }
diff --git a/usr/src/old/pcc/cc/cc.c b/usr/src/old/pcc/cc/cc.c
index e3e7bc5130..d9811cddfb 100644
--- a/usr/src/old/pcc/cc/cc.c
+++ b/usr/src/old/pcc/cc/cc.c
@@ -1,4 +1,4 @@
-static	char sccsid[] = "@(#)cc.c 4.14 %G%";
+static	char sccsid[] = "@(#)cc.c 4.15 %G%";
 /*
  * cc - front end for C compiler
  */
@@ -184,7 +184,7 @@ main(argc, argv)
 	if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
 		signal(SIGHUP, idexit);
 	if (pflag==0)
-		sprintf(tmp0, "/tmp/ctm%05.5d", getpid());
+		(void)sprintf(tmp0, "/tmp/ctm%05.5d", getpid());
 	tmp1 = strspl(tmp0, "1");
 	tmp2 = strspl(tmp0, "2");
 	tmp3 = strspl(tmp0, "3");
diff --git a/usr/src/old/pr/pr.c b/usr/src/old/pr/pr.c
index 1d2cc42866..3926c7538b 100644
--- a/usr/src/old/pr/pr.c
+++ b/usr/src/old/pr/pr.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)pr.c	4.6 (Berkeley) %G%";
+static char *sccsid = "@(#)pr.c	4.7 (Berkeley) %G%";
 
 /*
  *   print file with headings
@@ -168,7 +168,6 @@ print(fp, argp)
 char *fp;
 char **argp;
 {
-	extern char *sprintf();
 	struct stat sbuf;
 	register sncol;
 	register char *sheader;
@@ -236,10 +235,10 @@ char **argp;
 				/* Assume a ff takes two blank lines at the
 				   top of the page. */
 				line = 2;
-				sprintf(linebuf, "%s %s  %s Page %d\n\n\n",
+				(void)sprintf(linebuf, "%s %s  %s Page %d\n\n\n",
 					cbuf+4, cbuf+20, header, page);
 			} else
-				sprintf(linebuf, "\n\n%s %s  %s Page %d\n\n\n",
+				(void)sprintf(linebuf, "\n\n%s %s  %s Page %d\n\n\n",
 					cbuf+4, cbuf+20, header, page);
 			for(cp=linebuf;*cp;) put(*cp++);
 		}
diff --git a/usr/src/old/tar/tar.c b/usr/src/old/tar/tar.c
index a3fd15afde..e43690e7fe 100644
--- a/usr/src/old/tar/tar.c
+++ b/usr/src/old/tar/tar.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)tar.c	5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)tar.c	5.10 (Berkeley) %G%";
 #endif not lint
 
 /*
@@ -107,7 +107,6 @@ char	*malloc();
 long	time();
 off_t	lseek();
 char	*mktemp();
-char	*sprintf();
 char	*strcat();
 char	*strcpy();
 char	*rindex();
@@ -337,7 +336,7 @@ dorep(argv)
 		if (tfile != NULL) {
 			char buf[200];
 
-			sprintf(buf,
+			(void)sprintf(buf,
 "sort +0 -1 +1nr %s -o %s; awk '$1 != prev {print; prev=$1}' %s >%sX; mv %sX %s",
 				tname, tname, tname, tname, tname, tname);
 			fflush(tfile);
@@ -494,10 +493,10 @@ putfile(longname, shortname, parent)
 			stbuf.st_size = 0;
 			tomodes(&stbuf);
 			strcpy(dblock.dbuf.name,buf);
-			sprintf(dblock.dbuf.chksum, "%6o", checksum());
+			(void)sprintf(dblock.dbuf.chksum, "%6o", checksum());
 			(void) writetape((char *)&dblock);
 		}
-		sprintf(newparent, "%s/%s", parent, shortname);
+		(void)sprintf(newparent, "%s/%s", parent, shortname);
 		if (chdir(shortname) < 0) {
 			perror(shortname);
 			return;
@@ -553,8 +552,8 @@ putfile(longname, shortname, parent)
 		if (vflag)
 			fprintf(vfile, "a %s symbolic link to %s\n",
 			    longname, dblock.dbuf.linkname);
-		sprintf(dblock.dbuf.size, "%11lo", 0L);
-		sprintf(dblock.dbuf.chksum, "%6o", checksum());
+		(void)sprintf(dblock.dbuf.size, "%11lo", 0L);
+		(void)sprintf(dblock.dbuf.chksum, "%6o", checksum());
 		(void) writetape((char *)&dblock);
 		break;
 
@@ -585,7 +584,7 @@ putfile(longname, shortname, parent)
 			if (found) {
 				strcpy(dblock.dbuf.linkname, lp->pathname);
 				dblock.dbuf.linkflag = '1';
-				sprintf(dblock.dbuf.chksum, "%6o", checksum());
+				(void)sprintf(dblock.dbuf.chksum, "%6o", checksum());
 				(void) writetape( (char *) &dblock);
 				if (vflag)
 					fprintf(vfile, "a %s link to %s\n",
@@ -607,7 +606,7 @@ putfile(longname, shortname, parent)
 		blocks = (stbuf.st_size + (TBLOCK-1)) / TBLOCK;
 		if (vflag)
 			fprintf(vfile, "a %s %ld blocks\n", longname, blocks);
-		sprintf(dblock.dbuf.chksum, "%6o", checksum());
+		(void)sprintf(dblock.dbuf.chksum, "%6o", checksum());
 		hint = writetape((char *)&dblock);
 		maxread = max(stbuf.st_blksize, (nblock * TBLOCK));
 		if ((bigbuf = malloc((unsigned)maxread)) == 0) {
@@ -934,11 +933,11 @@ register struct stat *sp;
 
 	for (cp = dblock.dummy; cp < &dblock.dummy[TBLOCK]; cp++)
 		*cp = '\0';
-	sprintf(dblock.dbuf.mode, "%6o ", sp->st_mode & 07777);
-	sprintf(dblock.dbuf.uid, "%6o ", sp->st_uid);
-	sprintf(dblock.dbuf.gid, "%6o ", sp->st_gid);
-	sprintf(dblock.dbuf.size, "%11lo ", sp->st_size);
-	sprintf(dblock.dbuf.mtime, "%11lo ", sp->st_mtime);
+	(void)sprintf(dblock.dbuf.mode, "%6o ", sp->st_mode & 07777);
+	(void)sprintf(dblock.dbuf.uid, "%6o ", sp->st_uid);
+	(void)sprintf(dblock.dbuf.gid, "%6o ", sp->st_gid);
+	(void)sprintf(dblock.dbuf.size, "%11lo ", sp->st_size);
+	(void)sprintf(dblock.dbuf.mtime, "%11lo ", sp->st_mtime);
 }
 
 checksum()
diff --git a/usr/src/usr.bin/ar/ar.c b/usr/src/usr.bin/ar/ar.c
index 076fbd916c..796289c553 100644
--- a/usr/src/usr.bin/ar/ar.c
+++ b/usr/src/usr.bin/ar/ar.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ar.c	5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)ar.c	5.3 (Berkeley) %G%";
 #endif not lint
 
 #ifndef lint
@@ -515,7 +515,7 @@ movefil(f)
 {
 	char buf[sizeof(arbuf)+1];
 
-	sprintf(buf, "%-16s%-12ld%-6u%-6u%-8o%-10ld%-2s",
+	(void)sprintf(buf, "%-16s%-12ld%-6u%-6u%-8o%-10ld%-2s",
 	   trim(file),
 	   stbuf.st_mtime,
 	   (u_short)stbuf.st_uid,
diff --git a/usr/src/usr.bin/diff/diff/diffdir.c b/usr/src/usr.bin/diff/diff/diffdir.c
index 3543a4cb58..ac550f4f15 100644
--- a/usr/src/usr.bin/diff/diff/diffdir.c
+++ b/usr/src/usr.bin/diff/diff/diffdir.c
@@ -1,4 +1,4 @@
-static	char *sccsid = "@(#)diffdir.c	4.10 (Berkeley) %G%";
+static	char *sccsid = "@(#)diffdir.c	4.11 (Berkeley) %G%";
 
 #include "diff.h"
 /*
@@ -326,7 +326,7 @@ calldiff(wantpr)
 	prargs[2] = wantpr;
 	fflush(stdout);
 	if (wantpr) {
-		sprintf(etitle, "%s %s", file1, file2);
+		(void)sprintf(etitle, "%s %s", file1, file2);
 		pipe(pv);
 		pid = fork();
 		if (pid == -1) {
diff --git a/usr/src/usr.bin/diff/diff/diffreg.c b/usr/src/usr.bin/diff/diff/diffreg.c
index a89349b58e..926e3774d4 100644
--- a/usr/src/usr.bin/diff/diff/diffreg.c
+++ b/usr/src/usr.bin/diff/diff/diffreg.c
@@ -1,4 +1,4 @@
-static	char sccsid[] = "@(#)diffreg.c 4.16 %G%";
+static	char sccsid[] = "@(#)diffreg.c 4.17 %G%";
 
 #include "diff.h"
 /*
@@ -305,7 +305,7 @@ splice(dir, file)
 		tail = file;
 	else
 		tail++;
-	sprintf(buf, "%s/%s", dir, tail);
+	(void)sprintf(buf, "%s/%s", dir, tail);
 	return (savestr(buf));
 }
 
diff --git a/usr/src/usr.bin/du/du.c b/usr/src/usr.bin/du/du.c
index d636e1b682..30019febce 100644
--- a/usr/src/usr.bin/du/du.c
+++ b/usr/src/usr.bin/du/du.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *sccsid = "@(#)du.c	4.11 (Berkeley) %G%";
+static char *sccsid = "@(#)du.c	4.12 (Berkeley) %G%";
 #endif
 
 #include <stdio.h>
@@ -20,7 +20,7 @@ struct {
 int	mlx;
 
 long	descend();
-char	*index(), *rindex(), *strcpy(), *sprintf();
+char	*index(), *rindex(), *strcpy();
 
 #define	kb(n)	(howmany(dbtob(n), 1024))
 
diff --git a/usr/src/usr.bin/wall/wall.c b/usr/src/usr.bin/wall/wall.c
index 06c4cf4df0..a9e805f399 100644
--- a/usr/src/usr.bin/wall/wall.c
+++ b/usr/src/usr.bin/wall/wall.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "@(#)wall.c	5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)wall.c	5.4 (Berkeley) %G%";
 #endif not lint
 
 /*
@@ -69,7 +69,7 @@ char *argv[];
 	c /= sizeof(struct utmp);
 	if (sline)
 		strncpy(who, utmp[sline].ut_name, sizeof(utmp[sline].ut_name));
-	sprintf(mesg,
+	(void)sprintf(mesg,
 	    "\n\007\007Broadcast Message from %s@%s (%.*s) at %d:%02d ...\r\n\n"
 		, who
 		, hostname
-- 
2.20.1