shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

maint: Fix incorrect parenthesis placement causing true/false assignment

Browse Source 
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>
This commit is contained in:
Erik Skultety 2017-09-05 10:06:33 +02:00
parent a2b240e60e
commit 4c248e938a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/admin.c
View File

@ -446,7 +446,7 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED,
char *outputs = NULL; char *outputs = NULL;
int noutputs = 0; int noutputs = 0;
if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags) < 0)) { if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags)) < 0) {
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);
return -1; return -1;
} }

2
src/locking/lock_daemon.c
View File

@ -1310,7 +1310,7 @@ int main(int argc, char **argv) {
} }
srv = virNetDaemonGetServer(lockDaemon->dmn, "virtlockd"); srv = virNetDaemonGetServer(lockDaemon->dmn, "virtlockd");
if ((rv = virLockDaemonSetupNetworkingSystemD(srv) < 0)) { if ((rv = virLockDaemonSetupNetworkingSystemD(srv)) < 0) {
ret = VIR_LOCK_DAEMON_ERR_NETWORK; ret = VIR_LOCK_DAEMON_ERR_NETWORK;
goto cleanup; goto cleanup;
} }

2
src/locking/lock_driver_sanlock.c
View File

@ -313,7 +313,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver)
goto error_unlink; goto error_unlink;
} }
if ((rv = virLockManagerSanlockInitLockspace(driver, &ls) < 0)) { if ((rv = virLockManagerSanlockInitLockspace(driver, &ls)) < 0) {
char *err = NULL; char *err = NULL;
if (virLockManagerSanlockError(rv, &err)) { if (virLockManagerSanlockError(rv, &err)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,

2
src/qemu/qemu_hotplug.c
View File

@ -5270,7 +5270,7 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver,
int rc; int rc;
int ret = -1; int ret = -1;
if ((idx = virDomainRNGFind(vm->def, rng) < 0)) { if ((idx = virDomainRNGFind(vm->def, rng)) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("device not present in domain configuration")); _("device not present in domain configuration"));
return -1; return -1;

2
tests/virnettlshelpers.c
View File

@ -424,7 +424,7 @@ void testTLSWriteCertChain(const char *filename,
for (i = 0; i < ncerts; i++) { for (i = 0; i < ncerts; i++) {
size = sizeof(buffer); 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)); VIR_WARN("Failed to export certificate %s", gnutls_strerror(err));
unlink(filename); unlink(filename);
abort(); abort();