[libvirt] [PATCH 3/7] virnetworkobj: Make virNetworkObjFindBy{UUID, Name}Locked() static again

These functions were made exportable back in 3aa3e072 when I was splitting network code into parsing and list management parts. Since then the split is finished now and these two functions do not need to be exported anymore. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/conf/virnetworkobj.c | 22 ++-------------------- src/conf/virnetworkobj.h | 8 -------- src/libvirt_private.syms | 2 -- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index ccde72e72..d8eca1e90 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -127,16 +127,7 @@ virNetworkObjListNew(void) } -/** - * virNetworkObjFindByUUIDLocked: - * @nets: list of network objects - * @uuid: network uuid to find - * - * This functions requires @nets to be locked already! - * - * Returns: not locked, but ref'd network object. - */ -virNetworkObjPtr +static virNetworkObjPtr virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets, const unsigned char *uuid) { @@ -193,16 +184,7 @@ virNetworkObjSearchName(const void *payload, } -/* - * virNetworkObjFindByNameLocked: - * @nets: list of network objects - * @name: network name to find - * - * This functions requires @nets to be locked already! - * - * Returns: not locked, but ref'd network object. - */ -virNetworkObjPtr +static virNetworkObjPtr virNetworkObjFindByNameLocked(virNetworkObjListPtr nets, const char *name) { diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 8090c2e24..cb1fd13a3 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -65,18 +65,10 @@ virNetworkObjIsActive(const virNetworkObj *net) virNetworkObjListPtr virNetworkObjListNew(void); -virNetworkObjPtr -virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets, - const unsigned char *uuid); - virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets, const unsigned char *uuid); -virNetworkObjPtr -virNetworkObjFindByNameLocked(virNetworkObjListPtr nets, - const char *name); - virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets, const char *name); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 37b815c06..054315fb7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -941,9 +941,7 @@ virNetworkObjBridgeInUse; virNetworkObjDeleteConfig; virNetworkObjEndAPI; virNetworkObjFindByName; -virNetworkObjFindByNameLocked; virNetworkObjFindByUUID; -virNetworkObjFindByUUIDLocked; virNetworkObjGetPersistentDef; virNetworkObjListExport; virNetworkObjListForEach; -- 2.13.0