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

rpc: assume private data callbacks are always non-NULL

Browse Source 
Since we annotate the APIs are having non-NULL parameters, we can remove
the checks for NULL in the code too.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-02-01 15:34:06 +00:00
parent 72874b2d11
commit 17398ccef3
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/rpc/virnetserverclient.c
View File

@ -466,14 +466,12 @@ virNetServerClientPtr virNetServerClientNew(unsigned long long id,
now))) now)))
return NULL; return NULL;
if (privNew) { if (!(client->privateData = privNew(client, privOpaque))) {
if (!(client->privateData = privNew(client, privOpaque))) { virObjectUnref(client);
virObjectUnref(client); return NULL;
return NULL;
}
client->privateDataFreeFunc = privFree;
client->privateDataPreExecRestart = privPreExecRestart;
} }
client->privateDataFreeFunc = privFree;
client->privateDataPreExecRestart = privPreExecRestart;
return client; return client;
} }
@ -580,18 +578,18 @@ virNetServerClientPtr virNetServerClientNewPostExecRestart(virNetServerPtr srv,
} }
virObjectUnref(sock); virObjectUnref(sock);
if (privNew) { if (!(child = virJSONValueObjectGet(object, "privateData"))) {
if (!(child = virJSONValueObjectGet(object, "privateData"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing privateData field in JSON state document"));
_("Missing privateData field in JSON state document")); goto error;
goto error;
}
if (!(client->privateData = privNew(client, child, privOpaque)))
goto error;
client->privateDataFreeFunc = privFree;
client->privateDataPreExecRestart = privPreExecRestart;
} }
if (!(client->privateData = privNew(client, child, privOpaque)))
goto error;
client->privateDataFreeFunc = privFree;
client->privateDataPreExecRestart = privPreExecRestart;
return client; return client;
@ -637,14 +635,12 @@ virJSONValuePtr virNetServerClientPreExecRestart(virNetServerClientPtr client)
goto error; goto error;
} }
if (client->privateData && client->privateDataPreExecRestart) { if (!(child = client->privateDataPreExecRestart(client, client->privateData)))
if (!(child = client->privateDataPreExecRestart(client, client->privateData))) goto error;
goto error;
if (virJSONValueObjectAppend(object, "privateData", child) < 0) { if (virJSONValueObjectAppend(object, "privateData", child) < 0) {
virJSONValueFree(child); virJSONValueFree(child);
goto error; goto error;
}
} }
virObjectUnlock(client); virObjectUnlock(client);
@ -989,8 +985,7 @@ void virNetServerClientDispose(void *obj)
PROBE(RPC_SERVER_CLIENT_DISPOSE, PROBE(RPC_SERVER_CLIENT_DISPOSE,
"client=%p", client); "client=%p", client);
if (client->privateData && if (client->privateData)
client->privateDataFreeFunc)
client->privateDataFreeFunc(client->privateData); client->privateDataFreeFunc(client->privateData);
virObjectUnref(client->identity); virObjectUnref(client->identity);