48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
|
From 4fdd75e4463801b9d8f329769df1a26145560656 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Tue, 8 Aug 2017 18:48:05 +0200
|
||
|
|
Subject: [PATCH 20] getaddrinfo: Remove unreachable return statement from
|
||
|
|
gaih_inet
|
||
|
|
|
||
|
|
(cherry picked from commit 0df595b23a829c9169ec418a19eef9006b4ae801)
|
||
|
|
---
|
||
|
|
ChangeLog | 5 +++++
|
||
|
|
sysdeps/posix/getaddrinfo.c | 10 +++-------
|
||
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index 87fa54c57b..591c753fcc 100644
|
||
|
|
--- 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 699411cc92..09f85fc472 100644
|
||
|
|
--- 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);
|
||
|
|
|