From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Mar 2021 16:38:24 +0000 (+0100)
Subject: virLogParseFilters: Refactor string list handling
X-Git-Tag: v7.3.0-rc1~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa71d30285b702fb860506b04fdd24532dbb104;p=thirdparty%2Flibvirt.git

virLogParseFilters: Refactor string list handling

Rewrite the code to remove the need to calculate the string list count.

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

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 3fadf7fc4a..d1ccba3e5d 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1668,22 +1668,22 @@ int
 virLogParseFilters(const char *src, virLogFilterPtr **filters)
 {
     size_t nfilters = 0;
-    size_t i, count;
     g_auto(GStrv) strings = NULL;
+    GStrv next;
     virLogFilterPtr filter = NULL;
     virLogFilterPtr *list = NULL;
 
     VIR_DEBUG("filters=%s", src);
 
-    if (!(strings = virStringSplitCount(src, " ", 0, &count)))
+    if (!(strings = g_strsplit(src, " ", 0)))
         return -1;
 
-    for (i = 0; i < count; i++) {
-        /* virStringSplit may return empty strings */
-        if (STREQ(strings[i], ""))
+    for (next = strings; *next; next++) {
+        /* g_strsplit may return empty strings */
+        if (STREQ(*next, ""))
             continue;
 
-        if (!(filter = virLogParseFilter(strings[i])))
+        if (!(filter = virLogParseFilter(*next)))
             return -1;
 
         if (VIR_APPEND_ELEMENT(list, nfilters, filter)) {