External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmdStartGetFDs: Modernize

Browse Source 
Calculate the length of the FD list beforehand to avoid multiple
expansions and mainly simplify the code and use automatic freeing to
remove the error code path.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-27 17:14:32 +01:00
parent c98432784a
commit b0015df263
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/virsh-domain.c
View File

@ -4025,7 +4025,7 @@ cmdStartGetFDs(vshControl *ctl,
{
const char *fdopt;
g_auto(GStrv) fdlist = NULL;
int *fds = NULL;
g_autofree int *fds = NULL;
size_t nfds = 0;
size_t i;
@ -4040,23 +4040,19 @@ cmdStartGetFDs(vshControl *ctl,
return -1;
}
for (i = 0; fdlist[i] != NULL; i++) {
int fd;
if (virStrToLong_i(fdlist[i], NULL, 10, &fd) < 0) {
nfds = g_strv_length(fdlist);
fds = g_new0(int, nfds);
for (i = 0; i < nfds; i++) {
if (virStrToLong_i(fdlist[i], NULL, 10, fds + i) < 0) {
vshError(ctl, _("Unable to parse FD number '%s'"), fdlist[i]);
goto error;
return -1;
}
VIR_EXPAND_N(fds, nfds, 1);
fds[nfds - 1] = fd;
}
*fdsret = fds;
*fdsret = g_steal_pointer(&fds);
*nfdsret = nfds;
return 0;
error:
VIR_FREE(fds);
return -1;
}
static bool