External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: use g_autofree and remove unnecessary label

Browse Source 
Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiang Jiacheng 2023-01-06 17:18:35 +08:00 committed by Ján Tomko
parent ef36cc5058
commit 2040011301
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/virnetclientprogram.c
View File

@ -208,7 +208,7 @@ int virNetClientProgramDispatch(virNetClientProgram *prog,
virNetMessage *msg) virNetMessage *msg)
{ {
virNetClientProgramEvent *event; virNetClientProgramEvent *event;
char *evdata; g_autofree char *evdata = NULL;
VIR_DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d", VIR_DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d",
msg->header.prog, msg->header.vers, msg->header.type, msg->header.prog, msg->header.vers, msg->header.type,
@ -250,14 +250,12 @@ int virNetClientProgramDispatch(virNetClientProgram *prog,
evdata = g_new0(char, event->msg_len); evdata = g_new0(char, event->msg_len);
if (virNetMessageDecodePayload(msg, event->msg_filter, evdata) < 0) if (virNetMessageDecodePayload(msg, event->msg_filter, evdata) < 0)
goto cleanup; return 0;
event->func(prog, client, evdata, prog->eventOpaque); event->func(prog, client, evdata, prog->eventOpaque);
xdr_free(event->msg_filter, evdata); xdr_free(event->msg_filter, evdata);
cleanup:
VIR_FREE(evdata);
return 0; return 0;
} }

16
src/rpc/virnettlscontext.c
View File

@ -474,7 +474,7 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile,
{ {
gnutls_datum_t data; gnutls_datum_t data;
gnutls_x509_crt_t cert = NULL; gnutls_x509_crt_t cert = NULL;
char *buf = NULL; g_autofree char *buf = NULL;
int ret = -1; int ret = -1;
VIR_DEBUG("isServer %d certFile %s", VIR_DEBUG("isServer %d certFile %s",
@ -506,7 +506,6 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile,
if (ret != 0) { if (ret != 0) {
g_clear_pointer(&cert, gnutls_x509_crt_deinit); g_clear_pointer(&cert, gnutls_x509_crt_deinit);
} }
VIR_FREE(buf);
return cert; return cert;
} }
@ -517,14 +516,13 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile,
size_t *ncerts) size_t *ncerts)
{ {
gnutls_datum_t data; gnutls_datum_t data;
char *buf = NULL; g_autofree char *buf = NULL;
int ret = -1;
*ncerts = 0; *ncerts = 0;
VIR_DEBUG("certFile %s", certFile); VIR_DEBUG("certFile %s", certFile);
if (virFileReadAll(certFile, (1<<16), &buf) < 0) if (virFileReadAll(certFile, (1<<16), &buf) < 0)
goto cleanup; return -1;
data.data = (unsigned char *)buf; data.data = (unsigned char *)buf;
data.size = strlen(buf); data.size = strlen(buf);
@ -533,15 +531,11 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile,
virReportError(VIR_ERR_SYSTEM_ERROR, virReportError(VIR_ERR_SYSTEM_ERROR,
_("Unable to import CA certificate list %s"), _("Unable to import CA certificate list %s"),
certFile); certFile);
goto cleanup; return -1;
} }
*ncerts = certMax; *ncerts = certMax;
ret = 0; return 0;
cleanup:
VIR_FREE(buf);
return ret;
} }