[libvirt] [PATCH v2 2/3] conf: rename Export Callback functions
name functions to be the name of the export function followed by Callback
ex. for virInterfaceObjListExport, the callback function is named
virInterfaceObjListExportCallback
Signed-off-by: Anya Harter <aharter(a)redhat.com>
---
src/conf/virinterfaceobj.c | 8 ++++----
src/conf/virnetworkobj.c | 8 ++++----
src/conf/virstorageobj.c | 16 ++++++++--------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index 0fe0042920..028d699b32 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -272,9 +272,9 @@ struct _virInterfaceObjListExportData {
};
static int
-virInterfaceObjListPopulate(void *payload,
- const void *name ATTRIBUTE_UNUSED,
- void *opaque)
+virInterfaceObjListExportCallback(void *payload,
+ const void *name ATTRIBUTE_UNUSED,
+ void *opaque)
{
virInterfaceObjListExportDataPtr data = opaque;
virInterfaceObjPtr obj = payload;
@@ -327,7 +327,7 @@ virInterfaceObjListExport(virConnectPtr conn,
virHashSize(ifaceobjs->objsName) + 1) < 0)
goto cleanup;
- virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data);
+ virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback,
&data);
if (data.error)
goto cleanup;
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index f69ee0c2fa..69465d7f44 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1316,9 +1316,9 @@ struct _virNetworkObjListExportData {
};
static int
-virNetworkObjListPopulate(void *payload,
- const void *name ATTRIBUTE_UNUSED,
- void *opaque)
+virNetworkObjListExportCallback(void *payload,
+ const void *name ATTRIBUTE_UNUSED,
+ void *opaque)
{
virNetworkObjListExportDataPtr data = opaque;
virNetworkObjPtr obj = payload;
@@ -1370,7 +1370,7 @@ virNetworkObjListExport(virConnectPtr conn,
if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) <
0)
goto cleanup;
- virHashForEach(netobjs->objs, virNetworkObjListPopulate, &data);
+ virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data);
if (data.error)
goto cleanup;
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 0964088fda..02ed491b6f 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -972,9 +972,9 @@ struct _virStoragePoolObjVolumeListExportData {
};
static int
-virStoragePoolObjVolumeListExportCb(void *payload,
- const void *name ATTRIBUTE_UNUSED,
- void *opaque)
+virStoragePoolObjVolumeListExportCallback(void *payload,
+ const void *name ATTRIBUTE_UNUSED,
+ void *opaque)
{
virStorageVolObjPtr volobj = payload;
virStoragePoolObjVolumeListExportDataPtr data = opaque;
@@ -1031,7 +1031,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn,
return -1;
}
- virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCb,
&data);
+ virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCallback,
&data);
virObjectRWUnlock(volumes);
if (data.error)
@@ -1987,9 +1987,9 @@ struct _virStoragePoolObjListExportData {
static int
-virStoragePoolObjListExportCb(void *payload,
- const void *name ATTRIBUTE_UNUSED,
- void *opaque)
+virStoragePoolObjListExportCallback(void *payload,
+ const void *name ATTRIBUTE_UNUSED,
+ void *opaque)
{
virStoragePoolObjPtr obj = payload;
virStoragePoolObjListExportDataPtr data = opaque;
@@ -2039,7 +2039,7 @@ virStoragePoolObjListExport(virConnectPtr conn,
if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) <
0)
goto error;
- virHashForEach(poolobjs->objs, virStoragePoolObjListExportCb, &data);
+ virHashForEach(poolobjs->objs, virStoragePoolObjListExportCallback, &data);
virObjectRWUnlock(poolobjs);
if (data.error)
--
2.17.1