From nobody Sat Feb 7 14:27:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1596473956; cv=none; d=zohomail.com; s=zohoarc; b=njhUB1BPhtzfmrx14ZUsyC6Jn6sRDq2PLQ5JVllot5gGLAW6YsFriVp/pm7OKRiyxCkjC/oSHHUoQ+oIl3VKwUKhVr0Fcp1V8poR/Ddk2ka4WH22t9LYlG5Z2KGw1dlfo28JxcRCpmwQBZxBr2/UCBlYF/VhdRy9RU3awaSVNMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473956; 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=CMnDvAls0MUBDUADKVD7SmRGYgSWDRgDcOOA0KrwEbM=; b=PAEzP/NaJfPCFXJb3II1PJlyoVWBakRTb+gs+G+29XxoM+zStBXu8A4bw3kI7sBe8pXMXeRRA5/KPIB/nYoUWRkAjuZ5NHDwgaM1TCsg9qW9DVRP0j2YKwAklDjwsa+THXwVYmoR/KKbbFdcVV+ETQhYp3wfTiXzhOTObciXtyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159647395639271.03860091093611; Mon, 3 Aug 2020 09:59:16 -0700 (PDT) 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-304-A1D3iJl9NlGHlrp2E_mhZw-1; Mon, 03 Aug 2020 12:58:35 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B50331DFF; Mon, 3 Aug 2020 16:58:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93CE471782; Mon, 3 Aug 2020 16:58:25 +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 645AE9A11E; Mon, 3 Aug 2020 16:58:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvEqf007709 for ; Mon, 3 Aug 2020 12:57:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D827671770; Mon, 3 Aug 2020 16:57:14 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA45D7176F for ; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473955; 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=CMnDvAls0MUBDUADKVD7SmRGYgSWDRgDcOOA0KrwEbM=; b=IKSvEgeeeNS7pc8sU7ZbALG7VaVD8bVBWU/3UItwC7X8TAo3blJuVGTOA4ocBsNMTyNjEs JiEfz1oiDchTWbwvRtDqIJLX82haHniISYmtrXMAJtjhxjL77BVFIGECN8n1pfZrb9JFBH iU8QbdNT7GaVMAGFp0Et+AUTDkhwB0M= X-MC-Unique: A1D3iJl9NlGHlrp2E_mhZw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/19] Split declarations from initializations Date: Mon, 3 Aug 2020 18:56:43 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Split those initializations that depend on a statement above them. Signed-off-by: J=C3=A1n Tomko --- src/conf/network_conf.c | 4 +++- src/conf/nwfilter_conf.c | 5 ++++- src/lxc/lxc_controller.c | 6 ++++-- src/lxc/lxc_driver.c | 5 +++-- src/qemu/qemu_command.c | 8 ++++++-- src/qemu/qemu_process.c | 5 +++-- src/rpc/virnetmessage.c | 4 +++- src/rpc/virnetsocket.c | 9 ++++++--- src/util/virdaemon.c | 4 +++- src/util/virerror.c | 3 ++- src/util/virfile.c | 14 ++++++++++---- src/util/virkeycode.c | 4 +++- src/util/virnetlink.c | 10 +++++++--- src/util/virutil.c | 8 +++++--- tests/nodedevmdevctltest.c | 3 ++- tests/sockettest.c | 8 +++++--- tests/virrotatingfiletest.c | 7 +++++-- tools/virsh-domain.c | 8 +++++--- tools/virsh-volume.c | 5 +++-- tools/wireshark/src/packet-libvirt.c | 3 ++- 20 files changed, 84 insertions(+), 39 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index cd708e654f..d9a198a372 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1932,11 +1932,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, addrMatch =3D false; for (j =3D 0; j < nips; j++) { virNetworkIPDefPtr def2 =3D &def->ips[j]; + int prefix; + if (VIR_SOCKET_ADDR_FAMILY(gateway) !=3D VIR_SOCKET_ADDR_FAMILY(&def2->address)) { continue; } - int prefix =3D virNetworkIPDefPrefix(def2); + prefix =3D virNetworkIPDefPrefix(def2); virSocketAddrMaskByPrefix(&def2->address, prefix, &testAdd= r); virSocketAddrMaskByPrefix(gateway, prefix, &testGw); if (VIR_SOCKET_ADDR_VALID(&testAddr) && diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 02722abc32..779da3dddb 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2864,10 +2864,13 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, nwItemDesc *item; =20 while (att[i].name) { + virNWFilterEntryItemFlags flags; + VIR_WARNINGS_NO_CAST_ALIGN item =3D (nwItemDesc *)((char *)def + att[i].dataIdx); VIR_WARNINGS_RESET - virNWFilterEntryItemFlags flags =3D item->flags; + + flags =3D item->flags; if ((flags & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)) { if (!typeShown) { virBufferAsprintf(buf, "<%s", type); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ae6b737b60..0a496fb788 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1490,11 +1490,12 @@ static int virLXCControllerPopulateDevices(virLXCCo= ntrollerPtr ctrl) /* Populate /dev/ with a few important bits */ for (i =3D 0; i < G_N_ELEMENTS(devs); i++) { g_autofree char *path =3D NULL; + dev_t dev; =20 path =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def= ->name, devs[i].path); =20 - dev_t dev =3D makedev(devs[i].maj, devs[i].min); + dev =3D makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || chmod(path, devs[i].mode)) { virReportSystemError(errno, @@ -1990,11 +1991,12 @@ static int virLXCControllerMoveInterfaces(virLXCCon= trollerPtr ctrl) =20 for (i =3D 0; i < def->nhostdevs; i ++) { virDomainHostdevDefPtr hdev =3D def->hostdevs[i]; + virDomainHostdevCaps hdcaps; =20 if (hdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) continue; =20 - virDomainHostdevCaps hdcaps =3D hdev->source.caps; + hdcaps =3D hdev->source.caps; =20 if (hdcaps.type !=3D VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) continue; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1cdd6ee455..a530488dd2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1440,6 +1440,7 @@ static virSecurityManagerPtr lxcSecurityInit(virLXCDriverConfigPtr cfg) { unsigned int flags =3D VIR_SECURITY_MANAGER_PRIVILEGED; + virSecurityManagerPtr mgr; =20 VIR_INFO("lxcSecurityInit %s", cfg->securityDriverName); =20 @@ -1448,8 +1449,8 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg) if (cfg->securityRequireConfined) flags |=3D VIR_SECURITY_MANAGER_REQUIRE_CONFINED; =20 - virSecurityManagerPtr mgr =3D virSecurityManagerNew(cfg->securityDrive= rName, - LXC_DRIVER_NAME, fla= gs); + mgr =3D virSecurityManagerNew(cfg->securityDriverName, + LXC_DRIVER_NAME, flags); if (!mgr) goto error; =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0655d8359d..fa33c4ab28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4232,7 +4232,9 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, virDomainVideoDefPtr video, virQEMUCapsPtr qemuCaps) { + const char *dev; const char *vgastr =3D qemuVideoTypeToString(video->type); + if (!vgastr || STREQ(vgastr, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid model for video type '%s'"), @@ -4253,7 +4255,7 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, * See 'Graphics Devices' section in docs/qdev-device-use.txt in * QEMU repository. */ - const char *dev =3D qemuDeviceVideoTypeToString(video->type); + dev =3D qemuDeviceVideoTypeToString(video->type); =20 if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL && (video->vram || video->ram)) { @@ -4935,9 +4937,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (dev->data.nix.listen && (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { + int fd; + if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)de= f) < 0) return NULL; - int fd =3D qemuOpenChrChardevUNIXSocket(dev); + fd =3D qemuOpenChrChardevUNIXSocket(dev); if (qemuSecurityClearSocketLabel(secManager, (virDomainDefPtr)= def) < 0) { VIR_FORCE_CLOSE(fd); return NULL; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7c312efd8b..ad4f190b7e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5018,11 +5018,12 @@ qemuProcessSetupRawIO(virQEMUDriverPtr driver, /* If rawio not already set, check hostdevs as well */ if (!rawio) { for (i =3D 0; i < vm->def->nhostdevs; i++) { + virDomainHostdevSubsysSCSIPtr scsisrc; + if (!virHostdevIsSCSIDevice(vm->def->hostdevs[i])) continue; =20 - virDomainHostdevSubsysSCSIPtr scsisrc =3D - &vm->def->hostdevs[i]->source.subsys.u.scsi; + scsisrc =3D &vm->def->hostdevs[i]->source.subsys.u.scsi; if (scsisrc->rawio =3D=3D VIR_TRISTATE_BOOL_YES) { rawio =3D true; break; diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 9d2a8a6d7d..c4ddafc01d 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -511,6 +511,8 @@ int virNetMessageEncodePayloadEmpty(virNetMessagePtr ms= g) =20 void virNetMessageSaveError(virNetMessageErrorPtr rerr) { + virErrorPtr verr; + /* This func may be called several times & the first * error is the one we want because we don't want * cleanup code overwriting the first one. @@ -519,7 +521,7 @@ void virNetMessageSaveError(virNetMessageErrorPtr rerr) return; =20 memset(rerr, 0, sizeof(*rerr)); - virErrorPtr verr =3D virGetLastError(); + verr =3D virGetLastError(); if (verr) { rerr->code =3D verr->code; rerr->domain =3D verr->domain; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 977d2875fe..f3aba01fd5 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -325,6 +325,8 @@ int virNetSocketNewListenTCP(const char *nodename, int bindErrno =3D 0; virSocketAddr tmp_addr; int port =3D 0; + int e; + struct addrinfo *runp; =20 *retsocks =3D NULL; *nretsocks =3D 0; @@ -346,7 +348,7 @@ int virNetSocketNewListenTCP(const char *nodename, virSocketAddrIsWildcard(&tmp_addr))) hints.ai_flags |=3D AI_ADDRCONFIG; =20 - int e =3D getaddrinfo(nodename, service, &hints, &ai); + e =3D getaddrinfo(nodename, service, &hints, &ai); if (e !=3D 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to resolve address '%s' service '%s': %s"= ), @@ -354,7 +356,7 @@ int virNetSocketNewListenTCP(const char *nodename, return -1; } =20 - struct addrinfo *runp =3D ai; + runp =3D ai; while (runp) { virSocketAddr addr; =20 @@ -587,6 +589,7 @@ int virNetSocketNewConnectTCP(const char *nodename, virSocketAddr remoteAddr; struct addrinfo *runp; int savedErrno =3D ENOENT; + int e; =20 *retsock =3D NULL; =20 @@ -598,7 +601,7 @@ int virNetSocketNewConnectTCP(const char *nodename, hints.ai_flags =3D AI_PASSIVE | AI_ADDRCONFIG | AI_V4MAPPED; hints.ai_socktype =3D SOCK_STREAM; =20 - int e =3D getaddrinfo(nodename, service, &hints, &ai); + e =3D getaddrinfo(nodename, service, &hints, &ai); if (e !=3D 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to resolve address '%s' service '%s': %s"= ), diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 31cc24e703..a02665dce8 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -43,10 +43,12 @@ int virDaemonForkIntoBackground(const char *argv0) { int statuspipe[2]; + pid_t pid; + if (virPipeQuiet(statuspipe) < 0) return -1; =20 - pid_t pid =3D fork(); + pid =3D fork(); switch (pid) { case 0: { diff --git a/src/util/virerror.c b/src/util/virerror.c index 774c36bca3..507a29f50f 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1335,13 +1335,14 @@ void virReportSystemErrorFull(int domcode, =20 if (fmt) { va_list args; + size_t len; int n; =20 va_start(args, fmt); n =3D g_vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args); va_end(args); =20 - size_t len =3D strlen(errnoDetail); + len =3D strlen(errnoDetail); if (0 <=3D n && n + 2 + len < sizeof(msgDetailBuf)) { strcpy(msgDetailBuf + n, ": "); n +=3D 2; diff --git a/src/util/virfile.c b/src/util/virfile.c index 6ada3a708c..59bdbc121b 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1412,13 +1412,16 @@ virFileReadLimFD(int fd, int maxlen, char **buf) int virFileReadAll(const char *path, int maxlen, char **buf) { - int fd =3D open(path, O_RDONLY); + int fd; + int len; + + fd =3D open(path, O_RDONLY); if (fd < 0) { virReportSystemError(errno, _("Failed to open file '%s'"), path); return -1; } =20 - int len =3D virFileReadLimFD(fd, maxlen, buf); + len =3D virFileReadLimFD(fd, maxlen, buf); VIR_FORCE_CLOSE(fd); if (len < 0) { virReportSystemError(errno, _("Failed to read file '%s'"), path); @@ -1431,11 +1434,14 @@ virFileReadAll(const char *path, int maxlen, char *= *buf) int virFileReadAllQuiet(const char *path, int maxlen, char **buf) { - int fd =3D open(path, O_RDONLY); + int fd; + int len; + + fd =3D open(path, O_RDONLY); if (fd < 0) return -errno; =20 - int len =3D virFileReadLimFD(fd, maxlen, buf); + len =3D virFileReadLimFD(fd, maxlen, buf); VIR_FORCE_CLOSE(fd); if (len < 0) return -errno; diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 1475f69b84..8ca1b573d3 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -88,11 +88,13 @@ int virKeycodeValueFromString(virKeycodeSet codeset, size_t i; =20 for (i =3D 0; i < VIR_KEYMAP_ENTRY_MAX; i++) { + const char *name; + if (!virKeymapNames[codeset] || !virKeymapValues[codeset]) continue; =20 - const char *name =3D virKeymapNames[codeset][i]; + name =3D virKeymapNames[codeset][i]; =20 if (name && STREQ_NULLABLE(name, keyname)) return virKeymapValues[codeset][i]; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d23ed95b78..652ed2c1c6 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -817,10 +817,12 @@ virNetlinkEventServerUnlock(virNetlinkEventSrvPrivate= Ptr driver) static int virNetlinkEventRemoveClientPrimitive(size_t i, unsigned int protocol) { + virNetlinkEventRemoveCallback removeCB; + if (protocol >=3D MAX_LINKS) return -EINVAL; =20 - virNetlinkEventRemoveCallback removeCB =3D server[protocol]->handles[i= ].removeCB; + removeCB =3D server[protocol]->handles[i].removeCB; =20 if (removeCB) { (removeCB)(server[protocol]->handles[i].watch, @@ -890,11 +892,13 @@ virNetlinkEventCallback(int watch, int virNetlinkEventServiceStop(unsigned int protocol) { + virNetlinkEventSrvPrivatePtr srv; + size_t i; + if (protocol >=3D MAX_LINKS) return -EINVAL; =20 - virNetlinkEventSrvPrivatePtr srv =3D server[protocol]; - size_t i; + srv =3D server[protocol]; =20 VIR_INFO("stopping netlink event service"); =20 diff --git a/src/util/virutil.c b/src/util/virutil.c index ff664ea778..8639176fdc 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -371,6 +371,7 @@ int virDiskNameParse(const char *name, int *disk, int *= partition) int idx =3D 0; static char const* const drive_prefix[] =3D {"fd", "hd", "vd", "sd", "= xvd", "ubd"}; size_t i; + size_t n_digits; =20 for (i =3D 0; i < G_N_ELEMENTS(drive_prefix); i++) { if (STRPREFIX(name, drive_prefix[i])) { @@ -391,8 +392,8 @@ int virDiskNameParse(const char *name, int *disk, int *= partition) ptr++; } =20 - /* Count the trailing digits. */ - size_t n_digits =3D strspn(ptr, "0123456789"); + /* Count the trailing digits */ + n_digits =3D strspn(ptr, "0123456789"); if (ptr[n_digits] !=3D '\0') return -1; =20 @@ -1911,10 +1912,11 @@ static int virPipeImpl(int fds[2], bool nonblock, bool errreport) { #ifdef HAVE_PIPE2 + int rv; int flags =3D O_CLOEXEC; if (nonblock) flags |=3D O_NONBLOCK; - int rv =3D pipe2(fds, flags); + rv =3D pipe2(fds, flags); #else /* !HAVE_PIPE2 */ # ifdef WIN32 int rv =3D _pipe(fds, 4096, _O_BINARY); diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 9780553a3a..57c1ad4f46 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -203,10 +203,11 @@ fakeParentDevice(void) static int addDevice(virNodeDeviceDefPtr def) { + virNodeDeviceObjPtr obj; if (!def) return -1; =20 - virNodeDeviceObjPtr obj =3D virNodeDeviceObjListAssignDef(driver->devs= , def); + obj =3D virNodeDeviceObjListAssignDef(driver->devs, def); =20 if (!obj) { virNodeDeviceDefFree(def); diff --git a/tests/sockettest.c b/tests/sockettest.c index 29a565de40..a3c27421fc 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -90,6 +90,7 @@ testRange(const char *saddrstr, const char *eaddrstr, virSocketAddr saddr; virSocketAddr eaddr; virSocketAddr netaddr; + int gotsize; =20 if (virSocketAddrParse(&saddr, saddrstr, AF_UNSPEC) < 0) return -1; @@ -98,8 +99,8 @@ testRange(const char *saddrstr, const char *eaddrstr, if (netstr && virSocketAddrParse(&netaddr, netstr, AF_UNSPEC) < 0) return -1; =20 - int gotsize =3D virSocketAddrGetRange(&saddr, &eaddr, - netstr ? &netaddr : NULL, prefix); + gotsize =3D virSocketAddrGetRange(&saddr, &eaddr, + netstr ? &netaddr : NULL, prefix); VIR_DEBUG("Size want %d vs got %d", size, gotsize); if (pass) { /* fail if virSocketAddrGetRange returns failure, or unexpected si= ze */ @@ -136,6 +137,7 @@ static int testNetmask(const char *addr1str, const char= *addr2str, virSocketAddr addr1; virSocketAddr addr2; virSocketAddr netmask; + int ret; =20 if (virSocketAddrParse(&addr1, addr1str, AF_UNSPEC) < 0) return -1; @@ -144,7 +146,7 @@ static int testNetmask(const char *addr1str, const char= *addr2str, if (virSocketAddrParse(&netmask, netmaskstr, AF_UNSPEC) < 0) return -1; =20 - int ret =3D virSocketAddrCheckNetmask(&addr1, &addr2, &netmask); + ret =3D virSocketAddrCheckNetmask(&addr1, &addr2, &netmask); =20 if (ret <=3D 0) { return pass ? -1 : 0; diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index df392f374e..f8dd7daefe 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -124,9 +124,12 @@ static int testRotatingFileInitOne(const char *filenam= e, VIR_DEBUG("Deleting %s", filename); unlink(filename); } else { - VIR_DEBUG("Creating %s size %zu", filename, (size_t)size); char buf[1024]; - int fd =3D open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0700); + int fd; + + VIR_DEBUG("Creating %s size %zu", filename, (size_t)size); + + fd =3D open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0700); if (fd < 0) { fprintf(stderr, "Cannot create %s\n", filename); return -1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7ce848f92e..29fa3f607e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1757,6 +1757,7 @@ virshBlockJobWaitInit(vshControl *ctl, unsigned int timeout, bool async_abort) { + virConnectDomainEventGenericCallback cb; virshBlockJobWaitDataPtr ret; virshControlPtr priv =3D ctl->privData; =20 @@ -1774,8 +1775,7 @@ virshBlockJobWaitInit(vshControl *ctl, =20 ret->status =3D -1; =20 - virConnectDomainEventGenericCallback cb =3D - VIR_DOMAIN_EVENT_CALLBACK(virshBlockJobStatusHandler); + cb =3D VIR_DOMAIN_EVENT_CALLBACK(virshBlockJobStatusHandler); =20 if ((ret->cb_id =3D virConnectDomainEventRegisterAny(priv->conn, dom, VIR_DOMAIN_EVENT_ID= _BLOCK_JOB, @@ -7117,12 +7117,14 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, return NULL; virBitmapSetAll(map); } else { + int lastcpu; + if (virBitmapParse(cpulist, &map, 1024) < 0 || virBitmapIsAllClear(map)) { vshError(ctl, _("Invalid cpulist '%s'"), cpulist); goto cleanup; } - int lastcpu =3D virBitmapLastSetBit(map); + lastcpu =3D virBitmapLastSetBit(map); if (lastcpu >=3D maxcpu) { vshError(ctl, _("CPU %d in cpulist '%s' exceed the maxcpu %d"), lastcpu, cpulist, maxcpu); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index e04e2db096..ae7c643d3b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -275,12 +275,14 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) =20 /* Convert the snapshot parameters into backingStore XML */ if (snapshotStrVol) { + virStorageVolPtr snapVol; + char *snapshotStrVolPath; /* Lookup snapshot backing volume. Try the backing-vol * parameter as a name */ vshDebug(ctl, VSH_ERR_DEBUG, "%s: Look up backing store volume '%s' as name\n", cmd->def->name, snapshotStrVol); - virStorageVolPtr snapVol =3D virStorageVolLookupByName(pool, snaps= hotStrVol); + snapVol =3D virStorageVolLookupByName(pool, snapshotStrVol); if (snapVol) vshDebug(ctl, VSH_ERR_DEBUG, "%s: Backing store volume found using '%s' as nam= e\n", @@ -315,7 +317,6 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 - char *snapshotStrVolPath; if ((snapshotStrVolPath =3D virStorageVolGetPath(snapVol)) =3D=3D = NULL) { virStorageVolFree(snapVol); goto cleanup; diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index 2b499d2cf2..89dd18080e 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -428,11 +428,12 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tr= ee, if (status =3D=3D VIR_NET_OK) { const vir_dissector_index_t *pds =3D get_program_data(prog, VIR_PR= OGRAM_DISSECTORS); const gsize *len =3D get_program_data(prog, VIR_PROGRAM_DISSECTORS= _LEN); + vir_xdr_dissector_t xd; =20 if (!len) goto unknown; =20 - vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, pds,= *len); + xd =3D find_payload_dissector(proc, type, pds, *len); if (xd =3D=3D NULL) goto unknown; dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status= , xd); --=20 2.26.2