]> xenbits.xensource.com Git - libvirt.git/commitdiff
virMACMapHashDumper: Refactor array addition
authorPeter Krempa <pkrempa@redhat.com>
Fri, 12 Feb 2021 10:34:22 +0000 (11:34 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Sat, 20 Feb 2021 12:26:37 +0000 (13:26 +0100)
Use automatic memory freeing and don't check return value of
virJSONValueNewString as it can't fail.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/util/virmacmap.c

index 521ab89b5bd0c314e60d23753134871c1bad74b1..12df32593370732d033988096e47ad58d49c5f1b 100644 (file)
@@ -214,13 +214,11 @@ virMACMapHashDumper(void *payload,
     GSList *next;
 
     for (next = macs; next; next = next->next) {
-        virJSONValuePtr m = virJSONValueNewString((const char *) next->data);
+        g_autoptr(virJSONValue) m = virJSONValueNewString((const char *) next->data);
 
-        if (!m ||
-            virJSONValueArrayAppend(arr, m) < 0) {
-            virJSONValueFree(m);
+        if (virJSONValueArrayAppend(arr, m) < 0)
             return -1;
-        }
+        m = NULL;
     }
 
     if (virJSONValueObjectAppendString(obj, "domain", name) < 0 ||