NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virHashAddOrUpdateEntry: Simplify allocation of new entry

Browse Source 
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>
This commit is contained in:
Peter Krempa 2020-01-31 08:41:55 +01:00
parent 6cf3ec4428
commit 509ddcfde2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virhash.c
View File

@ -344,7 +344,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
size_t key, len = 0; size_t key, len = 0;
virHashEntryPtr entry; virHashEntryPtr entry;
virHashEntryPtr last = NULL; virHashEntryPtr last = NULL;
void *new_name;
if ((table == NULL) || (name == NULL)) if ((table == NULL) || (name == NULL))
return -1; return -1;
@ -374,12 +373,8 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
len++; len++;
} }
if (VIR_ALLOC(entry) < 0 || !(new_name = table->keyCopy(name))) { entry = g_new0(virHashEntry, 1);
VIR_FREE(entry); entry->name = table->keyCopy(name);
return -1;
}
entry->name = new_name;
entry->payload = userdata; entry->payload = userdata;
if (last) if (last)