[PATCH 13/39] virLogParseOutputs: Refactor string list handling

Peter Krempa pkrempa at redhat.com
Thu Apr 1 13:52:12 UTC 2021


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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/util/virlog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 004792db01..56059f62f1 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1612,22 +1612,22 @@ virLogParseOutputs(const char *src, virLogOutputPtr **outputs)
 {
     int at = -1;
     size_t noutputs = 0;
-    size_t i, count;
     g_auto(GStrv) strings = NULL;
+    GStrv next;
     virLogOutputPtr output = NULL;
     virLogOutputPtr *list = NULL;

     VIR_DEBUG("outputs=%s", src);

-    if (!(strings = virStringSplitCount(src, " ", 0, &count)))
+    if (!(strings = g_strsplit(src, " ", 0)))
         return -1;

-    for (i = 0; i < count; i++) {
+    for (next = strings; *next; next++) {
         /* virStringSplit may return empty strings */
-        if (STREQ(strings[i], ""))
+        if (STREQ(*next, ""))
             continue;

-        if (!(output = virLogParseOutput(strings[i])))
+        if (!(output = virLogParseOutput(*next)))
             return -1;

         /* let's check if a duplicate output does not already exist in which
-- 
2.29.2




More information about the libvir-list mailing list