[PATCH 2/3] conf: rename Export Callback functions

[Anya Harter <aharter@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 src/conf/virinterfaceobj.c | 4 ++--
 src/conf/virnetworkobj.c   | 4 ++--
 src/conf/virstorageobj.c   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index 10a291e911..670909decb 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -270,7 +270,7 @@ struct virInterfaceObjListExportData {
 };
 
 static int
-virInterfaceObjListPopulate(void *payload,
+virInterfaceObjListExportCallback(void *payload,
                             const void *name ATTRIBUTE_UNUSED,
                             void *opaque)
 {
@@ -325,7 +325,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 cc55b4806d..c8939460a3 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1314,7 +1314,7 @@ struct virNetworkObjListExportData {
 };
 
 static int
-virNetworkObjListPopulate(void *payload,
+virNetworkObjListExportCallback(void *payload,
                           const void *name ATTRIBUTE_UNUSED,
                           void *opaque)
 {
@@ -1368,7 +1368,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 bbf707f2f9..6b8a0fa58d 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -970,7 +970,7 @@ struct virStoragePoolObjVolumeListExportData {
 };
 
 static int
-virStoragePoolObjVolumeListExportCb(void *payload,
+virStoragePoolObjVolumeListExportCallback(void *payload,
                                     const void *name ATTRIBUTE_UNUSED,
                                     void *opaque)
 {
@@ -1029,7 +1029,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn,
         return -1;
     }
 
-    virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCb, &data);
+    virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCallback, &data);
     virObjectRWUnlock(volumes);
 
     if (data.error)
@@ -1983,7 +1983,7 @@ struct virStoragePoolObjListExportData {
 
 
 static int
-virStoragePoolObjListExportCb(void *payload,
+virStoragePoolObjListExportCallback(void *payload,
                               const void *name ATTRIBUTE_UNUSED,
                               void *opaque)
 {
@@ -2035,7 +2035,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

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