virCloseCallbacksGetForConn: Remove OOM handling

VIR_EXPAND_N will abort so we can simplify the hash iterator.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index 2641f45a22ff54e3851b24e6e2560f783a3a5985..1fd4dd7adfcb5cfb010076d9cbea93417d2b41f3 100644 (file)
--- a/src/hypervisor/virclosecallbacks.c
+++ b/src/hypervisor/virclosecallbacks.c
@@ -241,7 +241,6 @@ struct _virCloseCallbacksList {
 struct virCloseCallbacksData {
     virConnectPtr conn;
     virCloseCallbacksListPtr list;
-    bool oom;
 };
 
 static int
@@ -263,11 +262,7 @@ virCloseCallbacksGetOne(void *payload,
     if (data->conn != closeDef->conn || !closeDef->cb)
         return 0;
 
-    if (VIR_EXPAND_N(data->list->entries,
-                     data->list->nentries, 1) < 0) {
-        data->oom = true;
-        return 0;
-    }
+    ignore_value(VIR_EXPAND_N(data->list->entries, data->list->nentries, 1));
 
     memcpy(data->list->entries[data->list->nentries - 1].uuid,
            uuid, VIR_UUID_BUFLEN);
@@ -286,17 +281,9 @@ virCloseCallbacksGetForConn(virCloseCallbacksPtr closeCallbacks,
 
     data.conn = conn;
     data.list = list;
-    data.oom = false;
 
     virHashForEach(closeCallbacks->list, virCloseCallbacksGetOne, &data);
 
-    if (data.oom) {
-        VIR_FREE(list->entries);
-        VIR_FREE(list);
-        virReportOOMError();
-        return NULL;
-    }
-
     return list;
 }