External/libvirt
1
0
Fork 0
Code

datatypes.c: Replace 'close' with 'closeData'

Browse Source 
Older compilers fail to see that 'close' is not used a function
rather than a variable and produce the following error:

cc1: warnings being treated as errors
../../src/datatypes.c: In function 'virConnectCloseCallbackDataReset':
../../src/datatypes.c:149: error: declaration of 'close' shadows a global declaration [-Wshadow]

Replace all the 'close' occurrences with 'closeData' to resolve
this.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-03-01 17:39:54 +01:00
parent 95aa101795
commit f5f1ccbc23
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/datatypes.c
View File

@ -145,16 +145,16 @@ virConnectDispose(void *obj)
} }
static static void
void virConnectCloseCallbackDataReset(virConnectCloseCallbackDataPtr close) virConnectCloseCallbackDataReset(virConnectCloseCallbackDataPtr closeData)
{ {
if (close->freeCallback) if (closeData->freeCallback)
close->freeCallback(close->opaque); closeData->freeCallback(closeData->opaque);
close->freeCallback = NULL; closeData->freeCallback = NULL;
close->opaque = NULL; closeData->opaque = NULL;
virObjectUnref(close->conn); virObjectUnref(closeData->conn);
close->conn = NULL; closeData->conn = NULL;
} }
/** /**
@ -178,77 +178,77 @@ virNewConnectCloseCallbackData(void)
return virObjectLockableNew(virConnectCloseCallbackDataClass); return virObjectLockableNew(virConnectCloseCallbackDataClass);
} }
void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr close, void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr closeData,
virConnectPtr conn, virConnectPtr conn,
virConnectCloseFunc cb, virConnectCloseFunc cb,
void *opaque, void *opaque,
virFreeCallback freecb) virFreeCallback freecb)
{ {
virObjectLock(close); virObjectLock(closeData);
if (close->callback != NULL) { if (closeData->callback != NULL) {
VIR_WARN("Attempt to register callback on armed" VIR_WARN("Attempt to register callback on armed"
" close callback object %p", close); " close callback object %p", closeData);
goto cleanup; goto cleanup;
return; return;
} }
close->conn = conn; closeData->conn = conn;
virObjectRef(close->conn); virObjectRef(closeData->conn);
close->callback = cb; closeData->callback = cb;
close->opaque = opaque; closeData->opaque = opaque;
close->freeCallback = freecb; closeData->freeCallback = freecb;
cleanup: cleanup:
virObjectUnlock(close); virObjectUnlock(closeData);
} }
void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackDataPtr close, void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackDataPtr closeData,
virConnectCloseFunc cb) virConnectCloseFunc cb)
{ {
virObjectLock(close); virObjectLock(closeData);
if (close->callback != cb) { if (closeData->callback != cb) {
VIR_WARN("Attempt to unregister different callback on " VIR_WARN("Attempt to unregister different callback on "
" close callback object %p", close); " close callback object %p", closeData);
goto cleanup; goto cleanup;
} }
virConnectCloseCallbackDataReset(close); virConnectCloseCallbackDataReset(closeData);
close->callback = NULL; closeData->callback = NULL;
cleanup: cleanup:
virObjectUnlock(close); virObjectUnlock(closeData);
} }
void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr close, void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr closeData,
int reason) int reason)
{ {
virObjectLock(close); virObjectLock(closeData);
if (!close->conn) if (!closeData->conn)
goto exit; goto exit;
VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p", VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p",
close->callback, reason, close->opaque); closeData->callback, reason, closeData->opaque);
close->callback(close->conn, reason, close->opaque); closeData->callback(closeData->conn, reason, closeData->opaque);
virConnectCloseCallbackDataReset(close); virConnectCloseCallbackDataReset(closeData);
exit: exit:
virObjectUnlock(close); virObjectUnlock(closeData);
} }
virConnectCloseFunc virConnectCloseFunc
virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackDataPtr close) virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackDataPtr closeData)
{ {
virConnectCloseFunc cb; virConnectCloseFunc cb;
virObjectLock(close); virObjectLock(closeData);
cb = close->callback; cb = closeData->callback;
virObjectUnlock(close); virObjectUnlock(closeData);
return cb; return cb;
} }