[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-295-g4b07610

[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  4b076100a18fdcf28ed8bc0884dd32c40a918128 (commit)
      from  e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d (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=4b076100a18fdcf28ed8bc0884dd32c40a918128


commit 4b076100a18fdcf28ed8bc0884dd32c40a918128
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 22 12:10:54 2013 +0200

    libtelnet: Unused parameters.

diff --git a/ChangeLog b/ChangeLog
index 91b8589..8b8d0a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-05-22  Mats Erik Andersson  <address@hidden>
+
+       * libtelnet/encrypt.c: Include <unused-parameter.h>.
+       (encrypt_start, encrypt_request_start): Mark all
+       parameters with _GL_UNUSED_PARAMETER.
+       * libtelnet/kerberos5.c: Include <unused-parameter.h>.
+       (kerberos5_init, kerberos5_status): Param `ap' is unused.
+       * libtelnet/shishi.c: Include <unused-parameter.h>.
+       (krb5shishi_init, krb5shishi_status): `ap' is unused.
+       (krb5shishi_cleanup): Likewise.  Delete variable SUBKEY.
+
 2013-05-18  Mats Erik Andersson  <address@hidden>
 
        libtelnet: Portability of enctype_names.
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 41bc631..3a483ee 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -81,6 +81,7 @@
 # include <string.h>
 
 # include <stdio.h>
+# include <unused-parameter.h>
 # include "genget.h"
 
 /* String representation of our capabilities.
@@ -667,7 +668,8 @@ encrypt_reply (unsigned char *data, int cnt)
  * Called when a ENCRYPT START command is received.
  */
 void
-encrypt_start (unsigned char *data, int cnt)
+encrypt_start (unsigned char *data _GL_UNUSED_PARAMETER,
+              int cnt _GL_UNUSED_PARAMETER)
 {
   Encryptions *ep;
 
@@ -749,7 +751,8 @@ encrypt_request_end (void)
  * can.
  */
 void
-encrypt_request_start (unsigned char *data, int cnt)
+encrypt_request_start (unsigned char *data _GL_UNUSED_PARAMETER,
+                      int cnt _GL_UNUSED_PARAMETER)
 {
   if (encrypt_mode == 0)
     {
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index e1280e9..61491fb 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -36,6 +36,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
+# include <unused-parameter.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -119,7 +120,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int 
c)
 
 /* FIXME: Reverse return code! */
 int
-kerberos5_init (TN_Authenticator * ap, int server)
+kerberos5_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER, int server)
 {
   str_data[3] = server ? TELQUAL_REPLY : TELQUAL_IS;
   if (telnet_context == 0 && krb5_init_context (&telnet_context))
@@ -426,8 +427,8 @@ kerberos5_reply (TN_Authenticator * ap, unsigned char 
*data, int cnt)
 }
 
 int
-kerberos5_status (TN_Authenticator * ap, char *name, size_t len,
-                 int level)
+kerberos5_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+                 char *name, size_t len, int level)
 {
   if (level < AUTH_USER)
     return level;
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 34b0446..8574f2a 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -32,6 +32,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
+# include <unused-parameter.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -100,7 +101,8 @@ Shishi *shishi_telnet = NULL;
 
 /* FIXME: Reverse return code! */
 int
-krb5shishi_init (TN_Authenticator * ap, int server)
+krb5shishi_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+                int server)
 {
   if (server)
     str_data[3] = TELQUAL_REPLY;
@@ -134,7 +136,7 @@ delayed_shishi_init (void)
 }
 
 void
-krb5shishi_cleanup (TN_Authenticator * ap)
+krb5shishi_cleanup (TN_Authenticator * ap _GL_UNUSED_PARAMETER)
 {
   if (shishi_handle == NULL)
     return;
@@ -150,7 +152,6 @@ krb5shishi_send (TN_Authenticator * ap)
   char type_check[2];
   Shishi_tkt *tkt;
   Shishi_tkts_hint hint;
-  Shishi_key *subkey;
   int rc;
   char *tmp;
   char *apreq;
@@ -394,8 +395,8 @@ krb5shishi_reply (TN_Authenticator * ap, unsigned char 
*data, int cnt)
 }
 
 int
-krb5shishi_status (TN_Authenticator * ap, char *name, size_t len,
-                  int level)
+krb5shishi_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+                  char *name, size_t len, int level)
 {
   int status;
 

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 libtelnet/encrypt.c   |    7 +++++--
 libtelnet/kerberos5.c |    7 ++++---
 libtelnet/shishi.c    |   11 ++++++-----
 4 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils