From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Mar 2021 16:00:41 +0000 (+0100)
Subject: virDomainDiskAddISCSIPoolSourceHost: use g_strsplit instead of virStringSplitCount
X-Git-Tag: v7.3.0-rc1~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129590d5115c7ccb04cf1be7e111682536f90410;p=thirdparty%2Flibvirt.git

virDomainDiskAddISCSIPoolSourceHost: use g_strsplit instead of virStringSplitCount

Count the elements directly using g_strv_length.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 83415f9271..e2427848ed 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -32117,7 +32117,6 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
                                     virStoragePoolDefPtr pooldef)
 {
     g_auto(GStrv) tokens = NULL;
-    size_t ntokens;
 
     /* Only support one host */
     if (pooldef->source.nhost != 1) {
@@ -32138,10 +32137,10 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
         src->hosts[0].port = 3260;
 
     /* iscsi volume has name like "unit:0:0:1" */
-    if (!(tokens = virStringSplitCount(src->srcpool->volume, ":", 0, &ntokens)))
+    if (!(tokens = g_strsplit(src->srcpool->volume, ":", 0)))
         return -1;
 
-    if (ntokens != 4) {
+    if (g_strv_length(tokens) != 4) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected iscsi volume name '%s'"),
                        src->srcpool->volume);