]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
locking: Remove unnecessary setting of lockspace
authorJohn Ferlan <jferlan@redhat.com>
Tue, 15 Jan 2013 18:38:16 +0000 (13:38 -0500)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 15 Jan 2013 22:43:10 +0000 (23:43 +0100)
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.

src/locking/lock_daemon_dispatch.c

index 45d2cae5307c13e2d12b3590d0d7204d62e17b02..4c990882651e7868727d03109b8a311cd4a99ac3 100644 (file)
@@ -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);