Module Name: src
Committed By: christos
Date: Sat Oct 19 17:45:01 UTC 2013
Modified Files:
src/tests/fs/nfs/nfsservice: mountd.c nfsd.c
src/tests/fs/nfs/nfsservice/rpcbind: pmap_svc.c rpcbind.c
src/tests/fs/puffs: t_basic.c
src/tests/fs/puffs/h_dtfs: dtfs_subr.c dtfs_vnops.c
src/tests/fs/vfs: t_vnops.c
src/tests/include/sys: t_socket.c
src/tests/kernel: t_lockf.c
src/tests/lib/libc/gen: t_dir.c
src/tests/lib/libc/stdio: t_fmemopen.c
src/tests/lib/libpthread: t_cond.c t_sigmask.c
src/tests/net/net: t_pktinfo.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/nfs/nfsservice/mountd.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/nfs/nfsservice/nfsd.c
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/puffs/t_basic.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/puffs/h_dtfs/dtfs_subr.c
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/puffs/h_dtfs/dtfs_vnops.c
cvs rdiff -u -r1.37 -r1.38 src/tests/fs/vfs/t_vnops.c
cvs rdiff -u -r1.2 -r1.3 src/tests/include/sys/t_socket.c
cvs rdiff -u -r1.8 -r1.9 src/tests/kernel/t_lockf.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/t_dir.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/stdio/t_fmemopen.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libpthread/t_cond.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libpthread/t_sigmask.c
cvs rdiff -u -r1.1 -r1.2 src/tests/net/net/t_pktinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/nfsservice/mountd.c
diff -u src/tests/fs/nfs/nfsservice/mountd.c:1.7 src/tests/fs/nfs/nfsservice/mountd.c:1.8
--- src/tests/fs/nfs/nfsservice/mountd.c:1.7 Sun Jan 22 13:36:17 2012
+++ src/tests/fs/nfs/nfsservice/mountd.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.7 2012/01/22 18:36:17 christos Exp $ */
+/* $NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.7 2012/01/22 18:36:17 christos Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $");
#endif
#endif /* not lint */
@@ -497,7 +497,6 @@ mntsrv(rqstp, transp)
struct fhreturn fhr;
struct stat stb;
struct statvfs fsb;
- struct addrinfo *ai;
char host[NI_MAXHOST], numerichost[NI_MAXHOST];
int lookup_failed = 1;
struct sockaddr *saddr;
@@ -532,7 +531,6 @@ mntsrv(rqstp, transp)
if (getnameinfo(saddr, saddr->sa_len, numerichost,
sizeof numerichost, NULL, 0, ninumeric) != 0)
strlcpy(numerichost, "?", sizeof(numerichost));
- ai = NULL;
ret = 0;
switch (rqstp->rq_proc) {
case NULLPROC:
Index: src/tests/fs/nfs/nfsservice/nfsd.c
diff -u src/tests/fs/nfs/nfsservice/nfsd.c:1.3 src/tests/fs/nfs/nfsservice/nfsd.c:1.4
--- src/tests/fs/nfs/nfsservice/nfsd.c:1.3 Wed Jul 28 11:12:17 2010
+++ src/tests/fs/nfs/nfsservice/nfsd.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsd.c,v 1.3 2010/07/28 15:12:17 pooka Exp $ */
+/* $NetBSD: nfsd.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95";
#else
-__RCSID("$NetBSD: nfsd.c,v 1.3 2010/07/28 15:12:17 pooka Exp $");
+__RCSID("$NetBSD: nfsd.c,v 1.4 2013/10/19 17:45:00 christos Exp $");
#endif
#endif /* not lint */
@@ -149,18 +149,17 @@ nfsd_main(argc, argv)
struct sockaddr_in inetpeer;
struct pollfd set[4];
socklen_t len;
- int ch, cltpflag, connect_type_cnt, i, maxsock, msgsock;
+ int ch, connect_type_cnt, i, msgsock;
int nfsdcnt, on = 1, reregister, sock, tcpflag, tcpsock;
int tcp6sock, ip6flag;
- int tp4cnt, tp4flag, tpipcnt, tpipflag, udpflag, ecode, s;
+ int tp4cnt, tp4flag, tpipcnt, udpflag, ecode, s;
int error = 0;
#define DEFNFSDCNT 4
nfsdcnt = DEFNFSDCNT;
- cltpflag = reregister = tcpflag = tp4cnt = tp4flag = tpipcnt = 0;
- tpipflag = udpflag = ip6flag = 0;
+ reregister = tcpflag = tp4cnt = tp4flag = tpipcnt = 0;
+ udpflag = ip6flag = 0;
nconf_udp = nconf_tcp = nconf_udp6 = nconf_tcp6 = NULL;
- maxsock = 0;
tcpsock = tcp6sock = -1;
#define GETOPT "6n:rtu"
#define USAGE "[-rtu] [-n num_servers]"
Index: src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c:1.1 src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c:1.2
--- src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c:1.1 Mon Jul 26 11:53:00 2010
+++ src/tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_svc.c,v 1.1 2010/07/26 15:53:00 pooka Exp $ */
+/* $NetBSD: pmap_svc.c,v 1.2 2013/10/19 17:45:00 christos Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -170,7 +170,6 @@ pmapproc_change(struct svc_req *rqstp, S
struct pmap reg;
RPCB rpcbreg;
long ans;
- struct sockaddr_in *who;
struct sockcred *sc;
char uidbuf[32];
@@ -191,7 +190,7 @@ pmapproc_change(struct svc_req *rqstp, S
return FALSE;
}
- who = svc_getcaller(xprt);
+ (void)svc_getcaller(xprt);
sc = __svc_getcallercreds(xprt);
/*
Index: src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.3 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.4
--- src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.3 Fri Sep 16 12:13:18 2011
+++ src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcbind.c,v 1.3 2011/09/16 16:13:18 plunky Exp $ */
+/* $NetBSD: rpcbind.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -233,9 +233,7 @@ init_transport(struct netconfig *nconf)
struct addrinfo hints, *res = NULL;
struct __rpc_sockinfo si;
SVCXPRT *my_xprt;
- int status; /* bound checking ? */
- int aicode;
- int addrlen;
+ int aicode, status, addrlen;
struct sockaddr *sa;
struct sockaddr_un sun;
const int one = 1;
@@ -480,6 +478,8 @@ init_transport(struct netconfig *nconf)
nconf->nc_netid);
}
}
+#else
+ __USE(status);
#endif
/*
* rmtcall only supported on CLTS transports for now.
Index: src/tests/fs/puffs/t_basic.c
diff -u src/tests/fs/puffs/t_basic.c:1.11 src/tests/fs/puffs/t_basic.c:1.12
--- src/tests/fs/puffs/t_basic.c:1.11 Mon Apr 4 11:42:42 2011
+++ src/tests/fs/puffs/t_basic.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.11 2011/04/04 15:42:42 plunky Exp $ */
+/* $NetBSD: t_basic.c,v 1.12 2013/10/19 17:45:00 christos Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -115,13 +115,11 @@ ATF_TC_HEAD(root_lnk, tc)
ATF_TC_BODY(root_lnk, tc)
{
MAKEOPTS("-r", "lnk " LINKSTR);
- struct puffstestargs *pargs;
void *args;
char buf[PATH_MAX];
ssize_t len;
FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
- pargs = args;
if ((len = rump_sys_readlink(FSTEST_MNTNAME, buf, sizeof(buf)-1)) == -1)
atf_tc_fail_errno("readlink");
Index: src/tests/fs/puffs/h_dtfs/dtfs_subr.c
diff -u src/tests/fs/puffs/h_dtfs/dtfs_subr.c:1.3 src/tests/fs/puffs/h_dtfs/dtfs_subr.c:1.4
--- src/tests/fs/puffs/h_dtfs/dtfs_subr.c:1.3 Tue Mar 1 10:19:49 2011
+++ src/tests/fs/puffs/h_dtfs/dtfs_subr.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dtfs_subr.c,v 1.3 2011/03/01 15:19:49 pooka Exp $ */
+/* $NetBSD: dtfs_subr.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -81,7 +81,7 @@ struct puffs_node *
dtfs_genfile(struct puffs_node *dir, const struct puffs_cn *pcn,
enum vtype type)
{
- struct dtfs_file *df_dir, *dff;
+ struct dtfs_file *dff;
struct dtfs_dirent *dfd;
struct dtfs_mount *dtm;
struct puffs_node *newpn;
@@ -107,7 +107,6 @@ dtfs_genfile(struct puffs_node *dir, con
errx(1, "getnewpnode");
dtfs_baseattrs(&newpn->pn_va, type, dtm->dtm_nextfileid++);
- df_dir = dir->pn_data;
dfd = emalloc(sizeof(struct dtfs_dirent));
dfd->dfd_node = newpn;
dfd->dfd_name = estrndup(pcn->pcn_name, pcn->pcn_namelen);
Index: src/tests/fs/puffs/h_dtfs/dtfs_vnops.c
diff -u src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.9 src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.10
--- src/tests/fs/puffs/h_dtfs/dtfs_vnops.c:1.9 Tue Jan 31 13:56:07 2012
+++ src/tests/fs/puffs/h_dtfs/dtfs_vnops.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dtfs_vnops.c,v 1.9 2012/01/31 18:56:07 njoly Exp $ */
+/* $NetBSD: dtfs_vnops.c,v 1.10 2013/10/19 17:45:00 christos Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -430,7 +430,6 @@ dtfs_node_mknod(struct puffs_usermount *
{
struct puffs_node *pn_parent = opc;
struct puffs_node *pn_new;
- struct dtfs_file *df;
if (!(va->va_type == VBLK || va->va_type == VCHR
|| va->va_type == VFIFO))
@@ -439,7 +438,6 @@ dtfs_node_mknod(struct puffs_usermount *
pn_new = dtfs_genfile(pn_parent, pcn, va->va_type);
puffs_setvattr(&pn_new->pn_va, va);
- df = DTFS_PTOF(pn_new);
puffs_newinfo_setcookie(pni, pn_new);
return 0;
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.37 src/tests/fs/vfs/t_vnops.c:1.38
--- src/tests/fs/vfs/t_vnops.c:1.37 Sun Jul 28 05:03:43 2013
+++ src/tests/fs/vfs/t_vnops.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.37 2013/07/28 09:03:43 njoly Exp $ */
+/* $NetBSD: t_vnops.c,v 1.38 2013/10/19 17:45:00 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -333,7 +333,7 @@ rename_reg_nodir(const atf_tc_t *tc, con
{
bool haslinks;
struct stat sb;
- ino_t f1ino, f2ino;
+ ino_t f1ino;
if (FSTYPE_RUMPFS(tc))
atf_tc_skip("rename not supported by file system");
@@ -366,7 +366,6 @@ rename_reg_nodir(const atf_tc_t *tc, con
if (rump_sys_stat("file2", &sb) == -1)
atf_tc_fail_errno("stat");
- f2ino = sb.st_ino;
if (rump_sys_rename("file1", "file3") == -1)
atf_tc_fail_errno("rename 1");
Index: src/tests/include/sys/t_socket.c
diff -u src/tests/include/sys/t_socket.c:1.2 src/tests/include/sys/t_socket.c:1.3
--- src/tests/include/sys/t_socket.c:1.2 Thu Sep 5 08:22:10 2013
+++ src/tests/include/sys/t_socket.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_socket.c,v 1.2 2013/09/05 12:22:10 pooka Exp $ */
+/* $NetBSD: t_socket.c,v 1.3 2013/10/19 17:45:00 christos Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -83,7 +83,7 @@ ATF_TC_BODY(cmsg_sendfd, tc)
struct cmsghdr *cmp;
struct msghdr msg;
struct sockaddr_un sun;
- struct lwp *l1, *l2;
+ struct lwp *l1;
struct iovec iov;
socklen_t sl;
int s1, s2, sgot;
@@ -109,7 +109,7 @@ ATF_TC_BODY(cmsg_sendfd, tc)
/* create second process for test */
RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
- l2 = rump_pub_lwproc_curlwp();
+ (void)rump_pub_lwproc_curlwp();
/* connect to unix domain socket */
memset(&sun, 0, sizeof(sun));
Index: src/tests/kernel/t_lockf.c
diff -u src/tests/kernel/t_lockf.c:1.8 src/tests/kernel/t_lockf.c:1.9
--- src/tests/kernel/t_lockf.c:1.8 Tue Feb 19 21:22:48 2013
+++ src/tests/kernel/t_lockf.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_lockf.c,v 1.8 2013/02/20 02:22:48 pgoyette Exp $ */
+/* $NetBSD: t_lockf.c,v 1.9 2013/10/19 17:45:00 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@ random_uint32(void)
static void
trylocks(int id)
{
- int i, ret, fd;
+ int i, fd;
srand48(getpid());
@@ -99,7 +99,7 @@ trylocks(int id)
}
fl.l_whence = SEEK_SET;
- ret = fcntl(fd, F_SETLKW, &fl);
+ (void)fcntl(fd, F_SETLKW, &fl);
if (usleep(sleeptime) < 0)
err(1, "usleep");
Index: src/tests/lib/libc/gen/t_dir.c
diff -u src/tests/lib/libc/gen/t_dir.c:1.5 src/tests/lib/libc/gen/t_dir.c:1.6
--- src/tests/lib/libc/gen/t_dir.c:1.5 Sun Mar 18 03:14:08 2012
+++ src/tests/lib/libc/gen/t_dir.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dir.c,v 1.5 2012/03/18 07:14:08 jruoho Exp $ */
+/* $NetBSD: t_dir.c,v 1.6 2013/10/19 17:45:00 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -122,7 +122,6 @@ ATF_TC_HEAD(telldir_leak, tc)
ATF_TC_BODY(telldir_leak, tc)
{
DIR *dp;
- long loc;
char *memused;
int i;
int oktouse = 4096;
@@ -131,7 +130,7 @@ ATF_TC_BODY(telldir_leak, tc)
if (dp == NULL)
atf_tc_fail("Could not open current directory");
- loc = telldir(dp);
+ (void)telldir(dp);
memused = sbrk(0);
closedir(dp);
@@ -140,7 +139,7 @@ ATF_TC_BODY(telldir_leak, tc)
if (dp == NULL)
atf_tc_fail("Could not open current directory");
- loc = telldir(dp);
+ (void)telldir(dp);
closedir(dp);
if ((char *)sbrk(0) - memused > oktouse) {
Index: src/tests/lib/libc/stdio/t_fmemopen.c
diff -u src/tests/lib/libc/stdio/t_fmemopen.c:1.3 src/tests/lib/libc/stdio/t_fmemopen.c:1.4
--- src/tests/lib/libc/stdio/t_fmemopen.c:1.3 Sun Aug 21 20:33:16 2011
+++ src/tests/lib/libc/stdio/t_fmemopen.c Sat Oct 19 13:45:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fmemopen.c,v 1.3 2011/08/22 00:33:16 dholland Exp $ */
+/* $NetBSD: t_fmemopen.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */
/*-
* Copyright (c)2010 Takehiko NOZAKI,
@@ -463,13 +463,12 @@ ATF_TC_HEAD(test10, tc)
ATF_TC_BODY(test10, tc)
{
struct testcase *t;
- off_t len, i;
+ off_t i;
const char **p;
char buf[BUFSIZ];
FILE *fp;
for (t = &testcases[0]; t->s != NULL; ++t) {
- len = (off_t)strnlen(t->s, t->n);
for (p = &mode_rw[0]; *p != NULL; ++p) {
memcpy(&buf[0], t->s, t->n);
@@ -630,15 +629,13 @@ ATF_TC_HEAD(test13, tc)
ATF_TC_BODY(test13, tc)
{
struct testcase *t;
- off_t len, rest, i;
+ off_t i;
const char **p;
char buf[BUFSIZ];
FILE *fp;
/* test fmemopen_seek(SEEK_END) */
for (t = &testcases[0]; t->s != NULL; ++t) {
- len = (off_t)strnlen(t->s, t->n);
- rest = t->n - len;
for (p = &mode_w[0]; *p != NULL; ++p) {
memcpy(buf, t->s, t->n);
@@ -938,14 +935,12 @@ ATF_TC_HEAD(test19, tc)
ATF_TC_BODY(test19, tc)
{
struct testcase *t;
- size_t len;
int i;
const char **p;
char buf[BUFSIZ];
FILE *fp;
for (t = &testcases[0]; t->s != NULL; ++t) {
- len = strnlen(t->s, t->n);
for (p = &mode_rw2[0]; *p != NULL; ++p) {
memcpy(&buf[0], t->s, t->n);
@@ -998,13 +993,11 @@ ATF_TC_HEAD(test20, tc)
ATF_TC_BODY(test20, tc)
{
struct testcase *t;
- size_t len;
const char **p;
char buf[BUFSIZ];
FILE *fp;
for (t = &testcases[0]; t->s != NULL; ++t) {
- len = strnlen(t->s, t->n);
for (p = &mode_rw2[0]; *p != NULL; ++p) {
memcpy(&buf[0], t->s, t->n);
Index: src/tests/lib/libpthread/t_cond.c
diff -u src/tests/lib/libpthread/t_cond.c:1.4 src/tests/lib/libpthread/t_cond.c:1.5
--- src/tests/lib/libpthread/t_cond.c:1.4 Sun Mar 17 01:13:13 2013
+++ src/tests/lib/libpthread/t_cond.c Sat Oct 19 13:45:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cond.c,v 1.4 2013/03/17 05:13:13 jmmv Exp $ */
+/* $NetBSD: t_cond.c,v 1.5 2013/10/19 17:45:01 christos Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_cond.c,v 1.4 2013/03/17 05:13:13 jmmv Exp $");
+__RCSID("$NetBSD: t_cond.c,v 1.5 2013/10/19 17:45:01 christos Exp $");
#include <sys/time.h>
@@ -74,7 +74,6 @@ ATF_TC_HEAD(signal_delay_wait, tc)
}
ATF_TC_BODY(signal_delay_wait, tc)
{
- int x;
pthread_t new;
void *joinval;
int sharedval;
@@ -84,7 +83,6 @@ ATF_TC_BODY(signal_delay_wait, tc)
PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
- x = 20;
PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
sharedval = 1;
@@ -137,7 +135,6 @@ ATF_TC_HEAD(signal_before_unlock, tc)
}
ATF_TC_BODY(signal_before_unlock, tc)
{
- int x;
pthread_t new;
void *joinval;
int sharedval;
@@ -147,7 +144,6 @@ ATF_TC_BODY(signal_before_unlock, tc)
PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
- x = 20;
PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
sharedval = 1;
@@ -201,14 +197,12 @@ ATF_TC_HEAD(signal_before_unlock_static_
}
ATF_TC_BODY(signal_before_unlock_static_init, tc)
{
- int x;
pthread_t new;
void *joinval;
int sharedval;
printf("1: condition variable test 3\n");
- x = 20;
PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
sharedval = 1;
Index: src/tests/lib/libpthread/t_sigmask.c
diff -u src/tests/lib/libpthread/t_sigmask.c:1.2 src/tests/lib/libpthread/t_sigmask.c:1.3
--- src/tests/lib/libpthread/t_sigmask.c:1.2 Wed Nov 3 12:10:22 2010
+++ src/tests/lib/libpthread/t_sigmask.c Sat Oct 19 13:45:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sigmask.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
+/* $NetBSD: t_sigmask.c,v 1.3 2013/10/19 17:45:01 christos Exp $ */
/*
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigmask.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
+__RCSID("$NetBSD: t_sigmask.c,v 1.3 2013/10/19 17:45:01 christos Exp $");
/*
* Regression test for pthread_sigmask when SA upcalls aren't started yet.
@@ -107,7 +107,6 @@ ATF_TC_HEAD(before_threads, tc)
ATF_TC_BODY(before_threads, tc)
{
struct sigaction act;
- int ret;
act.sa_sigaction = upcalls_not_started_handler1;
sigemptyset(&act.sa_mask);
@@ -119,7 +118,7 @@ ATF_TC_BODY(before_threads, tc)
act.sa_sigaction = upcalls_not_started_handler2;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_SIGINFO;
- ret = sigaction(SIGUSR2, &act, NULL);
+ (void)sigaction(SIGUSR2, &act, NULL);
kill(getpid(), SIGUSR1);
@@ -179,7 +178,6 @@ ATF_TC_BODY(respected_while_running, tc)
{
struct sigaction act;
pthread_t thread;
- int rv;
act.sa_sigaction = respected_while_running_handler1;
sigemptyset(&act.sa_mask);
@@ -191,7 +189,7 @@ ATF_TC_BODY(respected_while_running, tc)
act.sa_sigaction = respected_while_running_handler2;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_SIGINFO;
- rv = sigaction(SIGUSR2, &act, NULL);
+ (void)sigaction(SIGUSR2, &act, NULL);
PTHREAD_REQUIRE(pthread_create(&thread, NULL,
respected_while_running_threadroutine, NULL));
Index: src/tests/net/net/t_pktinfo.c
diff -u src/tests/net/net/t_pktinfo.c:1.1 src/tests/net/net/t_pktinfo.c:1.2
--- src/tests/net/net/t_pktinfo.c:1.1 Thu Jun 27 16:01:24 2013
+++ src/tests/net/net/t_pktinfo.c Sat Oct 19 13:45:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pktinfo.c,v 1.1 2013/06/27 20:01:24 christos Exp $ */
+/* $NetBSD: t_pktinfo.c,v 1.2 2013/10/19 17:45:01 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_pktinfo.c,v 1.1 2013/06/27 20:01:24 christos Exp $");
+__RCSID("$NetBSD: t_pktinfo.c,v 1.2 2013/10/19 17:45:01 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -141,6 +141,7 @@ receive(int s) {
printf("%s message received on address %s at interface %d\n",
m, inet_ntoa(ipi->ipi_addr), ipi->ipi_ifindex);
#else
+ __USE(m);
ATF_REQUIRE_MSG(ipi->ipi_addr.s_addr == htonl(INADDR_LOOPBACK),
"address 0x%x != 0x%x", ipi->ipi_addr.s_addr,
htonl(INADDR_LOOPBACK));
