External/libvirt
1
0
Fork 0
Code

events: Cleanup callback variable name

Browse Source 
In every other instance virObjectEventCallbackPtr is named 'cb',
and in other code 'event' usually means a virObjectEventPtr
This commit is contained in:
Cole Robinson 2016-06-23 11:43:24 -04:00
parent 593269a2a5
commit 7926c5a5be
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/conf/object_event.c
View File

@ -393,7 +393,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn,
int *callbackID, int *callbackID,
bool serverFilter) bool serverFilter)
{ {
virObjectEventCallbackPtr event; virObjectEventCallbackPtr cb;
int ret = -1; int ret = -1;
int remoteID = -1; int remoteID = -1;
@ -417,30 +417,30 @@ virObjectEventCallbackListAddID(virConnectPtr conn,
_("event callback already tracked")); _("event callback already tracked"));
return -1; return -1;
} }
/* Allocate new event */ /* Allocate new cb */
if (VIR_ALLOC(event) < 0) if (VIR_ALLOC(cb) < 0)
goto cleanup; goto cleanup;
event->conn = virObjectRef(conn); cb->conn = virObjectRef(conn);
*callbackID = event->callbackID = cbList->nextID++; *callbackID = cb->callbackID = cbList->nextID++;
event->cb = callback; cb->cb = callback;
event->klass = klass; cb->klass = klass;
event->eventID = eventID; cb->eventID = eventID;
event->opaque = opaque; cb->opaque = opaque;
event->freecb = freecb; cb->freecb = freecb;
event->remoteID = remoteID; cb->remoteID = remoteID;
/* Only need 'uuid' for matching; 'id' can change as domain /* Only need 'uuid' for matching; 'id' can change as domain
* switches between running and shutoff, and 'name' can change in * switches between running and shutoff, and 'name' can change in
* Xen migration. */ * Xen migration. */
if (uuid) { if (uuid) {
event->uuid_filter = true; cb->uuid_filter = true;
memcpy(event->uuid, uuid, VIR_UUID_BUFLEN); memcpy(cb->uuid, uuid, VIR_UUID_BUFLEN);
} }
event->filter = filter; cb->filter = filter;
event->filter_opaque = filter_opaque; cb->filter_opaque = filter_opaque;
event->legacy = legacy; cb->legacy = legacy;
if (VIR_APPEND_ELEMENT(cbList->callbacks, cbList->count, event) < 0) if (VIR_APPEND_ELEMENT(cbList->callbacks, cbList->count, cb) < 0)
goto cleanup; goto cleanup;
/* When additional filtering is being done, every client callback /* When additional filtering is being done, every client callback
@ -455,7 +455,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn,
} }
cleanup: cleanup:
virObjectEventCallbackFree(event); virObjectEventCallbackFree(cb);
return ret; return ret;
} }