提交 1d8721c4 编写于 作者: A Anya Harter 提交者: Andrea Bolognani

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: NAnya Harter <aharter@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 5efc8d0c
...@@ -272,7 +272,7 @@ struct _virInterfaceObjListExportData { ...@@ -272,7 +272,7 @@ 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)
{ {
...@@ -327,7 +327,7 @@ virInterfaceObjListExport(virConnectPtr conn, ...@@ -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;
......
...@@ -1328,7 +1328,7 @@ struct _virNetworkObjListExportData { ...@@ -1328,7 +1328,7 @@ 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)
{ {
...@@ -1382,7 +1382,7 @@ virNetworkObjListExport(virConnectPtr conn, ...@@ -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;
......
...@@ -972,7 +972,7 @@ struct _virStoragePoolObjVolumeListExportData { ...@@ -972,7 +972,7 @@ 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)
{ {
...@@ -1031,7 +1031,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, ...@@ -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,7 +1989,7 @@ struct _virStoragePoolObjListExportData { ...@@ -1989,7 +1989,7 @@ 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)
{ {
...@@ -2041,7 +2041,7 @@ virStoragePoolObjListExport(virConnectPtr conn, ...@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册