External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virSystemdActivationInitFromNames: Replace virStringSplit by g_strsplit

Browse Source 
While the code invokes the string list length calculation twice, it
happens only on error path, which by itself should never happen.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-01 15:35:39 +02:00
parent d5c9d168c4
commit cb94aed2cb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virsystemd.c
View File

@ -754,19 +754,18 @@ virSystemdActivationInitFromNames(virSystemdActivationPtr act,
{
g_auto(GStrv) fdnamelistptr = NULL;
char **fdnamelist;
size_t nfdnames;
size_t i;
int nextfd = STDERR_FILENO + 1;
VIR_DEBUG("FD names %s", fdnames);
if (!(fdnamelistptr = virStringSplitCount(fdnames, ":", 0, &nfdnames)))
if (!(fdnamelistptr = g_strsplit(fdnames, ":", 0)))
goto error;
if (nfdnames != nfds) {
if (g_strv_length(fdnamelistptr) != nfds) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting %d FD names but got %zu"),
nfds, nfdnames);
_("Expecting %d FD names but got %u"),
nfds, g_strv_length(fdnamelistptr));
goto error;
}