Replace virSecretFree with virObjectUnref

Since virSecretFree will call virObjectUnref anyway, let's just use that
directly so as to avoid the possibility that we inadvertently clear out
a pending error message when using the public API.

diff --git a/cfg.mk b/cfg.mk
index c7dfb76cad15c0b0ab04d3fd496cf310103be39e..e91cddf27e6b025bd4867cfa70f6e9889c5b3750 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -992,7 +992,7 @@ sc_prohibit_system_error_with_vir_err:
 # functions. There's a corresponding exclude to allow usage within tests,
 # docs, examples, tools, src/libvirt-*.c, and include/libvirt/libvirt-*.h
 sc_prohibit_virXXXFree:
-       @prohibit='\bvir(Domain|Network|NodeDevice|StorageVol|StoragePool|Stream)Free\b'        \
+       @prohibit='\bvir(Domain|Network|NodeDevice|StorageVol|StoragePool|Stream|Secret)Free\b' \
        exclude='sc_prohibit_virXXXFree' \
        halt='avoid using 'virXXXFree', use 'virObjectUnref' instead' \
          $(_sc_search_regexp)
@@ -1186,4 +1186,4 @@ exclude_file_name_regexp--sc_prohibit_devname = \
   ^(tools/virsh.pod|cfg.mk|docs/.*)$$
 
 exclude_file_name_regexp--sc_prohibit_virXXXFree = \
-  ^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream).c$$)
+  ^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream|secret).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream|secret).c$$)

diff --git a/daemon/remote.c b/daemon/remote.c
index b2f1c4614fd5b1894c88534158f9b9a8b287df8a..60d05e18de3528dce455ada85f589dc74313d456 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -3565,8 +3565,7 @@ remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED,
  cleanup:
     if (rv < 0)
         virNetMessageSaveError(rerr);
-    if (secret)
-        virSecretFree(secret);
+    virObjectUnref(secret);
     return rv;
 }
 
@@ -5024,7 +5023,7 @@ remoteDispatchConnectListAllSecrets(virNetServerPtr server ATTRIBUTE_UNUSED,
         virNetMessageSaveError(rerr);
     if (secrets && nsecrets > 0) {
         for (i = 0; i < nsecrets; i++)
-            virSecretFree(secrets[i]);
+            virObjectUnref(secrets[i]);
         VIR_FREE(secrets);
     }
     return rv;

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 2eb251a1a67c2063c04d7813b546bd304b304882..431a092326426f9e25e12db2b3b5524eec7f7749 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3518,8 +3518,7 @@ remoteConnectListAllSecrets(virConnectPtr conn,
  cleanup:
     if (tmp_secrets) {
         for (i = 0; i < ret.secrets.secrets_len; i++)
-            if (tmp_secrets[i])
-                virSecretFree(tmp_secrets[i]);
+            virObjectUnref(tmp_secrets[i]);
         VIR_FREE(tmp_secrets);
     }
 

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index cd04b20aa4222327cf4eacb482984177c6be33ce..c7a51bb15c1d4d92658124f22c5974005a616c36 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -700,10 +700,8 @@ secretConnectListAllSecrets(virConnectPtr conn,
  cleanup:
     secretDriverUnlock(driver);
     if (tmp_secrets) {
-        for (i = 0; i < ret_nsecrets; i ++) {
-            if (tmp_secrets[i])
-                virSecretFree(tmp_secrets[i]);
-        }
+        for (i = 0; i < ret_nsecrets; i ++)
+            virObjectUnref(tmp_secrets[i]);
     }
     VIR_FREE(tmp_secrets);
 

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 98720f630c4906a4be2df15d003c3a20a544a69f..b990a82957dbf32e87afe00d0cb5117d0b3084e6 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -506,7 +506,7 @@ virStorageGenerateSecretUUID(virConnectPtr conn,
         if (tmp == NULL)
             return 0;
 
-        virSecretFree(tmp);
+        virObjectUnref(tmp);
     }
 
     virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -589,7 +589,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
         if (ret != 0 &&
             conn->secretDriver->secretUndefine != NULL)
             conn->secretDriver->secretUndefine(secret);
-        virSecretFree(secret);
+        virObjectUnref(secret);
     }
     virBufferFreeAndReset(&buf);
     virSecretDefFree(def);

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index f4bf5d6e03c8e58f5d5ffeaf8461198fcf9c6964..0ee1d0938b2e6fe224e27c1e01f7d4d600812533 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -1201,7 +1201,7 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn,
             if (VIR_ALLOC_N(vol->target.encryption->secrets, 1) < 0 ||
                 VIR_ALLOC(encsec) < 0) {
                 VIR_FREE(vol->target.encryption->secrets);
-                virSecretFree(sec);
+                virObjectUnref(sec);
                 return -1;
             }
 
@@ -1210,7 +1210,7 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn,
 
             encsec->type = VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE;
             virSecretGetUUID(sec, encsec->uuid);
-            virSecretFree(sec);
+            virObjectUnref(sec);
         }
     }
 

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 5a16effd61d91e86c4d437204c523c73e0b99021..57182de26a357d2678bcccc6f2493e085c528b79 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -225,8 +225,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
     VIR_FREE(secret_value);
     VIR_FREE(rados_key);
 
-    if (secret != NULL)
-        virSecretFree(secret);
+    virObjectUnref(secret);
 
     virBufferFreeAndReset(&mon_host);
     VIR_FREE(mon_buff);