cocci: refactor common patterns to use xstrdup_or_null()
d64ea0f83b
("git-compat-util: add xstrdup_or_null helper",
2015-01-12) added a handy wrapper that allows us to get a duplicate
of a string or NULL if the original is NULL, but a handful of
codepath predate its introduction or just weren't aware of it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -103,10 +103,8 @@ static void add_mapping(struct string_list *map,
|
||||
} else {
|
||||
struct mailmap_info *mi = xcalloc(1, sizeof(struct mailmap_info));
|
||||
debug_mm("mailmap: adding (complex) entry for '%s'\n", old_email);
|
||||
if (new_name)
|
||||
mi->name = xstrdup(new_name);
|
||||
if (new_email)
|
||||
mi->email = xstrdup(new_email);
|
||||
mi->name = xstrdup_or_null(new_name);
|
||||
mi->email = xstrdup_or_null(new_email);
|
||||
string_list_insert(&me->namemap, old_name)->util = mi;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user