refactoring: Use the return value of virObjectRef directly

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

View File

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

View File

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

View File

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

View File

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