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

virStorageSourceParseBackingJSONUriCookies: 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/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c
index bac5a043e5..9a67d64fd6 100644
--- a/src/storage_file/storage_source_backingstore.c
+++ b/src/storage_file/storage_source_backingstore.c
@@ -483,7 +483,6 @@ virStorageSourceParseBackingJSONUriCookies(virStorageSourcePtr src,
 {
     const char *cookiestr;
     g_auto(GStrv) cookies = NULL;
-    size_t ncookies = 0;
     size_t i;
 
     if (!virJSONValueObjectHasKey(json, "cookie"))
@@ -496,13 +495,13 @@ virStorageSourceParseBackingJSONUriCookies(virStorageSourcePtr src,
         return -1;
     }
 
-    if (!(cookies = virStringSplitCount(cookiestr, ";", 0, &ncookies)))
+    if (!(cookies = g_strsplit(cookiestr, ";", 0)))
         return -1;
 
-    src->cookies = g_new0(virStorageNetCookieDefPtr, ncookies);
-    src->ncookies = ncookies;
+    src->ncookies = g_strv_length(cookies);
+    src->cookies = g_new0(virStorageNetCookieDefPtr, src->ncookies);
 
-    for (i = 0; i < ncookies; i++) {
+    for (i = 0; i < src->ncookies; i++) {
         char *cookiename = cookies[i];
         char *cookievalue;