getaddrinfo: Remove unreachable return statement from gaih_inet

(cherry picked from commit 0df595b23a829c9169ec418a19eef9006b4ae801)

diff --git a/ChangeLog b/ChangeLog
index 87fa54c57bc387854cd281a192d76d865356663b..591c753fccacaf1a2e239509b60332f4f4a82ad4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-08  Florian Weimer  <fweimer@redhat.com>
+
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Remove unreachable
+       return statement.
+
 2017-08-22  Joseph Myers  <joseph@codesourcery.com>
 
        * assert/Makefile [$(have-cxx-thread_local)]: Move conditional

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 699411cc92fc210cfba963c717638c790d063af4..09f85fc472f9e1774ee39a3670396d8fcd1cdcc6 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -420,13 +420,9 @@ gaih_inet (const char *name, const struct gaih_service *service,
                    alloca_account (sizeof (struct gaih_servtuple),
                                    alloca_used);
 
-                 if ((rc = gaih_inet_serv (service->name,
-                                           tp, req, newp, tmpbuf)))
-                   {
-                     if (rc)
-                       continue;
-                     return rc;
-                   }
+                 if (gaih_inet_serv (service->name,
+                                     tp, req, newp, tmpbuf) != 0)
+                   continue;
 
                  *pst = newp;
                  pst = &(newp->next);