NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vsh: remove pointless cleanup labels

Browse Source 
Remove cleanup sections that are no longer needed, as well
as unnecessary 'ret' variables.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2021-08-10 17:12:02 +02:00
parent 13896b5ad1
commit 4d64c850c4
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/vsh.c
View File

@ -2396,7 +2396,6 @@ vshEditFile(vshControl *ctl, const char *filename)
{ {
const char *editor; const char *editor;
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;
int ret = -1;
int outfd = STDOUT_FILENO; int outfd = STDOUT_FILENO;
int errfd = STDERR_FILENO; int errfd = STDERR_FILENO;
@ -2434,12 +2433,9 @@ vshEditFile(vshControl *ctl, const char *filename)
if (virCommandRunAsync(cmd, NULL) < 0 || if (virCommandRunAsync(cmd, NULL) < 0 ||
virCommandWait(cmd, NULL) < 0) { virCommandWait(cmd, NULL) < 0) {
vshReportError(ctl); vshReportError(ctl);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
char * char *
@ -2796,7 +2792,6 @@ vshReadlineInit(vshControl *ctl)
{ {
g_autofree char *userdir = NULL; g_autofree char *userdir = NULL;
int max_history = 500; int max_history = 500;
int ret = -1;
g_autofree char *histsize_env = NULL; g_autofree char *histsize_env = NULL;
const char *histsize_str = NULL; const char *histsize_str = NULL;
const char *break_characters = " \t\n`@$><=;|&{("; const char *break_characters = " \t\n`@$><=;|&{(";
@ -2821,12 +2816,12 @@ vshReadlineInit(vshControl *ctl)
if ((histsize_str = getenv(histsize_env))) { if ((histsize_str = getenv(histsize_env))) {
if (virStrToLong_i(histsize_str, NULL, 10, &max_history) < 0) { if (virStrToLong_i(histsize_str, NULL, 10, &max_history) < 0) {
vshError(ctl, _("Bad $%s value."), histsize_env); vshError(ctl, _("Bad $%s value."), histsize_env);
goto cleanup; return -1;
} else if (max_history > HISTSIZE_MAX || max_history < 0) { } else if (max_history > HISTSIZE_MAX || max_history < 0) {
vshError(ctl, _("$%s value should be between 0 " vshError(ctl, _("$%s value should be between 0 "
"and %d"), "and %d"),
histsize_env, HISTSIZE_MAX); histsize_env, HISTSIZE_MAX);
goto cleanup; return -1;
} }
} }
stifle_history(max_history); stifle_history(max_history);
@ -2841,10 +2836,7 @@ vshReadlineInit(vshControl *ctl)
ctl->historyfile = g_strdup_printf("%s/history", ctl->historydir); ctl->historyfile = g_strdup_printf("%s/history", ctl->historydir);
read_history(ctl->historyfile); read_history(ctl->historyfile);
ret = 0; return 0;
cleanup:
return ret;
} }
static void static void