From nobody Mon Feb 9 20:36:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612600564; cv=none; d=zohomail.com; s=zohoarc; b=XO1QkrA3ggbTsKw2AaXvk7wiigdpf5dJ3HmP7JT0P6JeesN2/CMRt2QNZcIRTCU8lw8ms0kkx2iIaVyycnoJfq6b+xfNDmWsJe/LwJ7P/2X/0vDba92LEKm9+ahgiQkbXe47wJWixqWMH+v4OZUDDxF3F2nlkcZVuKjGKLHde5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612600564; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QN0OprPbbXSS5wnGxS1/lvf8nr4WJ/IwIyqr1WQv0pA=; b=jOrdDlYMkiU+h0813FweFPUi0CI3VeDj3yYd9gLWVDMgHCiVHrsbwAJ9hR+Hz1iyiyKEW3Varbnxb5lPPpCFMKggU9OZmA6BTfop8m1YWQZsDjZYckFKXgGRi2xl2+x93RzdtF5oBTUDAhe5/EiaiuP+eF6eydY8lb1t2AvS27Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 16126005641771006.6457254808954; Sat, 6 Feb 2021 00:36:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-10--MXyNSxLNtO2ZA_WU56UyA-1; Sat, 06 Feb 2021 03:34:56 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40B0F100CCC0; Sat, 6 Feb 2021 08:34:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B4B81017CD0; Sat, 6 Feb 2021 08:34:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D722918077D3; Sat, 6 Feb 2021 08:34:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1168Ynpt005513 for ; Sat, 6 Feb 2021 03:34:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id BDB3960C7B; Sat, 6 Feb 2021 08:34:49 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id A366660C79 for ; Sat, 6 Feb 2021 08:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612600563; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QN0OprPbbXSS5wnGxS1/lvf8nr4WJ/IwIyqr1WQv0pA=; b=Nf3WCR58fSeeBZ/z7Y/Yurj80Q95zxUNu5pAohRTx6QXM0C/uMwhiRAPCBLh5rMl4h6T18 AVDAIztPofvAmFbxuNpTx22KjbWlrOMnKntQYfdJb3LFz99w4Z4XI7accL6JxZDxgHrmJV nOtT8PZqEa8wMeVS521rauhfwVFl0RI= X-MC-Unique: -MXyNSxLNtO2ZA_WU56UyA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 33/40] Replace virStringListLength by g_strv_length Date: Sat, 6 Feb 2021 09:32:55 +0100 Message-Id: <8e5e91b97532c023c1d6e74a3e5d870a1f22e667.1612599659.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- src/cpu/cpu_arm.c | 2 +- src/qemu/qemu_conf.c | 4 ++-- src/qemu/qemu_firmware.c | 5 ++++- src/qemu/qemu_vhost_user.c | 4 +++- src/util/virprocess.c | 3 ++- src/util/virstring.c | 4 ++-- tests/virconftest.c | 4 ++-- tests/virstringtest.c | 6 +++--- tools/virsh-completer.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh-host.c | 4 ++-- tools/virt-login-shell-helper.c | 2 +- tools/vsh.c | 2 +- 13 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 6ba5bf0724..a7aef29fe4 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -637,7 +637,7 @@ virCPUarmDecode(virCPUDefPtr cpu, cpu->vendor =3D g_strdup(vendor->name); if (cpuData->features) { - cpu->nfeatures =3D virStringListLength((const char **)cpuData->fea= tures); + cpu->nfeatures =3D g_strv_length(cpuData->features); cpu->features =3D g_new0(virCPUFeatureDef, cpu->nfeatures); for (i =3D 0; i < cpu->nfeatures; i++) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 35d0b6515c..2bbc75024c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -648,7 +648,7 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfig= Ptr cfg, } VIR_FREE(cfg->hugetlbfs); - cfg->nhugetlbfs =3D virStringListLength((const char *const *)huget= lbfs); + cfg->nhugetlbfs =3D g_strv_length(hugetlbfs); if (hugetlbfs[0]) cfg->hugetlbfs =3D g_new0(virHugeTLBFS, cfg->nhugetlbfs); @@ -847,7 +847,7 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPt= r cfg, return 0; } - cfg->nfirmwares =3D virStringListLength((const char *const *)nvram= ); + cfg->nfirmwares =3D g_strv_length(nvram); cfg->firmwares =3D g_new0(virFirmwarePtr, cfg->nfirmwares); for (i =3D 0; nvram[i] !=3D NULL; i++) { diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index e6541d505e..c571fdecf7 100644 --- 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 =3D virStringListLength((const char **)paths); + if (!paths) + return 0; + + npaths =3D g_strv_length(paths); firmwares =3D g_new0(qemuFirmwarePtr, npaths); diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 5ceefbe456..a9f6f3192d 100644 --- 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 =3D virStringListLength((const char **)paths); + if (!paths) + return 0; + npaths =3D g_strv_length(paths); vus =3D g_new0(qemuVhostUserPtr, npaths); for (i =3D 0; i < npaths; i++) { diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 0523bf9afb..4c27f9d771 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1013,7 +1013,8 @@ int virProcessGetStartTime(pid_t pid, tokens =3D 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 c0393585e2..1fd61650be 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -182,8 +182,8 @@ virStringListMerge(char ***dst, if (!src || !*src) return 0; - dst_len =3D virStringListLength((const char **) *dst); - src_len =3D virStringListLength((const char **) *src); + dst_len =3D g_strv_length(*dst); + src_len =3D 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 8269730662..7a759db014 100644 --- 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) !=3D 2) { + if (!str || g_strv_length(str) !=3D 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) !=3D 1) { + if (!str || g_strv_length(str) !=3D 1) { fprintf(stderr, "expected a 1 element list\n"); goto cleanup; } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 9eabb5b299..238cb9d79e 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -243,10 +243,10 @@ testStringSearch(const void *opaque) goto cleanup; } - if (virStringListLength((const char * const *)matches) !=3D nmatch= es) { - fprintf(stderr, "expected %zu matches on %s but got %zd matche= s\n", + if (g_strv_length(matches) !=3D 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 fb42358bd0..d3923c4bc7 100644 --- 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 =3D virStringListLength(options); + const size_t optionsLen =3D g_strv_length((char **) options); g_autofree char *inputCopy =3D NULL; g_auto(GStrv) inputList =3D NULL; g_auto(GStrv) ret =3D NULL; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 98a87dd43c..05d79a7843 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -14391,7 +14391,7 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cm= d) if (!(keys =3D virStringSplit(buffer, "\n", -1))) goto cleanup; - nkeys =3D virStringListLength((const char **) keys); + nkeys =3D g_strv_length(keys); if (nkeys =3D=3D 0) { vshError(ctl, _("File %s contains no keys"), from); goto cleanup; diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ba524523f5..747d355456 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1325,7 +1325,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) return false; result =3D 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 =3D virConnectBaselineHypervisorCPU(priv->conn, emulator, arch, machine, virttype, (const char **)list, - virStringListLength((const ch= ar **)list), + g_strv_length(list), flags); if (result) { diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helpe= r.c index 0522896eee..1ac02bed00 100644 --- 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] =3D g_strdup("/bin/sh"); *shargvlen =3D 1; } else { - *shargvlen =3D virStringListLength((const char *const *)*shargv); + *shargvlen =3D g_strv_length(*shargv); } return 0; } diff --git a/tools/vsh.c b/tools/vsh.c index 202bd564f7..4e76ad348a 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2704,7 +2704,7 @@ vshCompleterFilter(char ***list, if (!list || !*list) return -1; - list_len =3D virStringListLength((const char **) *list); + list_len =3D g_strv_length(*list); newList =3D g_new0(char *, list_len + 1); for (i =3D 0; i < list_len; i++) { --=20 2.29.2