From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Mar 2021 08:10:18 +0000 (+0100)
Subject: virshParseRateStr: Use g_strsplit instead of virStringSplitCount
X-Git-Tag: v7.3.0-rc1~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=def579e88a14c8d30bc7bae211a60c174b896db7;p=thirdparty%2Flibvirt.git

virshParseRateStr: Use g_strsplit instead of virStringSplitCount

Count the elements after splitting the string.

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

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 37be298809..532169d8d7 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -860,10 +860,10 @@ virshParseRateStr(vshControl *ctl,
     g_auto(GStrv) tok = NULL;
     size_t ntok;
 
-    if (!(tok = virStringSplitCount(rateStr, ",", 0, &ntok)))
+    if (!(tok = g_strsplit(rateStr, ",", 0)))
         return -1;
 
-    if (ntok > 4) {
+    if ((ntok = g_strv_length(tok)) > 4) {
         vshError(ctl, _("Rate string '%s' has too many fields"), rateStr);
         return -1;
     }