From: John Ferlan <jferlan@redhat.com>
Date: Tue, 15 Jan 2013 18:38:16 +0000 (-0500)
Subject: locking: Remove unnecessary setting of lockspace
X-Git-Tag: v1.0.2-rc1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8cd571b2c3d1463f902daf5ffc8ef3077ef7744;p=thirdparty%2Flibvirt.git

locking: Remove unnecessary setting of lockspace

In virLockSpaceProtocolDispatchNew() the returned value of lockspace from
virLockDaemonFindLockSpace() is overwritten by the virLockSpaceNew() return.
Coverity complains that it's unused.

In virLockSpaceProtocolDispatchCreateLockSpace() lockspace is also overwritten
in a similar manner resulting in the same Coverity message.
---

diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 45d2cae530..4c99088265 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -227,7 +227,7 @@ virLockSpaceProtocolDispatchNew(virNetServerPtr server ATTRIBUTE_UNUSED,
         goto cleanup;
     }
 
-    if ((lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) {
+    if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Lockspace for path %s already exists"),
                        args->path);
@@ -406,7 +406,7 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServerPtr server ATTRIBUTE_UNU
         goto cleanup;
     }
 
-    if ((lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) {
+    if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) {
         virReportError(VIR_ERR_OPERATION_INVALID,
                        _("Lockspace for path %s already exists"),
                        args->path);