[src/trunk]: src/external/bsd remove unused variables

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d7a2b3b8a0c
branches:  trunk
changeset: 790750:5d7a2b3b8a0c
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Oct 20 03:10:45 2013 +0000

description:
remove unused variables

diffstat:

 external/bsd/am-utils/dist/hlfsd/hlfsd.c                |  8 +++-----
 external/bsd/am-utils/dist/libamu/mount_fs.c            |  3 ++-
 external/bsd/flex/dist/filter.c                         |  5 ++---
 external/bsd/flex/dist/scanopt.c                        |  6 +-----
 external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c |  2 --
 external/bsd/mdocml/dist/roff.c                         |  3 +--
 external/bsd/pdisk/dist/partition_map.c                 |  2 --
 7 files changed, 9 insertions(+), 20 deletions(-)

diffs (148 lines):

diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/am-utils/dist/hlfsd/hlfsd.c
--- a/external/bsd/am-utils/dist/hlfsd/hlfsd.c  Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/am-utils/dist/hlfsd/hlfsd.c  Sun Oct 20 03:10:45 2013 +0000
@@ -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 @@
   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 @@
    * 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);
     }
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/am-utils/dist/libamu/mount_fs.c
--- a/external/bsd/am-utils/dist/libamu/mount_fs.c      Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/am-utils/dist/libamu/mount_fs.c      Sun Oct 20 03:10:45 2013 +0000
@@ -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 @@
   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;
 }
 
 
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/flex/dist/filter.c
--- a/external/bsd/flex/dist/filter.c   Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/flex/dist/filter.c   Sun Oct 20 03:10:45 2013 +0000
@@ -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 @@
                if (buf[0] == '#'
                        && regexec (&regex_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,
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/flex/dist/scanopt.c
--- a/external/bsd/flex/dist/scanopt.c  Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/flex/dist/scanopt.c  Sun Oct 20 03:10:45 2013 +0000
@@ -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 @@
 {
        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) {
 
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
--- a/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c   Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c   Sun Oct 20 03:10:45 2013 +0000
@@ -542,7 +542,6 @@
        char                    name[1024];
        char                    *colon;
        char                   *host;
-       char                   *user;
        char                    buf[32];
        char                    devtype;
        int                     discover;
@@ -552,7 +551,6 @@
 
        (void) memset(&tinfo, 0x0, sizeof(tinfo));
        iscsi_initiator_set_defaults(&ini);
-       user = NULL;
        (void) gethostname(host = hostname, sizeof(hostname));
        discover = 0;
        (void) stat("/etc/hosts", &sti.st);
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/mdocml/dist/roff.c
--- a/external/bsd/mdocml/dist/roff.c   Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/mdocml/dist/roff.c   Sun Oct 20 03:10:45 2013 +0000
@@ -1394,11 +1394,10 @@
 {
        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++;
diff -r a5d77089f4c7 -r 5d7a2b3b8a0c external/bsd/pdisk/dist/partition_map.c
--- a/external/bsd/pdisk/dist/partition_map.c   Sun Oct 20 03:09:11 2013 +0000
+++ b/external/bsd/pdisk/dist/partition_map.c   Sun Oct 20 03:10:45 2013 +0000
@@ -317,13 +317,11 @@
 void
 write_partition_map(partition_map_header *map)
 {
-    MEDIA m;
     char *block;
     partition_map * entry;
     int i = 0;
     int result = 0;
 
-    m = map->m;
     if (map->misc != NULL) {
        convert_block0(map->misc, 0);
        result = write_block(map, 0, (char *)map->misc);