NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: rename Export Callback functions

Browse Source 
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@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Anya Harter 2018-08-13 11:55:15 -04:00 committed by Andrea Bolognani
parent 5efc8d0caa
commit 1d8721c480
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/virinterfaceobj.c
View File

@ -272,9 +272,9 @@ struct _virInterfaceObjListExportData {
}; };
static int static int
virInterfaceObjListPopulate(void *payload, virInterfaceObjListExportCallback(void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
virInterfaceObjListExportDataPtr data = opaque; virInterfaceObjListExportDataPtr data = opaque;
virInterfaceObjPtr obj = payload; virInterfaceObjPtr obj = payload;
@ -327,7 +327,7 @@ virInterfaceObjListExport(virConnectPtr conn,
virHashSize(ifaceobjs->objsName) + 1) < 0) virHashSize(ifaceobjs->objsName) + 1) < 0)
goto cleanup; goto cleanup;
virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data); virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data);
if (data.error) if (data.error)
goto cleanup; goto cleanup;

8
src/conf/virnetworkobj.c
View File

@ -1328,9 +1328,9 @@ struct _virNetworkObjListExportData {
}; };
static int static int
virNetworkObjListPopulate(void *payload, virNetworkObjListExportCallback(void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
virNetworkObjListExportDataPtr data = opaque; virNetworkObjListExportDataPtr data = opaque;
virNetworkObjPtr obj = payload; virNetworkObjPtr obj = payload;
@ -1382,7 +1382,7 @@ virNetworkObjListExport(virConnectPtr conn,
if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0)
goto cleanup; goto cleanup;
virHashForEach(netobjs->objs, virNetworkObjListPopulate, &data); virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data);
if (data.error) if (data.error)
goto cleanup; goto cleanup;

16
src/conf/virstorageobj.c
View File

@ -972,9 +972,9 @@ struct _virStoragePoolObjVolumeListExportData {
}; };
static int static int
virStoragePoolObjVolumeListExportCb(void *payload, virStoragePoolObjVolumeListExportCallback(void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
virStorageVolObjPtr volobj = payload; virStorageVolObjPtr volobj = payload;
virStoragePoolObjVolumeListExportDataPtr data = opaque; virStoragePoolObjVolumeListExportDataPtr data = opaque;
@ -1031,7 +1031,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn,
return -1; return -1;
} }
virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCb, &data); virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCallback, &data);
virObjectRWUnlock(volumes); virObjectRWUnlock(volumes);
if (data.error) if (data.error)
@ -1989,9 +1989,9 @@ struct _virStoragePoolObjListExportData {
static int static int
virStoragePoolObjListExportCb(void *payload, virStoragePoolObjListExportCallback(void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
virStoragePoolObjPtr obj = payload; virStoragePoolObjPtr obj = payload;
virStoragePoolObjListExportDataPtr data = opaque; virStoragePoolObjListExportDataPtr data = opaque;
@ -2041,7 +2041,7 @@ virStoragePoolObjListExport(virConnectPtr conn,
if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) < 0) if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) < 0)
goto error; goto error;
virHashForEach(poolobjs->objs, virStoragePoolObjListExportCb, &data); virHashForEach(poolobjs->objs, virStoragePoolObjListExportCallback, &data);
virObjectRWUnlock(poolobjs); virObjectRWUnlock(poolobjs);
if (data.error) if (data.error)