shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

vsh: adjust vshInit signature and remove redundant error label

Browse Source 
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.
This commit is contained in:
Erik Skultety 2015-09-03 16:52:44 +02:00
parent 6ce939c247
commit 57b8a38840
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/virsh.c
View File

@ -904,7 +904,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) ||

14
tools/vsh.c
View File

@ -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

2
tools/vsh.h
View File

@ -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, ...)