[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-173-gae05f1f

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  ae05f1f506836b7e8b4dc769232937eb0b2cdcfe (commit)
      from  8d5332fe7a1d95efbc1f647d5859d6723a58520e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=ae05f1f506836b7e8b4dc769232937eb0b2cdcfe


commit ae05f1f506836b7e8b4dc769232937eb0b2cdcfe
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Sep 15 11:42:19 2012 +0200

    Mark unused parameters.

diff --git a/ChangeLog b/ChangeLog
index fe16473..0230592 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
 2012-09-15  Mats Erik Andersson  <address@hidden>
 
+       Mark unused parameters as such.
+
+       * ftp/cmds.c (setbinary, setascii, settenex, setftmode)
+       (setform, setstruct, status, setbell, settrace, sethash)
+       (setverbose, setipany, setipv4, setipv6, setepsv4, setport)
+       (setprompt, setglob, shell, pwd, quit, disconnect, proxabort)
+       (setcase, setcr, setpassive, setsunique, setrunique, cdup)
+       (syst): Add _GL_UNUSED_PARAMETER.
+       * ftp/ftp.c (abortsend, abortrecv, psabort, abortpt, reset):
+       Likewise.
+       * ftp/main.c (parse_opt): Likewise.
+
+       Header file and parse_opt() are common treatments.
+
+       * src/logger.c: Include <unused-parameter.h>.
+       (parse_opt): Add _GL_UNUSED_PARAMETER.
+       * src/rcp.c: Likewise.
+       (lostconn): Likewise
+       * src/rexecd.c: Likewise.
+       * src/rlogind.c (parse_opt): Likewise
+       (do_shishi_login): Remove variable IV.
+       * src/rshd.c: Likewise.
+
+       * telnet/commands.c: Include <unused-parameter.h>.
+       (shell): Add _GL_UNUSED_PARAMETER.
+       * telnet/main.c: Likewise.
+       (parse_opt): Likewise.
+       * telnet/sys_bsd.c: Likewise.
+       (deadpeer, intr, intr2, susp, sendwin): Likewise.
+
+       * tests/localhost.c: Likewise.
+       (main): Likewise.
+
+       * whois/whois.c: Likewise.
+       (ripe_argp_parser, gwhois_argp_parser): Likewise.
+
+2012-09-15  Mats Erik Andersson  <address@hidden>
+
        Add missing values in option lists, and in similar
        lists.  All were detected as compiler warnings.
 
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 62fed74..3e1328f 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -427,7 +427,7 @@ char *stype[] = {
  * Set binary transfer type.
  */
 void
-setbinary (int argc, char **argv)
+setbinary (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   stype[1] = "binary";
@@ -438,7 +438,7 @@ setbinary (int argc, char **argv)
  * Set ascii transfer type.
  */
 void
-setascii (int argc, char **argv)
+setascii (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   stype[1] = "ascii";
@@ -449,7 +449,7 @@ setascii (int argc, char **argv)
  * Set tenex transfer type.
  */
 void
-settenex (int argc, char **argv)
+settenex (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   stype[1] = "tenex";
@@ -460,7 +460,7 @@ settenex (int argc, char **argv)
  * Set file transfer mode.
  */
 void
-setftmode (int argc, char **argv)
+setftmode (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   printf ("We only support %s mode, sorry.\n", modename);
@@ -471,7 +471,7 @@ setftmode (int argc, char **argv)
  * Set file transfer format.
  */
 void
-setform (int argc, char **argv)
+setform (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   printf ("We only support %s format, sorry.\n", formname);
@@ -482,7 +482,7 @@ setform (int argc, char **argv)
  * Set file transfer structure.
  */
 void
-setstruct (int argc, char **argv)
+setstruct (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   printf ("We only support %s structure, sorry.\n", structname);
@@ -1055,7 +1055,7 @@ onoff (int bool)
  * Show status.
  */
 void
-status (int argc, char **argv)
+status (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   int i;
 
@@ -1120,7 +1120,7 @@ status (int argc, char **argv)
  * Set beep on cmd completed mode.
  */
 void
-setbell (int argc, char **argv)
+setbell (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   bell = !bell;
@@ -1132,7 +1132,7 @@ setbell (int argc, char **argv)
  * Turn on packet tracing.
  */
 void
-settrace (int argc, char **argv)
+settrace (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   trace = !trace;
@@ -1144,7 +1144,7 @@ settrace (int argc, char **argv)
  * Toggle hash mark printing during transfers.
  */
 void
-sethash (int argc, char **argv)
+sethash (int argc _GL_UNUSED_PARAMETER, char **argv)
 {
   if (argv[1] != NULL)
     sscanf (argv[1], "%d", &hashbytes);
@@ -1162,7 +1162,7 @@ sethash (int argc, char **argv)
  * Turn on printing of server echo's.
  */
 void
-setverbose (int argc, char **argv)
+setverbose (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   verbose = !verbose;
@@ -1174,7 +1174,7 @@ setverbose (int argc, char **argv)
  * Allow any address family.
  */
 void
-setipany (int argc, char **argv)
+setipany (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   usefamily = AF_UNSPEC;
   printf ("Selecting addresses: %s.\n", "any");
@@ -1185,7 +1185,7 @@ setipany (int argc, char **argv)
  * Restrict to IPv4 addresses.
  */
 void
-setipv4 (int argc, char **argv)
+setipv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   usefamily = AF_INET;
   printf ("Selecting addresses: %s.\n", "IPv4");
@@ -1196,7 +1196,7 @@ setipv4 (int argc, char **argv)
  * Restrict to IPv6 addresses.
  */
 void
-setipv6 (int argc, char **argv)
+setipv6 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   usefamily = AF_INET6;
   printf ("Selecting addresses: %s.\n", "IPv6");
@@ -1207,7 +1207,7 @@ setipv6 (int argc, char **argv)
  * Toggle use of EPRT/EPRT for IPv4.
  */
 void
-setepsv4 (int argc, char **argv)
+setepsv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   doepsv4 = !doepsv4;
@@ -1219,7 +1219,7 @@ setepsv4 (int argc, char **argv)
  * Toggle PORT cmd use before each data connection.
  */
 void
-setport (int argc, char **argv)
+setport (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   sendport = !sendport;
@@ -1232,7 +1232,7 @@ setport (int argc, char **argv)
  * during mget, mput, and mdelete.
  */
 void
-setprompt (int argc, char **argv)
+setprompt (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   interactive = !interactive;
@@ -1245,7 +1245,7 @@ setprompt (int argc, char **argv)
  * on local file names.
  */
 void
-setglob (int argc, char **argv)
+setglob (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   doglob = !doglob;
@@ -1549,7 +1549,7 @@ mls (int argc, char **argv)
  * Do a shell escape
  */
 void
-shell (int argc, char **argv)
+shell (int argc, char **argv _GL_UNUSED_PARAMETER)
 {
   pid_t pid;
   sighandler_t old1, old2;
@@ -1659,7 +1659,7 @@ user (int argc, char **argv)
  * Print working directory.
  */
 void
-pwd (int argc, char **argv)
+pwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   int oldverbose = verbose;
 
@@ -1832,7 +1832,7 @@ rmthelp (int argc, char **argv)
  * Terminate session and exit.
  */
 void
-quit (int argc, char **argv)
+quit (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   if (connected)
@@ -1849,7 +1849,7 @@ quit (int argc, char **argv)
  * Terminate session, but don't exit.
  */
 void
-disconnect (int argc, char **argv)
+disconnect (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   if (!connected)
@@ -1952,7 +1952,7 @@ account (int argc, char **argv)
 jmp_buf abortprox;
 
 void
-proxabort (int sig)
+proxabort (int sig _GL_UNUSED_PARAMETER)
 {
 
   if (!proxy)
@@ -2035,7 +2035,7 @@ doproxy (int argc, char **argv)
 }
 
 void
-setcase (int argc, char **argv)
+setcase (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   mcase = !mcase;
@@ -2044,7 +2044,7 @@ setcase (int argc, char **argv)
 }
 
 void
-setcr (int argc, char **argv)
+setcr (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   crflag = !crflag;
@@ -2109,7 +2109,7 @@ dotrans (char *name)
 }
 
 void
-setpassive (int argc, char **argv)
+setpassive (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   passivemode = !passivemode;
@@ -2338,7 +2338,7 @@ domap (char *name)
 }
 
 void
-setsunique (int argc, char **argv)
+setsunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   sunique = !sunique;
@@ -2347,7 +2347,7 @@ setsunique (int argc, char **argv)
 }
 
 void
-setrunique (int argc, char **argv)
+setrunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   runique = !runique;
@@ -2357,7 +2357,7 @@ setrunique (int argc, char **argv)
 
 /* change directory to parent directory */
 void
-cdup (int argc, char **argv)
+cdup (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   if (command ("CDUP") == ERROR && code == 500)
@@ -2385,7 +2385,7 @@ restart (int argc, char **argv)
 
 /* show remote system type */
 void
-syst (int argc, char **argv)
+syst (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
 
   command ("SYST");
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 3317055..43dbb36 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -522,7 +522,7 @@ empty (fd_set *mask, int sec)
 jmp_buf sendabort;
 
 void
-abortsend (int sig)
+abortsend (int sig _GL_UNUSED_PARAMETER)
 {
 
   mflag = 0;
@@ -825,7 +825,7 @@ abort:
 jmp_buf recvabort;
 
 void
-abortrecv (int sig)
+abortrecv (int sig _GL_UNUSED_PARAMETER)
 {
 
   mflag = 0;
@@ -1550,7 +1550,7 @@ tvsub (struct timeval *tdiff, struct timeval *t1, struct 
timeval *t0)
 }
 
 void
-psabort (int sig)
+psabort (int sig _GL_UNUSED_PARAMETER)
 {
 
   abrtflag++;
@@ -1663,7 +1663,7 @@ pswitch (int flag)
 }
 
 void
-abortpt (int sig)
+abortpt (int sig _GL_UNUSED_PARAMETER)
 {
 
   printf ("\n");
@@ -1805,7 +1805,7 @@ abort:
 }
 
 void
-reset (int argc, char **argv)
+reset (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
 {
   fd_set mask;
   int nfnd = 1;
diff --git a/ftp/main.c b/ftp/main.c
index 5af6187..1c0cdec 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -112,7 +112,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/src/logger.c b/src/logger.c
index 9f60f1c..5b003f1 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -40,6 +40,7 @@
 #include <error.h>
 #include <xalloc.h>
 #include <inttostr.h>
+#include <unused-parameter.h>
 
 #define SYSLOG_NAMES
 #include <syslog.h>
@@ -405,7 +406,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/src/rcp.c b/src/rcp.c
index 08d57fa..71949a1 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -82,6 +82,7 @@
 # include <utime.h>            /* If we don't have utimes(), use utime(). */
 #endif
 #include <progname.h>
+#include <unused-parameter.h>
 #include <libinetutils.h>
 #include <argp.h>
 #include <error.h>
@@ -198,7 +199,7 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
@@ -1370,7 +1371,7 @@ allocbuf (BUF * bp, int fd, int blksize)
 }
 
 void
-lostconn (int signo)
+lostconn (int signo _GL_UNUSED_PARAMETER)
 {
   if (!iamremote)
     error (0, 0, "lost connection");
diff --git a/src/rexecd.c b/src/rexecd.c
index ea79c24..ce61cc9 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -111,6 +111,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <error.h>
+#include <unused-parameter.h>
 #include "libinetutils.h"
 
 void die (int code, const char *fmt, ...);
@@ -135,7 +136,8 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg _GL_UNUSED_PARAMETER,
+          struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/src/rlogind.c b/src/rlogind.c
index 2d42271..cb9a541 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -315,7 +315,8 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg,
+          struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
@@ -1249,7 +1250,6 @@ do_shishi_login (int infd, struct auth_data *ad, const 
char **err_msg)
   if (encrypt_io)
     {
       int i;
-      char *iv;
 
       ad->ivtab[0] = &ad->iv1;
       ad->ivtab[1] = &ad->iv2;
diff --git a/src/rshd.c b/src/rshd.c
index 9a8c6ae..a927342 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -142,6 +142,7 @@
 #include <error.h>
 #include <progname.h>
 #include <argp.h>
+#include <unused-parameter.h>
 #include <libinetutils.h>
 #include "xalloc.h"
 
@@ -246,7 +247,7 @@ extern int iruserok (uint32_t raddr, int superuser,
 #endif /* WITH_PAM */
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/telnet/commands.c b/telnet/commands.c
index 09b17f4..e6b73d5 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -73,6 +73,7 @@
 #include <arpa/inet.h>
 #include <arpa/telnet.h>
 
+#include <unused-parameter.h>
 #include <libinetutils.h>
 
 #include "general.h"
@@ -1554,7 +1555,7 @@ suspend (void)
 
 #if !defined TN3270
 int
-shell (int argc, char *argv[])
+shell (int argc, char *argv[] _GL_UNUSED_PARAMETER)
 {
   long oldrows, oldcols, newrows, newcols, err;
 
diff --git a/telnet/main.c b/telnet/main.c
index 5a679ac..912090b 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -60,6 +60,7 @@
 #include <progname.h>
 #include <error.h>
 #include <argp.h>
+#include <unused-parameter.h>
 #include <libinetutils.h>
 
 #include <arpa/telnet.h>
@@ -194,7 +195,7 @@ static struct argp_option argp_options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 2973114..e133cce 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -63,6 +63,7 @@
 #include <errno.h>
 #include <arpa/telnet.h>
 #include <sys/select.h>
+#include <unused-parameter.h>
 
 #include "ring.h"
 
@@ -940,7 +941,7 @@ NetSetPgrp (int fd)
  */
 
 void
-deadpeer (int sig)
+deadpeer (int sig _GL_UNUSED_PARAMETER)
 {
   setcommandmode ();
   longjmp (peerdied, -1);
@@ -948,7 +949,7 @@ deadpeer (int sig)
 
 
 void
-intr (int sig)
+intr (int sig _GL_UNUSED_PARAMETER)
 {
   if (localchars)
     {
@@ -961,7 +962,7 @@ intr (int sig)
 
 
 void
-intr2 (int sig)
+intr2 (int sig _GL_UNUSED_PARAMETER)
 {
   if (localchars)
     {
@@ -977,7 +978,7 @@ intr2 (int sig)
 
 #ifdef SIGTSTP
 void
-susp (int sig)
+susp (int sig _GL_UNUSED_PARAMETER)
 {
   if ((rlogin != _POSIX_VDISABLE) && rlogin_susp ())
     return;
@@ -988,7 +989,7 @@ susp (int sig)
 
 #ifdef SIGWINCH
 void
-sendwin (int sig)
+sendwin (int sig _GL_UNUSED_PARAMETER)
 {
   if (connected)
     {
diff --git a/tests/localhost.c b/tests/localhost.c
index d65dd71..19d5fb8 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -22,10 +22,11 @@
 #include "libinetutils.h"
 
 #include <stdio.h>
+#include <unused-parameter.h>
 #include <progname.h>
 
 int
-main (int argc, char **argv)
+main (int argc _GL_UNUSED_PARAMETER, char **argv)
 {
   const char *p = localhost ();
   set_program_name (argv[0]);
diff --git a/whois/whois.c b/whois/whois.c
index 23a90d7..5af351b 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -40,6 +40,7 @@
 #define obstack_chunk_free free
 #include <obstack.h>
 #include <error.h>
+#include <unused-parameter.h>
 #include <libinetutils.h>
 
 /* Application-specific */
@@ -100,7 +101,8 @@ static struct argp_option ripe_argp_options[] = {
 };
 
 static error_t
-ripe_argp_parser (int key, char *arg, struct argp_state *state)
+ripe_argp_parser (int key, char *arg,
+                 struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   if (key > 0 && (unsigned) key < 128)
     {
@@ -137,7 +139,8 @@ static struct argp_option gwhois_argp_options[] = {
 };
 
 static error_t
-gwhois_argp_parser (int key, char *arg, struct argp_state *state)
+gwhois_argp_parser (int key, char *arg,
+                   struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   char *p, *q;
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   38 +++++++++++++++++++++++++++++++++
 ftp/cmds.c        |   60 ++++++++++++++++++++++++++--------------------------
 ftp/ftp.c         |   10 ++++----
 ftp/main.c        |    2 +-
 src/logger.c      |    3 +-
 src/rcp.c         |    5 ++-
 src/rexecd.c      |    4 ++-
 src/rlogind.c     |    4 +-
 src/rshd.c        |    3 +-
 telnet/commands.c |    3 +-
 telnet/main.c     |    3 +-
 telnet/sys_bsd.c  |   11 +++++----
 tests/localhost.c |    3 +-
 whois/whois.c     |    7 ++++-
 14 files changed, 103 insertions(+), 53 deletions(-)


hooks/post-receive
-- 
GNU Inetutils