[PATCH iproute2 v1 1/2] iproute2: avoid exit in case of error.

Subsystems: the rest

STALE3536d

3 messages, 2 authors, 2016-11-29 · open the first message on its own page

[PATCH iproute2 v1 1/2] iproute2: avoid exit in case of error.

From: David Decotigny <hidden>
Date: 2016-11-11 19:09:04

Be consistent with how non-0 print_route() return values are handled
elesewhere: return -1.


---
 ip/iproute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ip/iproute.c b/ip/iproute.c
index 98bfad6..dae793b 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c

@@ -1743,7 +1743,7 @@ static int iproute_get(int argc, char **argv)
 
 		if (print_route(NULL, &req.n, (void *)stdout) < 0) {
 			fprintf(stderr, "An error :-)\n");
-			exit(1);
+			return -1;
 		}
 
 		if (req.n.nlmsg_type != RTM_NEWROUTE) {

-- 
2.8.0.rc3.226.g39d4020

[PATCH iproute2 v1 2/2] iproute2: a non-expected rtnl message is an error

From: David Decotigny <hidden>
Date: 2016-11-11 19:07:57

---
 ip/iproute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ip/iproute.c b/ip/iproute.c
index dae793b..10d0afe 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c

@@ -320,7 +320,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
 		fprintf(stderr, "Not a route: %08x %08x %08x\n",
 			n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
-		return 0;
+		return -1;
 	}
 	if (filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
 		return 0;

-- 
2.8.0.rc3.226.g39d4020

Re: [PATCH iproute2 v1 1/2] iproute2: avoid exit in case of error.

From: Stephen Hemminger <stephen@networkplumber.org>
Date: 2016-11-29 20:46:58

On Fri, 11 Nov 2016 10:55:36 -0800
David Decotigny [off-list ref] wrote:

Be consistent with how non-0 print_route() return values are handled
elesewhere: return -1.


---
 ip/iproute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, and queued for next push.
Please use Signed-off-by: on future patches.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help