From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 31 Jan 2020 07:41:55 +0000 (+0100)
Subject: virHashAddOrUpdateEntry: Simplify allocation of new entry
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=509ddcfde2af565a63ba193d41395aa99ea4744e;p=libvirt.git

virHashAddOrUpdateEntry: Simplify allocation of new entry

Use g_new0 and skip checking of the return value of keyCopy callback
as both are bound to return a valid pointer.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virhash.c b/src/util/virhash.c
index c57d9f8292..36a2d312fc 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -344,7 +344,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
     size_t key, len = 0;
     virHashEntryPtr entry;
     virHashEntryPtr last = NULL;
-    void *new_name;
 
     if ((table == NULL) || (name == NULL))
         return -1;
@@ -374,12 +373,8 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
         len++;
     }
 
-    if (VIR_ALLOC(entry) < 0 || !(new_name = table->keyCopy(name))) {
-        VIR_FREE(entry);
-        return -1;
-    }
-
-    entry->name = new_name;
+    entry = g_new0(virHashEntry, 1);
+    entry->name = table->keyCopy(name);
     entry->payload = userdata;
 
     if (last)