From: Phil Sutter <phil@nwl.cc>
Date: Fri, 2 Dec 2016 10:39:57 +0000 (+0100)
Subject: ss: Get rid of useless goto in handle_follow_request()
X-Git-Tag: v4.10.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b224dad23aa9e0f1e6a0828ee9cd4ced66a7f96;p=thirdparty%2Fiproute2.git

ss: Get rid of useless goto in handle_follow_request()

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/misc/ss.c b/misc/ss.c
index 446a82a45..4bc077282 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -3675,7 +3675,7 @@ static int generic_show_sock(const struct sockaddr_nl *addr,
 
 static int handle_follow_request(struct filter *f)
 {
-	int ret = -1;
+	int ret = 0;
 	int groups = 0;
 	struct rtnl_handle rth;
 
@@ -3698,10 +3698,8 @@ static int handle_follow_request(struct filter *f)
 	rth.local.nl_pid = 0;
 
 	if (rtnl_dump_filter(&rth, generic_show_sock, f))
-		goto Exit;
+		ret = -1;
 
-	ret = 0;
-Exit:
 	rtnl_close(&rth);
 	return ret;
 }