rpc: use g_autofree and remove unnecessary label

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>

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 5da118bfd3f2d7a625ab656e8d5e2706d9e1b5bb..b93c49534748eef549e0211d75fafab725f6b9af 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -208,7 +208,7 @@ int virNetClientProgramDispatch(virNetClientProgram *prog,
                                 virNetMessage *msg)
 {
     virNetClientProgramEvent *event;
-    char *evdata;
+    g_autofree char *evdata = NULL;
 
     VIR_DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d",
               msg->header.prog, msg->header.vers, msg->header.type,
@@ -250,14 +250,12 @@ int virNetClientProgramDispatch(virNetClientProgram *prog,
     evdata = g_new0(char, event->msg_len);
 
     if (virNetMessageDecodePayload(msg, event->msg_filter, evdata) < 0)
-        goto cleanup;
+        return 0;
 
     event->func(prog, client, evdata, prog->eventOpaque);
 
     xdr_free(event->msg_filter, evdata);
 
- cleanup:
-    VIR_FREE(evdata);
     return 0;
 }
 

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