Module Name: src
Committed By: christos
Date: Fri Oct 18 20:47:07 UTC 2013
Modified Files:
src/usr.bin/audio/common: wav.c
src/usr.bin/cksum: cksum.c
src/usr.bin/deroff: deroff.c
src/usr.bin/fgen: fgen.l
src/usr.bin/lock: lock.c
src/usr.bin/login: login_pam.c
src/usr.bin/mail: mime_attach.c
src/usr.bin/make: parse.c
src/usr.bin/msgs: msgs.c
src/usr.bin/sdpquery: print.c
src/usr.bin/sort: init.c
src/usr.bin/systat: bufcache.c
src/usr.bin/tail: forward.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/audio/common/wav.c
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/cksum/cksum.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/deroff/deroff.c
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/fgen/fgen.l
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/lock/lock.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/login/login_pam.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/mail/mime_attach.c
cvs rdiff -u -r1.191 -r1.192 src/usr.bin/make/parse.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/msgs/msgs.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/sdpquery/print.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/sort/init.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/systat/bufcache.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/tail/forward.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audio/common/wav.c
diff -u src/usr.bin/audio/common/wav.c:1.11 src/usr.bin/audio/common/wav.c:1.12
--- src/usr.bin/audio/common/wav.c:1.11 Fri Aug 30 16:57:26 2013
+++ src/usr.bin/audio/common/wav.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.11 2013/08/30 20:57:26 mrg Exp $ */
+/* $NetBSD: wav.c,v 1.12 2013/10/18 20:47:06 christos Exp $ */
/*
* Copyright (c) 2002, 2009 Matthew R. Green
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.11 2013/08/30 20:57:26 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.12 2013/10/18 20:47:06 christos Exp $");
#endif
@@ -261,7 +261,7 @@ wav_prepare_header(struct write_info *wi
*fact = "fact",
*data = "data";
u_int32_t filelen, fmtsz, sps, abps, factsz = 4, nsample, datalen;
- u_int16_t fmttag, nchan, align, bps, extln = 0;
+ u_int16_t fmttag, nchan, align, extln = 0;
if (wi->header_info)
warnx("header information not supported for WAV");
@@ -269,13 +269,10 @@ wav_prepare_header(struct write_info *wi
switch (wi->precision) {
case 8:
- bps = 8;
break;
case 16:
- bps = 16;
break;
case 32:
- bps = 32;
break;
default:
{
Index: src/usr.bin/cksum/cksum.c
diff -u src/usr.bin/cksum/cksum.c:1.45 src/usr.bin/cksum/cksum.c:1.46
--- src/usr.bin/cksum/cksum.c:1.45 Mon Aug 29 10:12:29 2011
+++ src/usr.bin/cksum/cksum.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cksum.c,v 1.45 2011/08/29 14:12:29 joerg Exp $ */
+/* $NetBSD: cksum.c,v 1.46 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: cksum.c,v 1.45 2011/08/29 14:12:29 joerg Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.46 2013/10/18 20:47:06 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -149,7 +149,7 @@ __dead static void usage(void);
int
main(int argc, char **argv)
{
- int ch, fd, rval, dosum, pflag, nohashstdin;
+ int ch, fd, rval, pflag, nohashstdin;
u_int32_t val;
off_t len;
char *fn;
@@ -161,7 +161,7 @@ main(int argc, char **argv)
cfncn = NULL;
pfncn = NULL;
- dosum = pflag = nohashstdin = 0;
+ pflag = nohashstdin = 0;
normal = 0;
check_warn = 0;
do_check = 0;
@@ -178,7 +178,6 @@ main(int argc, char **argv)
hash = NULL;
if (!strcmp(progname, "sum")) {
- dosum = 1;
cfncn = csum1;
pfncn = psum1;
} else {
Index: src/usr.bin/deroff/deroff.c
diff -u src/usr.bin/deroff/deroff.c:1.10 src/usr.bin/deroff/deroff.c:1.11
--- src/usr.bin/deroff/deroff.c:1.10 Fri Sep 13 16:51:20 2013
+++ src/usr.bin/deroff/deroff.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: deroff.c,v 1.10 2013/09/13 20:51:20 joerg Exp $ */
+/* $NetBSD: deroff.c,v 1.11 2013/10/18 20:47:06 christos Exp $ */
/* taken from: OpenBSD: deroff.c,v 1.6 2004/06/02 14:58:46 tom Exp */
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: deroff.c,v 1.10 2013/09/13 20:51:20 joerg Exp $");
+__RCSID("$NetBSD: deroff.c,v 1.11 2013/10/18 20:47:06 christos Exp $");
#include <err.h>
#include <limits.h>
@@ -166,7 +166,7 @@ typedef int pacmac; /* compressed macro
static int argconcat = 0; /* concat arguments together (-me only) */
#define tomac(c1, c2) ((((c1) & 0xFF) << 8) | ((c2) & 0xFF))
-#define frommac(src, c1, c2) (((c1)=((src)>>8)&0xFF),((c2) =(src)&0xFF))
+#define frommac(src, c1, c2) (((c1)=((src)>>8)&0xFF),((c2) =(src)&0xFF), __USE(c1), __USE(c2))
struct mactab {
int condition;
Index: src/usr.bin/fgen/fgen.l
diff -u src/usr.bin/fgen/fgen.l:1.35 src/usr.bin/fgen/fgen.l:1.36
--- src/usr.bin/fgen/fgen.l:1.35 Thu Sep 1 09:44:25 2011
+++ src/usr.bin/fgen/fgen.l Fri Oct 18 16:47:06 2013
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: fgen.l,v 1.35 2011/09/01 13:44:25 joerg Exp $ */
+/* $NetBSD: fgen.l,v 1.36 2013/10/18 20:47:06 christos Exp $ */
/* FLEX input for FORTH input file scanner */
/*
* Copyright (c) 1998 Eduardo Horvath.
@@ -42,7 +42,7 @@
#endif
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: fgen.l,v 1.35 2011/09/01 13:44:25 joerg Exp $");
+__RCSID("$NetBSD: fgen.l,v 1.36 2013/10/18 20:47:06 christos Exp $");
#endif
%}
@@ -996,7 +996,7 @@ usage(const char *me)
int
main(int argc, char *argv[])
{
- int bflag, ch;
+ int ch;
FILE *inf;
struct fcode_header *fheader;
YY_BUFFER_STATE inbuf;
@@ -1006,7 +1006,6 @@ main(int argc, char *argv[])
outf = 1; /* stdout */
myname = argv[0];
- bflag = 0;
while ((ch = getopt(argc, argv, "d:o:")) != -1)
switch(ch) {
case 'd':
Index: src/usr.bin/lock/lock.c
diff -u src/usr.bin/lock/lock.c:1.32 src/usr.bin/lock/lock.c:1.33
--- src/usr.bin/lock/lock.c:1.32 Tue Mar 20 16:34:58 2012
+++ src/usr.bin/lock/lock.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.c,v 1.32 2012/03/20 20:34:58 matt Exp $ */
+/* $NetBSD: lock.c,v 1.33 2013/10/18 20:47:06 christos Exp $ */
/*
* Copyright (c) 1980, 1987, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: lock.c,v 1.32 2012/03/20 20:34:58 matt Exp $");
+__RCSID("$NetBSD: lock.c,v 1.33 2013/10/18 20:47:06 christos Exp $");
#endif /* not lint */
/*
@@ -105,7 +105,7 @@ main(int argc, char **argv)
time_t curtime;
int ch, usemine;
long sectimeout;
- char *ap, *mypw, *ttynam;
+ char *ap, *ttynam;
const char *tzn;
uid_t uid = getuid();
char hostname[MAXHOSTNAMELEN + 1], s[BUFSIZ], s1[BUFSIZ];
@@ -113,6 +113,8 @@ main(int argc, char **argv)
pam_handle_t *pamh = NULL;
static const struct pam_conv pamc = { &openpam_ttyconv, NULL };
int pam_err;
+#else
+ char *mypw = NULL;
#endif
if ((pw = getpwuid(getuid())) == NULL)
@@ -120,7 +122,6 @@ main(int argc, char **argv)
notimeout = 0;
sectimeout = TIMEOUT;
- mypw = NULL;
usemine = 0;
while ((ch = getopt(argc, argv, "npt:")) != -1)
@@ -210,7 +211,9 @@ main(int argc, char **argv)
exit(1);
}
s[0] = '\0';
+#ifndef USE_PAM
mypw = s1;
+#endif
}
#ifdef USE_PAM
if (usemine) {
Index: src/usr.bin/login/login_pam.c
diff -u src/usr.bin/login/login_pam.c:1.22 src/usr.bin/login/login_pam.c:1.23
--- src/usr.bin/login/login_pam.c:1.22 Mon Apr 23 05:27:36 2012
+++ src/usr.bin/login/login_pam.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: login_pam.c,v 1.22 2012/04/23 09:27:36 martin Exp $ */
+/* $NetBSD: login_pam.c,v 1.23 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: login_pam.c,v 1.22 2012/04/23 09:27:36 martin Exp $");
+__RCSID("$NetBSD: login_pam.c,v 1.23 2013/10/18 20:47:06 christos Exp $");
#endif /* not lint */
/*
@@ -107,10 +107,9 @@ main(int argc, char *argv[])
uid_t uid, saved_uid;
gid_t saved_gid, saved_gids[NGROUPS_MAX];
int nsaved_gids;
- char *domain, *p, *ttyn, *pwprompt;
+ char *domain, *p, *ttyn;
char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
char localhost[MAXHOSTNAMELEN + 1];
- int need_chpass, require_chpass;
int login_retries = DEFAULT_RETRIES,
login_backoff = DEFAULT_BACKOFF;
char *shell = NULL;
@@ -126,9 +125,7 @@ main(int argc, char *argv[])
char **pamenv;
tbuf[0] = '\0';
- pwprompt = NULL;
nested = NULL;
- need_chpass = require_chpass = 0;
oabrt = signal(SIGABRT, SIG_IGN);
oalrm = signal(SIGALRM, timedout);
Index: src/usr.bin/mail/mime_attach.c
diff -u src/usr.bin/mail/mime_attach.c:1.16 src/usr.bin/mail/mime_attach.c:1.17
--- src/usr.bin/mail/mime_attach.c:1.16 Thu Jan 3 20:54:55 2013
+++ src/usr.bin/mail/mime_attach.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_attach.c,v 1.16 2013/01/04 01:54:55 christos Exp $ */
+/* $NetBSD: mime_attach.c,v 1.17 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef __lint__
-__RCSID("$NetBSD: mime_attach.c,v 1.16 2013/01/04 01:54:55 christos Exp $");
+__RCSID("$NetBSD: mime_attach.c,v 1.17 2013/10/18 20:47:06 christos Exp $");
#endif /* not __lint__ */
#include <assert.h>
@@ -230,14 +230,11 @@ content_encoding_core(void *fh, const ch
#define MAILMSG_8BIT 0x4
#define MAILMSG_LONGL 0x8
int c, lastc, state;
- int ctrlchar, endwhite;
size_t curlen, maxlen;
state = MAILMSG_CLEAN;
curlen = 0;
maxlen = line_limit();
- ctrlchar = 0;
- endwhite = 0;
lastc = EOF;
while ((c = fgetc(fh)) != EOF) {
curlen++;
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.191 src/usr.bin/make/parse.c:1.192
--- src/usr.bin/make/parse.c:1.191 Wed Aug 28 17:56:49 2013
+++ src/usr.bin/make/parse.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $ */
+/* $NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -1206,9 +1206,8 @@ ParseDoDependency(char *line)
*/
int length;
void *freeIt;
- char *result;
- result = Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt);
+ (void)Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt);
if (freeIt)
free(freeIt);
cp += length-1;
Index: src/usr.bin/msgs/msgs.c
diff -u src/usr.bin/msgs/msgs.c:1.22 src/usr.bin/msgs/msgs.c:1.23
--- src/usr.bin/msgs/msgs.c:1.22 Tue Mar 20 16:34:58 2012
+++ src/usr.bin/msgs/msgs.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msgs.c,v 1.22 2012/03/20 20:34:58 matt Exp $ */
+/* $NetBSD: msgs.c,v 1.23 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: msgs.c,v 1.22 2012/03/20 20:34:58 matt Exp $");
+__RCSID("$NetBSD: msgs.c,v 1.23 2013/10/18 20:47:06 christos Exp $");
#endif
#endif /* not lint */
@@ -143,7 +143,7 @@ void ask(const char *);
void gfrsub(FILE *);
int linecnt(FILE *);
int main(int, char *[]);
-int next(char *);
+int next(char *, size_t);
char *nxtfld(char *);
void onintr(int);
void onsusp(int);
@@ -578,7 +578,8 @@ cmnd:
break;
}
if (isdigit((unsigned char)*in)) {
- msg = next(in);
+ msg = next(in, sizeof(inbuf) -
+ (in - inbuf));
sep = in;
break;
}
@@ -726,11 +727,11 @@ linecnt(FILE *f)
}
int
-next(char *buf)
+next(char *buf, size_t bufsiz)
{
int i;
sscanf(buf, "%d", &i);
- snprintf(buf, sizeof (buf), "Goto %d", i);
+ snprintf(buf, bufsiz, "Goto %d", i);
return(--i);
}
Index: src/usr.bin/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.19 src/usr.bin/sdpquery/print.c:1.20
--- src/usr.bin/sdpquery/print.c:1.19 Thu Sep 15 13:52:53 2011
+++ src/usr.bin/sdpquery/print.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.19 2011/09/15 17:52:53 plunky Exp $ */
+/* $NetBSD: print.c,v 1.20 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: print.c,v 1.19 2011/09/15 17:52:53 plunky Exp $");
+__RCSID("$NetBSD: print.c,v 1.20 2013/10/18 20:47:06 christos Exp $");
#include <ctype.h>
#include <iconv.h>
@@ -833,7 +833,7 @@ print_codeset_string(const char *src, si
{
char buf[50], *dst;
iconv_t ih;
- size_t n, dstlen;
+ size_t dstlen;
dst = buf;
dstlen = sizeof(buf);
@@ -844,7 +844,7 @@ print_codeset_string(const char *src, si
return;
}
- n = iconv(ih, &src, &srclen, &dst, &dstlen);
+ (void)iconv(ih, &src, &srclen, &dst, &dstlen);
iconv_close(ih);
Index: src/usr.bin/sort/init.c
diff -u src/usr.bin/sort/init.c:1.28 src/usr.bin/sort/init.c:1.29
--- src/usr.bin/sort/init.c:1.28 Sat Dec 18 18:09:48 2010
+++ src/usr.bin/sort/init.c Fri Oct 18 16:47:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.28 2010/12/18 23:09:48 christos Exp $ */
+/* $NetBSD: init.c,v 1.29 2013/10/18 20:47:06 christos Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include "sort.h"
-__RCSID("$NetBSD: init.c,v 1.28 2010/12/18 23:09:48 christos Exp $");
+__RCSID("$NetBSD: init.c,v 1.29 2013/10/18 20:47:06 christos Exp $");
#include <ctype.h>
#include <string.h>
@@ -287,7 +287,6 @@ fixit(int *argc, char **argv, const char
int i, j, sawplus;
char *vpos, *tpos, spec[20];
int col, indent;
- size_t sz;
sawplus = 0;
for (i = 1; i < *argc; i++) {
@@ -358,7 +357,7 @@ fixit(int *argc, char **argv, const char
}
/* make the new style spec */
- sz = snprintf(spec, sizeof(spec), "%d.%d%s", col, indent,
+ (void)snprintf(spec, sizeof(spec), "%d.%d%s", col, indent,
tpos);
if (sawplus) {
Index: src/usr.bin/systat/bufcache.c
diff -u src/usr.bin/systat/bufcache.c:1.25 src/usr.bin/systat/bufcache.c:1.26
--- src/usr.bin/systat/bufcache.c:1.25 Fri Nov 23 10:35:57 2012
+++ src/usr.bin/systat/bufcache.c Fri Oct 18 16:47:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.25 2012/11/23 15:35:57 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.26 2013/10/18 20:47:07 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: bufcache.c,v 1.25 2012/11/23 15:35:57 christos Exp $");
+__RCSID("$NetBSD: bufcache.c,v 1.26 2013/10/18 20:47:07 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -245,7 +245,6 @@ fetchbufcache(void)
int count;
struct buf_sysctl *bp, *buffers;
struct vnode *vn;
- struct mount *mt;
struct ml_entry *ml;
int mib[6];
size_t size;
@@ -315,8 +314,7 @@ again:
mp = sd.sd_mountpoint;
}
if (mp != NULL)
- mt = ml_lookup(mp,
- bp->b_bufsize,
+ (void)ml_lookup(mp, bp->b_bufsize,
bp->b_bcount);
}
}
Index: src/usr.bin/tail/forward.c
diff -u src/usr.bin/tail/forward.c:1.31 src/usr.bin/tail/forward.c:1.32
--- src/usr.bin/tail/forward.c:1.31 Sat Sep 3 06:59:10 2011
+++ src/usr.bin/tail/forward.c Fri Oct 18 16:47:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: forward.c,v 1.31 2011/09/03 10:59:10 christos Exp $ */
+/* $NetBSD: forward.c,v 1.32 2013/10/18 20:47:07 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: forward.c,v 1.31 2011/09/03 10:59:10 christos Exp $");
+__RCSID("$NetBSD: forward.c,v 1.32 2013/10/18 20:47:07 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -90,14 +90,8 @@ forward(FILE *fp, enum STYLE style, off_
int ch, n;
int kq=-1, action=USE_SLEEP;
struct stat statbuf;
- dev_t lastdev;
- ino_t lastino;
struct kevent ev[2];
- /* Keep track of file's previous incarnation. */
- lastdev = sbp->st_dev;
- lastino = sbp->st_ino;
-
switch(style) {
case FBYTES:
if (off == 0)
