virQEMUSaveDataNew: Refactor cleanup

Use autoptr cleanup for 'data' and get rid of 'cleanup:' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 09217a9c9df0dadaf17a3ea9373663d155a2b1ac..cdfa9be09d0053babc54415985395a1e94fa3bcc 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -82,7 +82,7 @@ virQEMUSaveDataNew(char *domXML,
                    virQEMUSaveFormat format,
                    virDomainXMLOption *xmlopt)
 {
-    virQEMUSaveData *data = NULL;
+    g_autoptr(virQEMUSaveData) data = NULL;
     virQEMUSaveHeader *header;
 
     data = g_new0(virQEMUSaveData, 1);
@@ -90,7 +90,7 @@ virQEMUSaveDataNew(char *domXML,
     if (cookieObj &&
         !(data->cookie = virSaveCookieFormat((virObject *) cookieObj,
                                              virDomainXMLOptionGetSaveCookie(xmlopt))))
-        goto error;
+        return NULL;
 
     header = &data->header;
     memcpy(header->magic, QEMU_SAVE_PARTIAL, sizeof(header->magic));
@@ -99,11 +99,8 @@ virQEMUSaveDataNew(char *domXML,
     header->format = format;
 
     data->xml = domXML;
-    return data;
 
- error:
-    virQEMUSaveDataFree(data);
-    return NULL;
+    return g_steal_pointer(&data);
 }