Module Name: src
Committed By: christos
Date: Sun Oct 20 03:13:44 UTC 2013
Modified Files:
src/external/bsd/am-utils/dist/hlfsd: hlfsd.c
src/external/bsd/am-utils/dist/libamu: mount_fs.c
src/external/bsd/flex/dist: filter.c scanopt.c
src/external/bsd/mdocml/dist: roff.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/hlfsd/hlfsd.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/libamu/mount_fs.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/filter.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/scanopt.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/mdocml/dist/roff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/hlfsd/hlfsd.c
diff -u src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.1.1.2 src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.2
--- src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.1.1.2 Fri Mar 20 16:26:55 2009
+++ src/external/bsd/am-utils/dist/hlfsd/hlfsd.c Sat Oct 19 23:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hlfsd.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */
+/* $NetBSD: hlfsd.c,v 1.2 2013/10/20 03:13:44 christos Exp $ */
/*
* Copyright (c) 1997-2009 Erez Zadok
@@ -150,7 +150,6 @@ main(int argc, char *argv[])
int opterrs = 0;
int retry;
int soNFS; /* NFS socket */
- int s = -99;
mntent_t mnt;
nfs_args_t nfs_args;
am_nfs_handle_t anh;
@@ -454,17 +453,16 @@ main(int argc, char *argv[])
* set this signal handler.
*/
if (amuDebug(D_DAEMON)) {
- s = -99;
while (stoplight != SIGUSR2) {
plog(XLOG_INFO, "parent waits for child to setup (stoplight=%d)", stoplight);
#ifdef HAVE_SIGSUSPEND
{
sigset_t mask;
sigemptyset(&mask);
- s = sigsuspend(&mask); /* wait for child to set up */
+ (void)sigsuspend(&mask); /* wait for child to set up */
}
#else /* not HAVE_SIGSUSPEND */
- s = sigpause(0); /* wait for child to set up */
+ (void)sigpause(0); /* wait for child to set up */
#endif /* not HAVE_SIGSUSPEND */
sleep(1);
}
Index: src/external/bsd/am-utils/dist/libamu/mount_fs.c
diff -u src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.1.1.2 src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.2
--- src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.1.1.2 Fri Mar 20 16:26:55 2009
+++ src/external/bsd/am-utils/dist/libamu/mount_fs.c Sat Oct 19 23:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_fs.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */
+/* $NetBSD: mount_fs.c,v 1.2 2013/10/20 03:13:44 christos Exp $ */
/*
* Copyright (c) 1997-2009 Erez Zadok
@@ -466,6 +466,7 @@ compute_nfs_attrcache_flags(nfs_args_t *
if (amu_hasmntopt(mntp, MNTTAB_OPT_NOAC) != NULL)
nap->flags |= MNT2_NFS_OPT_NOAC;
#endif /* defined(MNTTAB_OPT_NOAC) && defined(MNT2_NFS_OPT_NOAC) */
+ (void)err_acval;
}
Index: src/external/bsd/flex/dist/filter.c
diff -u src/external/bsd/flex/dist/filter.c:1.2 src/external/bsd/flex/dist/filter.c:1.3
--- src/external/bsd/flex/dist/filter.c:1.2 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/filter.c Sat Oct 19 23:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.2 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: filter.c,v 1.3 2013/10/20 03:13:44 christos Exp $ */
/* filter - postprocessing of flex output through filters */
@@ -363,11 +363,10 @@ int filter_fix_linedirs (struct filter *
if (buf[0] == '#'
&& regexec (®ex_linedir, buf, 3, m, 0) == 0) {
- int num;
char *fname;
/* extract the line number and filename */
- num = regmatch_strtol (&m[1], buf, NULL, 0);
+ (void)regmatch_strtol (&m[1], buf, NULL, 0);
fname = regmatch_dup (&m[2], buf);
if (strcmp (fname,
Index: src/external/bsd/flex/dist/scanopt.c
diff -u src/external/bsd/flex/dist/scanopt.c:1.3 src/external/bsd/flex/dist/scanopt.c:1.4
--- src/external/bsd/flex/dist/scanopt.c:1.3 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/scanopt.c Sat Oct 19 23:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scanopt.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: scanopt.c,v 1.4 2013/10/20 03:13:44 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -539,10 +539,6 @@ static int scanopt_err (s, opt_offset, i
{
const char *optname = "";
char optchar[2];
- const optspec_t *opt = NULL;
-
- if (opt_offset >= 0)
- opt = s->options + opt_offset;
if (!s->no_err_msg) {
Index: src/external/bsd/mdocml/dist/roff.c
diff -u src/external/bsd/mdocml/dist/roff.c:1.13 src/external/bsd/mdocml/dist/roff.c:1.14
--- src/external/bsd/mdocml/dist/roff.c:1.13 Tue Apr 2 21:05:16 2013
+++ src/external/bsd/mdocml/dist/roff.c Sat Oct 19 23:13:44 2013
@@ -1394,11 +1394,10 @@ roff_expand_nr(struct roff *r, const cha
{
uint32_t hv;
struct roff_nr *h;
- int l, s, d;
+ int l, s;
char e, *key;
s = *sp + 2; /* skip \\\n */
- d = *dp;
if ('[' == src[s]) { /* XXX: Support builtins */
s++;
