From 129590d5115c7ccb04cf1be7e111682536f90410 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 22 Mar 2021 17:00:41 +0100 Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: use g_strsplit instead of virStringSplitCount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Count the elements directly using g_strv_length. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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);