From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 15 Jan 2019 12:26:00 +0000 (-0500)
Subject: zebra: Having one goto in a function to just return is silly
X-Git-Tag: 7.1_pulled~301^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e677d1094573649dcea181dad91bf0d0fb40726a;p=mirror%2Ffrr.git

zebra: Having one goto in a function to just return is silly

Just return right there, goto's are useful if you have common
code that needs to be cleaned up before exiting this function,
of which this function has none and there is only one goto.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index abcff22b6b..9cc2efb3e9 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -308,8 +308,7 @@ enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
 
 	if (dplane_ctx_get_src(ctx) != NULL) {
 		zlog_err("route add: IPv6 sourcedest routes unsupported!");
-		res = ZEBRA_DPLANE_REQUEST_FAILURE;
-		goto done;
+		return ZEBRA_DPLANE_REQUEST_FAILURE;
 	}
 
 	frr_elevate_privs(&zserv_privs) {
@@ -341,8 +340,6 @@ enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
 		}
 	} /* Elevated privs */
 
-done:
-
 	return res;
 }