提交 509ddcfd 编写于 作者: P Peter Krempa

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: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 6cf3ec44
...@@ -344,7 +344,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, ...@@ -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, ...@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册