From bad48ac0428233983dd8331226a8888c761985a9 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Tue, 7 Aug 2018 15:00:22 +0200 Subject: [PATCH] util: Drop unused cleanup label in virNetDevOpenvswitchInterfaceGetMaster This was doing a plain "return". Signed-off-by: Sukrit Bhatnagar Signed-off-by: Erik Skultety --- src/util/virnetdevopenvswitch.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index d1c5cf46a7..2aedaae9e8 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -424,7 +424,6 @@ int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) { virCommandPtr cmd = NULL; - int ret = -1; int exitstatus; *master = NULL; @@ -438,7 +437,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to run command to get OVS master for " "interface %s"), ifname); - goto cleanup; + return -1; } /* non-0 exit code just means that the interface has no master in OVS */ @@ -454,9 +453,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) VIR_DEBUG("OVS master for %s is %s", ifname, *master ? *master : "(none)"); - ret = 0; - cleanup: - return ret; + return 0; }