[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-66-g055ea0a

[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  055ea0a73f8a54f2278a7526dcffd81662eb3eba (commit)
      from  e21f5d17338a0b2e63206b487df8d0dbab9f7537 (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=055ea0a73f8a54f2278a7526dcffd81662eb3eba


commit 055ea0a73f8a54f2278a7526dcffd81662eb3eba
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 17 15:38:22 2015 +0200

    Fix sc_prohibit_double_semicolon.

diff --git a/ChangeLog b/ChangeLog
index aa7960f..ef75489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-17  Mats Erik Andersson  <address@hidden>
+
+       * ftpd/conf.c, ftpd/ftpd.c, ifconfig/system/bsd.c,
+       ifconfig/system/linux.c, libtelnet/encrypt.c: Remove
+       duplicate semicolon.
+
 2015-04-16  Mats Erik Andersson  <address@hidden>
 
        * cfg.mk (git-version-gen-tag-sed-script): New variable using
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 25fdf17..911c702 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -64,7 +64,7 @@ checkuser (const char *filename, const char *name)
   FILE *fp;
   int found = 0, ngroups = 0;
   char *p, line[BUFSIZ];
-  gid_t *groups = NULL;;
+  gid_t *groups = NULL;
   struct passwd *pwd = NULL;
 
   fp = fopen (filename, "r");
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 6da2f77..5db88d0 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1206,7 +1206,7 @@ bad:
   /* Return the real value of errno (close may change it) */
   t = errno;
   if (seteuid ((uid_t) cred.uid) != 0)
-    _exit (EXIT_FAILURE);;
+    _exit (EXIT_FAILURE);
   close (s);
   errno = t;
   return NULL;
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index e13402d..43a4122 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -404,9 +404,9 @@ system_fh_media (format_data_t form, int argc 
_GL_UNUSED_PARAMETER,
              if (item->ifmt_word == IFM_SUBTYPE (ifm.ifm_active))
                active_subtype = item->ifmt_string;
            }
-         ;;
+         ;
        default:
-         ;;
+         ;
        }
 
       /* Shared media sub-types.  Only works if the previous
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index cb4c692..ef27d65 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -433,7 +433,7 @@ pnd_read ()
 
   while (getline (&buf, &bufsize, fp) > 0)
     {
-      struct pnd_stats *stats = xzalloc (sizeof (*stats));;
+      struct pnd_stats *stats = xzalloc (sizeof (*stats));
       char *p = buf, *q;
       size_t len;
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index c7aff0e..e2b8c48 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1012,7 +1012,7 @@ encrypt_gen_printsub (unsigned char *data, int cnt,
   data += 2;
   buf[buflen - 1] = '\0';
   buf[buflen - 2] = '*';
-  buflen -= 2;;
+  buflen -= 2;
   for (; cnt > 0; cnt--, data++)
     {
       sprintf (tbuf, " %d", *data);

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

Summary of changes:
 ChangeLog               |    6 ++++++
 ftpd/conf.c             |    2 +-
 ftpd/ftpd.c             |    2 +-
 ifconfig/system/bsd.c   |    4 ++--
 ifconfig/system/linux.c |    2 +-
 libtelnet/encrypt.c     |    2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils