From nobody Fri May 3 10:54:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1504599704896268.1085461548737; Tue, 5 Sep 2017 01:21:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2BCC48048C; Tue, 5 Sep 2017 08:21:42 +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 9948DACD26; Tue, 5 Sep 2017 08:21:40 +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 D9C201806105; Tue, 5 Sep 2017 08:21:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v858HhB4002674 for ; Tue, 5 Sep 2017 04:17:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63D37777CA; Tue, 5 Sep 2017 08:17:43 +0000 (UTC) Received: from beluga.usersys.redhat.com (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id A75F9777C4; Tue, 5 Sep 2017 08:17:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2BCC48048C Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Erik Skultety To: libvir-list@redhat.com Date: Tue, 5 Sep 2017 10:17:36 +0200 Message-Id: <1fbea5d64a8c902aecd3544aa8542ce656a75977.1504599215.git.eskultet@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH] maint: Fix incorrect parenthesis placement causing true/false assignment 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 05 Sep 2017 08:21:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There were a few places in our code where the following pattern in 'if' condition occurred: if ((foo =3D bar() < 0)) do something; This patch adjusts the conditions to the expected format: if ((foo =3D bar()) < 0) do something; Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1488192 Signed-off-by: Erik Skultety Reviewed-by: Martin Kletzander --- This can be especially "fun" if you try to assign multiple RNG devices to a domain and then try to hot-unplug any of them but the first. Anyhow I used = the regex below to find these, I haven't spent much time tuning in, so in case you can come up with a better one that yields more results like these I'm a= ll ears :). [[:alnum:]_]+ =3D [[:print:]]+[^)]) < 0)) daemon/admin.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- tests/virnettlshelpers.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/admin.c b/daemon/admin.c index c5678bb99..baf310c7b 100644 --- a/daemon/admin.c +++ b/daemon/admin.c @@ -446,7 +446,7 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr s= erver ATTRIBUTE_UNUSED, char *outputs =3D NULL; int noutputs =3D 0; - if ((noutputs =3D adminConnectGetLoggingOutputs(&outputs, args->flags)= < 0)) { + if ((noutputs =3D adminConnectGetLoggingOutputs(&outputs, args->flags)= ) < 0) { virNetMessageSaveError(rerr); return -1; } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 6fbbf4b3d..fe3eaf903 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1310,7 +1310,7 @@ int main(int argc, char **argv) { } srv =3D virNetDaemonGetServer(lockDaemon->dmn, "virtlockd"); - if ((rv =3D virLockDaemonSetupNetworkingSystemD(srv) < 0)) { + if ((rv =3D virLockDaemonSetupNetworkingSystemD(srv)) < 0) { ret =3D VIR_LOCK_DAEMON_ERR_NETWORK; goto cleanup; } diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index b5e69c472..7513df4d7 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -313,7 +313,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlo= ckDriverPtr driver) goto error_unlink; } - if ((rv =3D virLockManagerSanlockInitLockspace(driver, &ls) < = 0)) { + if ((rv =3D virLockManagerSanlockInitLockspace(driver, &ls)) <= 0) { char *err =3D NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9611df517..b365078ec 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5270,7 +5270,7 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver, int rc; int ret =3D -1; - if ((idx =3D virDomainRNGFind(vm->def, rng) < 0)) { + if ((idx =3D virDomainRNGFind(vm->def, rng)) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("device not present in domain configuration")); return -1; diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index b735c4e2f..f66205ef7 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -424,7 +424,7 @@ void testTLSWriteCertChain(const char *filename, for (i =3D 0; i < ncerts; i++) { size =3D sizeof(buffer); - if ((err =3D gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM,= buffer, &size) < 0)) { + if ((err =3D gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM,= buffer, &size)) < 0) { VIR_WARN("Failed to export certificate %s", gnutls_strerror(er= r)); unlink(filename); abort(); -- 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list