External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virshParseRateStr: Refactor cleanup

Browse Source 
Use g_auto for the string list and remove 'ret' and 'cleanup'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-23 08:35:42 +01:00
parent 71eb5e10c0
commit d9c3b652ef
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh-domain.c
View File

@ -848,7 +848,7 @@ static const vshCmdOptDef opts_attach_interface[] = {
*tok[index] != '\0' && \
virStrToLong_ullp(tok[index], NULL, 10, &rate->name) < 0) { \
vshError(ctl, _("field '%s' is malformed"), #name); \
goto cleanup; \
return -1; \
} \
} while (0)
@ -857,16 +857,15 @@ virshParseRateStr(vshControl *ctl,
const char *rateStr,
virNetDevBandwidthRatePtr rate)
{
char **tok = NULL;
g_auto(GStrv) tok = NULL;
size_t ntok;
int ret = -1;
if (!(tok = virStringSplitCount(rateStr, ",", 0, &ntok)))
return -1;
if (ntok > 4) {
vshError(ctl, _("Rate string '%s' has too many fields"), rateStr);
goto cleanup;
return -1;
}
VIRSH_PARSE_RATE_FIELD(0, average);
@ -874,10 +873,7 @@ virshParseRateStr(vshControl *ctl,
VIRSH_PARSE_RATE_FIELD(2, burst);
VIRSH_PARSE_RATE_FIELD(3, floor);
ret = 0;
cleanup:
g_strfreev(tok);
return ret;
return 0;
}
#undef VIRSH_PARSE_RATE_FIELD