[PATCH 03/14] secret: Make some virSecretObj* functions static

[John Ferlan <jferlan@xxxxxxxxxx>]

Make various virSecretObjList*Locked functions static and make
virSecretObjNew static since they're only called within virtsecretobj.c

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/conf/virsecretobj.c | 33 +++++++--------------------------
 src/conf/virsecretobj.h | 18 ------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index cc18459..064e66c 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -86,7 +86,7 @@ virSecretObjOnceInit(void)
 
 VIR_ONCE_GLOBAL_INIT(virSecretObj)
 
-virSecretObjPtr
+static virSecretObjPtr
 virSecretObjNew(void)
 {
     virSecretObjPtr secret;
@@ -158,16 +158,7 @@ virSecretObjListDispose(void *obj)
 }
 
 
-/**
- * virSecretObjFindByUUIDLocked:
- * @secrets: list of secret objects
- * @uuid: secret uuid to find
- *
- * This functions requires @secrets to be locked already!
- *
- * Returns: not locked, but ref'd secret object.
- */
-virSecretObjPtr
+static virSecretObjPtr
 virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
                                  const unsigned char *uuid)
 {
@@ -187,7 +178,7 @@ virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
  * This function locks @secrets and finds the secret object which
  * corresponds to @uuid.
  *
- * Returns: locked and ref'd secret object.
+ * Returns: locked and ref'd secret object on success, NULL on failure.
  */
 virSecretObjPtr
 virSecretObjListFindByUUID(virSecretObjListPtr secrets,
@@ -228,17 +219,7 @@ virSecretObjSearchName(const void *payload,
 }
 
 
-/**
- * virSecretObjFindByUsageLocked:
- * @secrets: list of secret objects
- * @usageType: secret usageType to find
- * @usageID: secret usage string
- *
- * This functions requires @secrets to be locked already!
- *
- * Returns: not locked, but ref'd secret object.
- */
-virSecretObjPtr
+static virSecretObjPtr
 virSecretObjListFindByUsageLocked(virSecretObjListPtr secrets,
                                   int usageType,
                                   const char *usageID)
@@ -263,7 +244,7 @@ virSecretObjListFindByUsageLocked(virSecretObjListPtr secrets,
  * This function locks @secrets and finds the secret object which
  * corresponds to @usageID of @usageType.
  *
- * Returns: locked and ref'd secret object.
+ * Returns: locked and ref'd secret object on success, NULL on failure.
  */
 virSecretObjPtr
 virSecretObjListFindByUsage(virSecretObjListPtr secrets,
@@ -320,9 +301,9 @@ virSecretObjListRemove(virSecretObjListPtr secrets,
  *
  * This functions requires @secrets to be locked already!
  *
- * Returns pointer to secret or NULL if failure to add
+ * Returns: locked secret or NULL if failure to add
  */
-virSecretObjPtr
+static virSecretObjPtr
 virSecretObjListAddLocked(virSecretObjListPtr secrets,
                           virSecretDefPtr def,
                           const char *configDir,
diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h
index b26061a..9638b69 100644
--- a/src/conf/virsecretobj.h
+++ b/src/conf/virsecretobj.h
@@ -29,9 +29,6 @@
 typedef struct _virSecretObj virSecretObj;
 typedef virSecretObj *virSecretObjPtr;
 
-virSecretObjPtr
-virSecretObjNew(void);
-
 void
 virSecretObjEndAPI(virSecretObjPtr *secret);
 
@@ -42,19 +39,10 @@ virSecretObjListPtr
 virSecretObjListNew(void);
 
 virSecretObjPtr
-virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
-                                 const unsigned char *uuid);
-
-virSecretObjPtr
 virSecretObjListFindByUUID(virSecretObjListPtr secrets,
                            const unsigned char *uuid);
 
 virSecretObjPtr
-virSecretObjListFindByUsageLocked(virSecretObjListPtr secrets,
-                                  int usageType,
-                                  const char *usageID);
-
-virSecretObjPtr
 virSecretObjListFindByUsage(virSecretObjListPtr secrets,
                             int usageType,
                             const char *usageID);
@@ -64,12 +52,6 @@ virSecretObjListRemove(virSecretObjListPtr secrets,
                        virSecretObjPtr secret);
 
 virSecretObjPtr
-virSecretObjListAddLocked(virSecretObjListPtr secrets,
-                          virSecretDefPtr def,
-                          const char *configDir,
-                          virSecretDefPtr *oldDef);
-
-virSecretObjPtr
 virSecretObjListAdd(virSecretObjListPtr secrets,
                     virSecretDefPtr def,
                     const char *configDir,
-- 
2.9.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list