From nobody Mon Feb 9 00:26:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1691059001; cv=none; d=zohomail.com; s=zohoarc; b=CS2cEYuC049sxTP/Lqb6qA5AxXSvKEF+5ptZt91qps3Cuc55Pd+O8Fr/7LzViy0EQ7r/u1L9YU9Pr7rnCROLbaErVqRdMBDaXPBgFrF+39WXqbl9+zFSYDExSSeFmqv+Rt3mkRyvbxgjfh6E6i6C5SjntuN47jRexdelb1rIi4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691059001; 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=Ug49Nvq2zJgOt6XiWK/SMMuRyl6AqpLNuxwpTYFzmEA=; b=P2m0ufwU99WNkuofJ+yimM5YmagbCAQxoN0oc8/0eaxk4FL385M8IbGYZiTq4N4CLmsWvg2hG85raqeN3lUbrKQJVifOdJz69SFNGOMnxV8cjE9RIXDAZrlzXGJ7x3iFBiUYrwL8IblZB/4pnJiPQs3EqY+ZMGUAnkl7ic7qmwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 169105900163489.53226482614093; Thu, 3 Aug 2023 03:36:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-fgTs3dwpMH2ZonA08qX0rA-1; Thu, 03 Aug 2023 06:36:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B1D9D830DB6; Thu, 3 Aug 2023 10:36:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 889A6492CB1; Thu, 3 Aug 2023 10:36:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9C3E1947223; Thu, 3 Aug 2023 10:36:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B99051947226 for ; Thu, 3 Aug 2023 10:36:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 96BA3F77BD; Thu, 3 Aug 2023 10:36:24 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DE5AF7FA6 for ; Thu, 3 Aug 2023 10:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691059000; 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=Ug49Nvq2zJgOt6XiWK/SMMuRyl6AqpLNuxwpTYFzmEA=; b=g7qnU638TDd+lnsqyVgV4aUuWC369mbC+DbBYuXAIC2UzSQQNIlddquI6VbEdEfAvFGQVX XQB8jCMZtIZlJ/ZCExzZx2YLUsCih2rDEDE0H3CuK2IlRdOnqG60tH/mY2GPJ4FL3kEche ac1xF2SC31Y4Bjg9eRUvFeUUIlPwuyU= X-MC-Unique: fgTs3dwpMH2ZonA08qX0rA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 03/13] Decrease scope of some variables Date: Thu, 3 Aug 2023 12:36:10 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1691059002785100003 Content-Type: text/plain; charset="utf-8"; x-default="true" There are couple of variables that are declared at function beginning but then used solely within a block (either for() loop or if() statement). And just before their use they are zeroed explicitly using memset(). Decrease their scope, use struct zero initializer and drop explicit memset(). Signed-off-by: Michal Privoznik Reviewed-by: Claudio Fontana --- src/qemu/qemu_driver.c | 4 +--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetsshsession.c | 5 ++--- src/util/virnetdevmacvlan.c | 3 +-- src/util/virnetdevtap.c | 6 ++---- src/util/viruuid.c | 4 ++-- tests/virnetsockettest.c | 7 ++----- tools/virsh-domain-monitor.c | 7 ++----- 8 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 497923ffee..1d7b78d73b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17124,7 +17124,6 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver G= _GNUC_UNUSED, unsigned int privflags G_GNUC_UNUSED) { size_t i; - struct _virDomainInterfaceStats tmp; =20 if (!virDomainObjIsActive(dom)) return 0; @@ -17135,12 +17134,11 @@ qemuDomainGetStatsInterface(virQEMUDriver *driver= G_GNUC_UNUSED, for (i =3D 0; i < dom->def->nnets; i++) { virDomainNetDef *net =3D dom->def->nets[i]; virDomainNetType actualType; + struct _virDomainInterfaceStats tmp =3D { 0 }; =20 if (!net->ifname) continue; =20 - memset(&tmp, 0, sizeof(tmp)); - actualType =3D virDomainNetGetActualType(net); =20 virTypedParamListAddString(params, net->ifname, "net.%zu.name", i); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 65ec239fb7..d775f65fe2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3728,8 +3728,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_dat= a *priv, remote_auth_sasl_init_ret iret; remote_auth_sasl_start_args sargs =3D {0}; remote_auth_sasl_start_ret sret; - remote_auth_sasl_step_args pargs =3D {0}; - remote_auth_sasl_step_ret pret; const char *clientout; char *serverin =3D NULL; size_t clientoutlen, serverinlen; @@ -3866,6 +3864,9 @@ remoteAuthSASL(virConnectPtr conn, struct private_dat= a *priv, * Even if the server has completed, the client must *always* do at le= ast one step * in this loop to verify the server isn't lying about something. Mutu= al auth */ for (;;) { + remote_auth_sasl_step_args pargs =3D { 0 }; + remote_auth_sasl_step_ret pret =3D { 0 }; + if ((err =3D virNetSASLSessionClientStep(sasl, serverin, serverinlen, @@ -3893,14 +3894,12 @@ remoteAuthSASL(virConnectPtr conn, struct private_d= ata *priv, =20 /* Not done, prepare to talk with the server for another iteration= */ /* NB, distinction of NULL vs "" is *critical* in SASL */ - memset(&pargs, 0, sizeof(pargs)); pargs.nil =3D clientout ? 0 : 1; pargs.data.data_val =3D (char*)clientout; pargs.data.data_len =3D clientoutlen; VIR_DEBUG("Server step with %zu bytes %p", clientoutlen, clientout); =20 - memset(&pret, 0, sizeof(pret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_SASL_STEP, (xdrproc_t) xdr_remote_auth_sasl_step_args, (char *) &par= gs, (xdrproc_t) xdr_remote_auth_sasl_step_ret, (char *) &pret= ) !=3D 0) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 1df43bb044..98be120a11 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -271,7 +271,6 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) size_t keyLength; char *errmsg; g_auto(virBuffer) buff =3D VIR_BUFFER_INITIALIZER; - virConnectCredential askKey; struct libssh2_knownhost *knownHostEntry =3D NULL; size_t i; char *hostnameStr =3D NULL; @@ -303,6 +302,8 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) case LIBSSH2_KNOWNHOST_CHECK_NOTFOUND: /* key was not found, query to add it to database */ if (sess->hostKeyVerify =3D=3D VIR_NET_SSH_HOSTKEY_VERIFY_NORMAL) { + virConnectCredential askKey =3D { 0 }; + /* ask to add the key */ if (!sess->cred || !sess->cred->cb) { virReportError(VIR_ERR_SSH, "%s", @@ -312,8 +313,6 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) } =20 /* prepare data for the callback */ - memset(&askKey, 0, sizeof(virConnectCredential)); - for (i =3D 0; i < sess->cred->ncredtype; i++) { if (sess->cred->credtype[i] =3D=3D VIR_CRED_ECHOPROMPT) break; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index db5f41bae8..cde9d70eef 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -217,12 +217,11 @@ int virNetDevMacVLanTapSetup(int *tapfd, size_t tapfdSize, bool vnet_hdr) { unsigned int features; - struct ifreq ifreq; short new_flags =3D 0; size_t i; =20 for (i =3D 0; i < tapfdSize; i++) { - memset(&ifreq, 0, sizeof(ifreq)); + struct ifreq ifreq =3D { 0 }; =20 if (ioctl(tapfd[i], TUNGETIFF, &ifreq) < 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index b85b753c96..3e25f18770 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -172,7 +172,6 @@ int virNetDevTapCreate(char **ifname, unsigned int flags) { size_t i =3D 0; - struct ifreq ifr; int rc; int ret =3D -1; int fd =3D -1; @@ -204,8 +203,9 @@ int virNetDevTapCreate(char **ifname, if (!tunpath) tunpath =3D "/dev/net/tun"; =20 - memset(&ifr, 0, sizeof(ifr)); for (i =3D 0; i < tapfdSize; i++) { + struct ifreq ifr =3D { 0 }; + if ((fd =3D open(tunpath, O_RDWR)) < 0) { virReportSystemError(errno, _("Unable to open %1$s, is tun module loa= ded?"), @@ -213,8 +213,6 @@ int virNetDevTapCreate(char **ifname, goto cleanup; } =20 - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags =3D IFF_TAP | IFF_NO_PI; /* If tapfdSize is greater than one, request multiqueue */ if (tapfdSize > 1) diff --git a/src/util/viruuid.c b/src/util/viruuid.c index ca22c91d48..a4f3a50fa5 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -215,13 +215,13 @@ int virSetHostUUIDStr(const char *uuid) { int rc; - char dmiuuid[VIR_UUID_STRING_BUFLEN]; =20 if (virUUIDIsValid(host_uuid)) return EEXIST; =20 if (!uuid) { - memset(dmiuuid, 0, sizeof(dmiuuid)); + char dmiuuid[VIR_UUID_STRING_BUFLEN] =3D { 0 }; + if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid))) { if (!virUUIDParse(dmiuuid, host_uuid)) return 0; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 2295e29777..0e9cd8a81c 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -44,8 +44,6 @@ static int checkProtocols(bool *hasIPv4, bool *hasIPv6, int *freePort) { - struct sockaddr_in in4; - struct sockaddr_in6 in6; size_t i; =20 *freePort =3D 0; @@ -53,6 +51,8 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, return -1; =20 for (i =3D 0; i < 50; i++) { + struct sockaddr_in in4 =3D { 0 }; + struct sockaddr_in6 in6 =3D { 0 }; VIR_AUTOCLOSE s4 =3D -1; VIR_AUTOCLOSE s6 =3D -1; =20 @@ -71,9 +71,6 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, return -1; } =20 - memset(&in4, 0, sizeof(in4)); - memset(&in6, 0, sizeof(in6)); - in4.sin_family =3D AF_INET; in4.sin_port =3D htons(BASE_PORT + i); in4.sin_addr.s_addr =3D htonl(INADDR_LOOPBACK); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index ec99b9f99a..c74fc19347 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -444,7 +444,6 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, static bool cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) { - virDomainBlockInfo info; g_autoptr(virshDomain) dom =3D NULL; bool human =3D false; bool all =3D false; @@ -491,6 +490,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) g_autofree char *cap =3D NULL; g_autofree char *alloc =3D NULL; g_autofree char *phy =3D NULL; + virDomainBlockInfo info =3D { 0 }; =20 ctxt->node =3D disks[i]; protocol =3D virXPathString("string(./source/@protocol)", ctxt= ); @@ -513,10 +513,6 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) return false; } } - } else { - /* if we don't call virDomainGetBlockInfo() who clears 'in= fo' - * we have to do it manually */ - memset(&info, 0, sizeof(info)); } =20 if (!cmdDomblkinfoGet(&info, &cap, &alloc, &phy, human)) @@ -531,6 +527,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) g_autofree char *cap =3D NULL; g_autofree char *alloc =3D NULL; g_autofree char *phy =3D NULL; + virDomainBlockInfo info =3D { 0 }; =20 if (virDomainGetBlockInfo(dom, device, &info, 0) < 0) return false; --=20 2.41.0