[libvirt] [PATCH 11/13] vboxDumpDisplay: use VIR_APPEND_ELEMENT

Ján Tomko jtomko at redhat.com
Fri Feb 5 17:02:30 UTC 2016


Instead of open-coding it.
---
 src/vbox/vbox_common.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 1c2a432..236e048 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3363,14 +3363,9 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
             goto cleanup;
     }
 
-    if (graphics) {
-        if (VIR_ALLOC_N(def->graphics, 1) < 0)
-            goto cleanup;
-
-        def->graphics[def->ngraphics] = graphics;
-        graphics = NULL;
-        def->ngraphics++;
-    }
+    if (graphics &&
+        VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics) < 0)
+        goto cleanup;
 
     gVBoxAPI.UIMachine.GetVRDxServer(machine, &VRDxServer);
     if (VRDxServer)
@@ -3407,11 +3402,8 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
         if (reuseSingleConnection)
             graphics->data.rdp.replaceUser = true;
 
-        if (VIR_REALLOC_N(def->graphics, def->ngraphics + 1) < 0)
+        if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics) < 0)
             goto cleanup;
-
-        def->graphics[def->ngraphics] = graphics;
-        def->ngraphics++;
     }
 
     ret = 0;
-- 
2.4.10




More information about the libvir-list mailing list