getaddrinfo: Remove unreachable return statement from gaih_inet

(cherry picked from commit 0df595b23a829c9169ec418a19eef9006b4ae801)

diff --git a/ChangeLog b/ChangeLog
index aa0ddaaa9db4b1615b4f348bcf66c8ed4aa3c6bd..242873b2dfb421089a6d56a1c93096f7cf994b0c 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-06-24  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #21295]

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index ceb1e0b024802839c0bff839c4588a40b9e652e8..e63a269e36349d96198ba7b2b80e66be7e7299b4 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -415,13 +415,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);