maint: Fix incorrect parenthesis placement causing true/false assignment

There were a few places in our code where the following pattern in 'if'
condition occurred:

if ((foo = bar() < 0))
    do something;

This patch adjusts the conditions to the expected format:

if ((foo = bar()) < 0)
    do something;

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1488192

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/daemon/admin.c b/daemon/admin.c
index c5678bb99529b88d40516e9bc8af369aa0b30de4..baf310c7bb35a9a04ac0b5be470f7c3e4f10ed50 100644 (file)
--- a/daemon/admin.c
+++ b/daemon/admin.c
@@ -446,7 +446,7 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED,
     char *outputs = NULL;
     int noutputs = 0;
 
-    if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags) < 0)) {
+    if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags)) < 0) {
         virNetMessageSaveError(rerr);
         return -1;
     }

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 6fbbf4b3d14c2ac3c18ec3b091a1ef905f5a6115..fe3eaf90322a1f7c528c24a1a99d7ad5d76efd8c 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -1310,7 +1310,7 @@ int main(int argc, char **argv) {
         }
 
         srv = virNetDaemonGetServer(lockDaemon->dmn, "virtlockd");
-        if ((rv = virLockDaemonSetupNetworkingSystemD(srv) < 0)) {
+        if ((rv = virLockDaemonSetupNetworkingSystemD(srv)) < 0) {
             ret = VIR_LOCK_DAEMON_ERR_NETWORK;
             goto cleanup;
         }

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index b5e69c472407ab058d24f139626dec80b0f7850e..7513df4d7ce4d300a09dd6a8a13ad683876cb2b0 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -313,7 +313,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver)
                 goto error_unlink;
             }
 
-            if ((rv = virLockManagerSanlockInitLockspace(driver, &ls) < 0)) {
+            if ((rv = virLockManagerSanlockInitLockspace(driver, &ls)) < 0) {
                 char *err = 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 9611df517aa8240f8bcaa4de6e9343003d0a4aa7..b365078ec11265f90b43da5af2828d740d20bd03 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5270,7 +5270,7 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver,
     int rc;
     int ret = -1;
 
-    if ((idx = virDomainRNGFind(vm->def, rng) < 0)) {
+    if ((idx = 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 b735c4e2f0565210ea7f17b44005e0e53f20df46..f66205ef78fe77ec9977085fc0ca3ab18cef8a99 100644 (file)
--- a/tests/virnettlshelpers.c
+++ b/tests/virnettlshelpers.c
@@ -424,7 +424,7 @@ void testTLSWriteCertChain(const char *filename,
 
     for (i = 0; i < ncerts; i++) {
         size = sizeof(buffer);
-        if ((err = gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM, buffer, &size) < 0)) {
+        if ((err = gnutls_x509_crt_export(certs[i], GNUTLS_X509_FMT_PEM, buffer, &size)) < 0) {
             VIR_WARN("Failed to export certificate %s", gnutls_strerror(err));
             unlink(filename);
             abort();