External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring: Use the return value of virObjectRef directly

Browse Source 
Use the return value of virObjectRef directly. This way, it's easier
for another reader to identify the reason why the additional reference
is required.

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
This commit is contained in:
Marc Hartmayer 2017-04-03 10:24:39 +02:00 committed by Michal Privoznik
parent 7a665f2451
commit fd6e3f48ed
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/datatypes.c
View File

@ -196,8 +196,7 @@ void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr closeDat
return; return;
} }
closeData->conn = conn; closeData->conn = virObjectRef(conn);
virObjectRef(closeData->conn);
closeData->callback = cb; closeData->callback = cb;
closeData->opaque = opaque; closeData->opaque = opaque;
closeData->freeCallback = freecb; closeData->freeCallback = freecb;
@ -985,8 +984,7 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbdata,
goto cleanup; goto cleanup;
} }
virObjectRef(conn); cbdata->conn = virObjectRef(conn);
cbdata->conn = conn;
cbdata->callback = cb; cbdata->callback = cb;
cbdata->opaque = opaque; cbdata->opaque = opaque;
cbdata->freeCallback = freecb; cbdata->freeCallback = freecb;

4
src/rpc/virnetclientstream.c
View File

@ -145,12 +145,10 @@ virNetClientStreamPtr virNetClientStreamNew(virNetClientProgramPtr prog,
if (!(st = virObjectLockableNew(virNetClientStreamClass))) if (!(st = virObjectLockableNew(virNetClientStreamClass)))
return NULL; return NULL;
st->prog = prog; st->prog = virObjectRef(prog);
st->proc = proc; st->proc = proc;
st->serial = serial; st->serial = serial;
virObjectRef(prog);
return st; return st;
} }

9
src/rpc/virnetserver.c
View File

@ -213,8 +213,7 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client,
job->msg = msg; job->msg = msg;
if (prog) { if (prog) {
virObjectRef(prog); job->prog = virObjectRef(prog);
job->prog = prog;
priority = virNetServerProgramGetPriority(prog, msg->header.proc); priority = virNetServerProgramGetPriority(prog, msg->header.proc);
} }
@ -284,8 +283,7 @@ int virNetServerAddClient(virNetServerPtr srv,
if (VIR_EXPAND_N(srv->clients, srv->nclients, 1) < 0) if (VIR_EXPAND_N(srv->clients, srv->nclients, 1) < 0)
goto error; goto error;
srv->clients[srv->nclients-1] = client; srv->clients[srv->nclients-1] = virObjectRef(client);
virObjectRef(client);
if (virNetServerClientNeedAuth(client)) if (virNetServerClientNeedAuth(client))
virNetServerTrackPendingAuthLocked(srv); virNetServerTrackPendingAuthLocked(srv);
@ -695,8 +693,7 @@ int virNetServerAddService(virNetServerPtr srv,
} }
} }
srv->services[srv->nservices-1] = svc; srv->services[srv->nservices-1] = virObjectRef(svc);
virObjectRef(svc);
virNetServerServiceSetDispatcher(svc, virNetServerServiceSetDispatcher(svc,
virNetServerDispatchNewClient, virNetServerDispatchNewClient,

3
tests/qemumonitortestutils.c
View File

@ -1064,8 +1064,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
if (vm) { if (vm) {
virObjectRef(vm); test->vm = virObjectRef(vm);
test->vm = vm;
} else { } else {
test->vm = virDomainObjNew(xmlopt); test->vm = virDomainObjNew(xmlopt);
if (!test->vm) if (!test->vm)