Re: [PATCH 25/32] tools: eliminate unnecessary labels

[Ján Tomko]

On a Sunday in 2020, Laine Stump wrote:

Signed-off-by: Laine Stump 
---
tools/virsh-pool.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[PATCH 25/32] tools: eliminate unnecessary labels

[Laine Stump]

Signed-off-by: Laine Stump 
---
 tools/virsh-pool.c | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 885e000ed2..622b1396d0 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -330,9 +330,10 @@ virshBuildPoolXML(vshControl *ctl,
 VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid");
 
 if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0)
-goto cleanup;
+return false;
+
 if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0)
-goto cleanup;
+return false;
 
 if (vshCommandOptStringReq(ctl, cmd, "source-host", &srcHost) < 0 ||
 vshCommandOptStringReq(ctl, cmd, "source-path", &srcPath) < 0 ||
@@ -351,8 +352,9 @@ virshBuildPoolXML(vshControl *ctl,
 vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwnn", 
&adapterParentWwnn) < 0 ||
 vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwpn", 
&adapterParentWwpn) < 0 ||
 vshCommandOptStringReq(ctl, cmd, "adapter-parent-fabric-wwn", 
&adapterParentFabricWwn) < 0 ||
-vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 0)
-goto cleanup;
+vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 
0) {
+return false;
+}
 
 virBufferAsprintf(&buf, "\n", type);
 virBufferAdjustIndent(&buf, 2);
@@ -419,9 +421,6 @@ virshBuildPoolXML(vshControl *ctl,
 *xml = virBufferContentAndReset(&buf);
 *retname = name;
 return true;
-
- cleanup:
-return false;
 }
 
 /*
-- 
2.25.4