]> xenbits.xensource.com Git - libvirt.git/commitdiff
secret: Remove local virSecretPtr 'secret'
authorJohn Ferlan <jferlan@redhat.com>
Tue, 23 Feb 2016 23:14:31 +0000 (18:14 -0500)
committerJohn Ferlan <jferlan@redhat.com>
Tue, 1 Mar 2016 11:43:53 +0000 (06:43 -0500)
Remove the need for the local 'secret' in secretConnectListAllSecrets.
A subsequent patch will rename the ObjPtr entry to secret.

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/secret/secret_driver.c

index 27c3f9e3120e5d33ff8a1da9e5375215214d9a55..07b32570a2140bea20e731a79b037333a2fb5b11 100644 (file)
@@ -576,7 +576,6 @@ secretConnectListAllSecrets(virConnectPtr conn,
     virSecretPtr *tmp_secrets = NULL;
     int nsecrets = 0;
     int ret_nsecrets = 0;
-    virSecretPtr secret = NULL;
     virSecretObjPtr entry = NULL;
     size_t i = 0;
     int ret = -1;
@@ -616,12 +615,12 @@ secretConnectListAllSecrets(virConnectPtr conn,
             continue;
 
         if (secrets) {
-            if (!(secret = virGetSecret(conn,
-                                        entry->def->uuid,
-                                        entry->def->usage_type,
-                                        secretUsageIDForDef(entry->def))))
+            if (!(tmp_secrets[ret_nsecrets] =
+                  virGetSecret(conn,
+                               entry->def->uuid,
+                               entry->def->usage_type,
+                               secretUsageIDForDef(entry->def))))
                 goto cleanup;
-            tmp_secrets[ret_nsecrets] = secret;
         }
         ret_nsecrets++;
     }