[PATCH 2/4] vsh: adjust vshInit signature and remove redundant error label

[Erik Skultety <eskultet@xxxxxxxxxx>]

As part of the effort to stay consistent, change the vshInit signature
from returning int to returning bool. Moreover, remove the
unnecessary error label as there is no cleanup that would make use of
it.
---
 tools/virsh.c |  2 +-
 tools/vsh.c   | 14 +++++---------
 tools/vsh.h   |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index a71cd47..5317be8 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -905,7 +905,7 @@ main(int argc, char **argv)
     if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")))
         ctl->connname = vshStrdup(ctl, defaultConn);
 
-    if (vshInit(ctl, cmdGroups, NULL) < 0)
+    if (!vshInit(ctl, cmdGroups, NULL))
         exit(EXIT_FAILURE);
 
     if (!virshParseArgv(ctl, argc, argv) ||
diff --git a/tools/vsh.c b/tools/vsh.c
index 54c4614..e6ecc03 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2714,20 +2714,18 @@ vshInitDebug(vshControl *ctl)
 /*
  * Initialize global data
  */
-int
+bool
 vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set)
 {
-    int ret = -1;
-
     if (!ctl->hooks) {
         vshError(ctl, "%s", _("client hooks cannot be NULL"));
-        goto error;
+        return false;
     }
 
     if (!groups && !set) {
         vshError(ctl, "%s", _("command groups and command set "
                               "cannot both be NULL"));
-        goto error;
+        return false;
     }
 
     cmdGroups = groups;
@@ -2735,11 +2733,9 @@ vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set)
     vshInitDebug(ctl);
 
     if (ctl->imode && vshReadlineInit(ctl) < 0)
-        goto error;
+        return false;
 
-    ret = 0;
- error:
-    return ret;
+    return true;
 }
 
 void
diff --git a/tools/vsh.h b/tools/vsh.h
index 37416c7..e2e33ba 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -302,7 +302,7 @@ int vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout);
 
 void vshPrintExtra(vshControl *ctl, const char *format, ...)
     ATTRIBUTE_FMT_PRINTF(2, 3);
-int vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set);
+bool vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set);
 void vshDeinit(vshControl *ctl);
 void vshInitDebug(vshControl *ctl);
 void vshDebug(vshControl *ctl, int level, const char *format, ...)
-- 
2.4.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list