From aa8d253c1d78382c4b9a173efc4aad409e04a2b0 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 22 Mar 2021 17:38:24 +0100 Subject: [PATCH] virLogParseOutputs: Refactor string list handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Rewrite the code to remove the need to calculate the string list count. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/util/virlog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 004792db01..3fadf7fc4a 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++) { - /* 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 (!(output = virLogParseOutput(strings[i]))) + if (!(output = virLogParseOutput(*next))) return -1; /* let's check if a duplicate output does not already exist in which -- 2.47.2