util: alloc: Reimplement VIR_APPEND_ELEMENT using virAppendElement

Use virAppendElement instead of virInsertElementsN to implement
VIR_APPEND_ELEMENT which allows us to remove error handling as the
only relevant errors were removed when switching to aborting memory
allocation functions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

3 files changed, 5 insertions, 8 deletions

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index b6f3233f64..444fe3dbe7 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -237,7 +237,9 @@ collectServers(void *payload,
     if (!srv)
         return -1;
 
-    return VIR_APPEND_ELEMENT(*data->servers, data->nservers, srv);
+    VIR_APPEND_ELEMENT(*data->servers, data->nservers, srv);
+
+    return 0;
 }
 
 
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index e0fbd607bf..ca11f1688e 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -593,8 +593,7 @@ int virNetMessageAddFD(virNetMessage *msg,
                              newfd);
         goto error;
     }
-    if (VIR_APPEND_ELEMENT(msg->fds, msg->nfds, newfd) < 0)
-        goto error;
+    VIR_APPEND_ELEMENT(msg->fds, msg->nfds, newfd);
     return 0;
  error:
     VIR_FORCE_CLOSE(newfd);
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index cfb65f8b5f..bb1a96b65e 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -1086,16 +1086,12 @@ virNetServerGetClients(virNetServer *srv,
 
     for (i = 0; i < srv->nclients; i++) {
         virNetServerClient *client = virObjectRef(srv->clients[i]);
-        if (VIR_APPEND_ELEMENT(list, nclients, client) < 0) {
-            virObjectUnref(client);
-            goto cleanup;
-        }
+        VIR_APPEND_ELEMENT(list, nclients, client);
     }
 
     *clts = g_steal_pointer(&list);
     ret = nclients;
 
- cleanup:
     virObjectListFreeCount(list, nclients);
     virObjectUnlock(srv);
     return ret;