From: Peter Krempa Date: Thu, 1 Apr 2021 13:33:22 +0000 (+0200) Subject: xenParsePCI: Replace virStringSplitCount by g_strsplit X-Git-Tag: v7.3.0-rc1~282 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b92695908484e36c8c267f49693b8eeedd583c22;p=thirdparty%2Flibvirt.git xenParsePCI: Replace virStringSplitCount by g_strsplit Count the number of elements in place just for the check. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 835f48ec42..49a816add2 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -372,7 +372,6 @@ xenParsePCI(char *entry) virDomainHostdevDefPtr hostdev = NULL; g_auto(GStrv) tokens = NULL; g_auto(GStrv) options = NULL; - size_t ntokens = 0; size_t nexttoken = 0; char *str; char *nextstr; @@ -383,11 +382,11 @@ xenParsePCI(char *entry) virTristateBool filtered = VIR_TRISTATE_BOOL_ABSENT; /* pci=['00:1b.0','0000:00:13.0,permissive=1'] */ - if (!(tokens = virStringSplitCount(entry, ":", 3, &ntokens))) + if (!(tokens = g_strsplit(entry, ":", 3))) return NULL; /* domain */ - if (ntokens == 3) { + if (g_strv_length(tokens) == 3) { if (virStrToLong_i(tokens[nexttoken], NULL, 16, &domain) < 0) return NULL; nexttoken++;