Replace virStringListLength by g_strv_length

The glib implementation doesn't tolerate NULL but in most cases we check
before anyways. The rest of the callers adds a NULL check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 6da84535baaea088dfde69f41213d512fb296a8d..52bde40a15f293689d078f25cd52df47d3b6a806 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -635,7 +635,7 @@ virCPUarmDecode(virCPUDefPtr cpu,
         cpu->vendor = g_strdup(vendor->name);
 
     if (cpuData->features) {
-        cpu->nfeatures = virStringListLength((const char **)cpuData->features);
+        cpu->nfeatures = g_strv_length(cpuData->features);
         cpu->features = g_new0(virCPUFeatureDef, cpu->nfeatures);
 
         for (i = 0; i < cpu->nfeatures; i++) {

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 35d0b6515c4c64dfa08ddf17b0ce0fd4134a3a6b..2bbc75024ce32685c67662d8b6ab1fb6b9769216 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -648,7 +648,7 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg,
         }
         VIR_FREE(cfg->hugetlbfs);
 
-        cfg->nhugetlbfs = virStringListLength((const char *const *)hugetlbfs);
+        cfg->nhugetlbfs = g_strv_length(hugetlbfs);
         if (hugetlbfs[0])
             cfg->hugetlbfs = g_new0(virHugeTLBFS, cfg->nhugetlbfs);
 
@@ -847,7 +847,7 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg,
             return 0;
         }
 
-        cfg->nfirmwares = virStringListLength((const char *const *)nvram);
+        cfg->nfirmwares = g_strv_length(nvram);
         cfg->firmwares = g_new0(virFirmwarePtr, cfg->nfirmwares);
 
         for (i = 0; nvram[i] != NULL; i++) {

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index e6541d505ed2916e9bad2deb8ec0ae2e05f32366..c571fdecf71345058bc8b017c307c35fe5e60813 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1191,7 +1191,10 @@ qemuFirmwareFetchParsedConfigs(bool privileged,
     if (qemuFirmwareFetchConfigs(&paths, privileged) < 0)
         return -1;
 
-    npaths = virStringListLength((const char **)paths);
+    if (!paths)
+        return 0;
+
+    npaths = g_strv_length(paths);
 
     firmwares = g_new0(qemuFirmwarePtr, npaths);
 

diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c
index 5ceefbe4560e78bffc48dddb315ed2e1a4a4e354..a9f6f3192d696a8ba6654d04c9a8263aa574839e 100644 (file)
--- a/src/qemu/qemu_vhost_user.c
+++ b/src/qemu/qemu_vhost_user.c
@@ -250,8 +250,10 @@ qemuVhostUserFetchParsedConfigs(bool privileged,
     if (qemuVhostUserFetchConfigs(&paths, privileged) < 0)
         return -1;
 
-    npaths = virStringListLength((const char **)paths);
+    if (!paths)
+        return 0;
 
+    npaths = g_strv_length(paths);
     vus = g_new0(qemuVhostUserPtr, npaths);
 
     for (i = 0; i < npaths; i++) {

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 0523bf9afb87b9c7fbe6e82a8e456bbe1b232b3e..4c27f9d77106376554ec57939c17f07efd92b51d 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1013,7 +1013,8 @@ int virProcessGetStartTime(pid_t pid,
 
     tokens = virStringSplit(tmp, " ", 0);
 
-    if (virStringListLength((const char * const *)tokens) < 20) {
+    if (!tokens ||
+        g_strv_length(tokens) < 20) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Cannot find start time in %s"),
                        filename);

diff --git a/src/util/virstring.c b/src/util/virstring.c
index c0393585e238e7886dfef0642dda33fa5c2bef10..1fd61650be5b130c2c02f3ce917c9a52e678db60 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -182,8 +182,8 @@ virStringListMerge(char ***dst,
     if (!src || !*src)
         return 0;
 
-    dst_len = virStringListLength((const char **) *dst);
-    src_len = virStringListLength((const char **) *src);
+    dst_len = g_strv_length(*dst);
+    src_len = g_strv_length(*src);
 
     if (VIR_REALLOC_N(*dst, dst_len + src_len + 1) < 0)
         return -1;

diff --git a/tests/virconftest.c b/tests/virconftest.c
index 8269730662ee6d6b89186ffd71b67f1bc8bf8337..7a759db014b92d3b2241ef1a2fbaed1b1583f9a3 100644 (file)
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -394,7 +394,7 @@ static int testConfParseStringList(const void *opaque G_GNUC_UNUSED)
     if (virConfGetValueStringList(conf, "string_list", false, &str) < 0)
         goto cleanup;
 
-    if (virStringListLength((const char *const*)str) != 2) {
+    if (!str || g_strv_length(str) != 2) {
         fprintf(stderr, "expected a 2 element list\n");
         goto cleanup;
     }
@@ -418,7 +418,7 @@ static int testConfParseStringList(const void *opaque G_GNUC_UNUSED)
     if (virConfGetValueStringList(conf, "string", true, &str) < 0)
         goto cleanup;
 
-    if (virStringListLength((const char *const*)str) != 1) {
+    if (!str || g_strv_length(str) != 1) {
         fprintf(stderr, "expected a 1 element list\n");
         goto cleanup;
     }

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 9eabb5b299b6b40a267aac398e28bb1ba06a277c..238cb9d79eac81e782ec0522ecd3cb956d780386 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -243,10 +243,10 @@ testStringSearch(const void *opaque)
             goto cleanup;
         }
 
-        if (virStringListLength((const char * const *)matches) != nmatches) {
-            fprintf(stderr, "expected %zu matches on %s but got %zd matches\n",
+        if (g_strv_length(matches) != nmatches) {
+            fprintf(stderr, "expected %zu matches on %s but got %u matches\n",
                     data->expectNMatches, data->str,
-                    virStringListLength((const char * const *)matches));
+                    g_strv_length(matches));
             goto cleanup;
         }
 

diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index fb42358bd027676fd21518969b9e17cf94275a48..d3923c4bc7cb993a2fd3a2324420417edd4441b1 100644 (file)
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -87,7 +87,7 @@ char **
 virshCommaStringListComplete(const char *input,
                              const char **options)
 {
-    const size_t optionsLen = virStringListLength(options);
+    const size_t optionsLen = g_strv_length((char **) options);
     g_autofree char *inputCopy = NULL;
     g_auto(GStrv) inputList = NULL;
     g_auto(GStrv) ret = NULL;

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 98a87dd43cbcd814cbe11093c1336e6d27720141..05d79a784387148cbd3cf6a58a8c014b341ec02f 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -14391,7 +14391,7 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cmd)
         if (!(keys = virStringSplit(buffer, "\n", -1)))
             goto cleanup;
 
-        nkeys = virStringListLength((const char **) keys);
+        nkeys = g_strv_length(keys);
         if (nkeys == 0) {
             vshError(ctl, _("File %s contains no keys"), from);
             goto cleanup;

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index ba524523f5d5dc18197920503ad0de636afec99e..747d355456b8ce08f67fe3f4151db5bc65907c14 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -1325,7 +1325,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
         return false;
 
     result = virConnectBaselineCPU(priv->conn, (const char **)list,
-                                   virStringListLength((const char **)list),
+                                   g_strv_length(list),
                                    flags);
 
     if (result) {
@@ -1798,7 +1798,7 @@ cmdHypervisorCPUBaseline(vshControl *ctl,
     result = virConnectBaselineHypervisorCPU(priv->conn, emulator, arch,
                                              machine, virttype,
                                              (const char **)list,
-                                             virStringListLength((const char **)list),
+                                             g_strv_length(list),
                                              flags);
 
     if (result) {

diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c
index 0522896eeeea7a2ac53651129e2a9f62ff6854a1..1ac02bed00ee55c8089fbeed9198135de97728f7 100644 (file)
--- a/tools/virt-login-shell-helper.c
+++ b/tools/virt-login-shell-helper.c
@@ -103,7 +103,7 @@ static int virLoginShellGetShellArgv(virConfPtr conf,
         (*shargv)[0] = g_strdup("/bin/sh");
         *shargvlen = 1;
     } else {
-        *shargvlen = virStringListLength((const char *const *)*shargv);
+        *shargvlen = g_strv_length(*shargv);
     }
     return 0;
 }

diff --git a/tools/vsh.c b/tools/vsh.c
index feddc9f13e834399125b1a8872239de880087aa6..68f04b21741eca67a8c9eb43495d47f78b8779d8 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2676,7 +2676,7 @@ vshCompleterFilter(char ***list,
     if (!list || !*list)
         return 0;
 
-    list_len = virStringListLength((const char **) *list);
+    list_len = g_strv_length(*list);
     newList = g_new0(char *, list_len + 1);
 
     for (i = 0; i < list_len; i++) {