[PATCH 11/12] rpc: use VIR_DELETE_ELEMENTS_N for list of netclient streams

[Laine Stump <laine@xxxxxxxxx>]

---
 src/rpc/virnetclient.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 18f60c1..e6b651f 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -923,25 +923,13 @@ void virNetClientRemoveStream(virNetClientPtr client,
     virNetClientLock(client);
     size_t i;
     for (i = 0 ; i < client->nstreams ; i++) {
-        if (client->streams[i] == st)
+        if (client->streams[i] == st) {
+             virObjectUnref(st);
+             ignore_value(VIR_DELETE_ELEMENTS_N(client->streams, i,
+                                                client->nstreams, 1));
             break;
+        }
     }
-    if (i == client->nstreams)
-        goto cleanup;
-
-    if (client->nstreams > 1) {
-        memmove(client->streams + i,
-                client->streams + i + 1,
-                sizeof(*client->streams) *
-                (client->nstreams - (i + 1)));
-        VIR_SHRINK_N(client->streams, client->nstreams, 1);
-    } else {
-        VIR_FREE(client->streams);
-        client->nstreams = 0;
-    }
-    virObjectUnref(st);
-
-cleanup:
     virNetClientUnlock(client);
 }
 
-- 
1.7.11.7

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list