[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-8-g95ac7d1

[Giuseppe Scrivano]

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  95ac7d15532a2a42db9048d4cc7b8ca4f7b2c3bd (commit)
      from  9901a3d13a764037e0e97ab5eff2b451139d49ff (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=95ac7d15532a2a42db9048d4cc7b8ca4f7b2c3bd


commit 95ac7d15532a2a42db9048d4cc7b8ca4f7b2c3bd
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Jul 30 01:53:57 2010 +0200

    * ifconfig/if_index.c (if_nameindex): Remove local variable `len'.
    Remove code that compute the sizeof of the struct `ifreq'.

diff --git a/ChangeLog b/ChangeLog
index 9c5795e..052daee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-30  Giuseppe Scrivano  <address@hidden>
+
+       * ifconfig/if_index.c (if_nameindex): Remove local variable `len'.
+       Remove code that compute the sizeof of the struct `ifreq'.
+
 2010-07-10  Alfred M. Szmidt  <address@hidden>
 
        * ifconfig/options.c (parse_opt_set_default_format): Abort if no
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index 1080aca..3062bf7 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -132,19 +132,9 @@ if_nameindex (void)
   end = (struct ifreq *) ((caddr_t) ifr + ifc.ifc_len);
   while (ifr < end)
     {
-      int len;
-# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-#  undef MAX
-#  define MAX(a,b)  (((a) > (b)) ? (a) : (b))
-      len = MAX (sizeof (struct sockaddr), ifr->ifr_addr.sa_len);
-# else
-      len = sizeof (struct sockaddr);
-# endif
-
       cur = ifr;
 
-      /* Step along the array by the size of the current structure */
-      ifr = (struct ifreq *) ((caddr_t) ifr + len + IFNAMSIZ);
+      ++ifr;
 
       /* We ignore the other families .. OK ?  */
       if (cur->ifr_addr.sa_family != AF_INET)

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

Summary of changes:
 ChangeLog           |    5 +++++
 ifconfig/if_index.c |   12 +-----------
 2 files changed, 6 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils