diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-12 11:20:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-12 11:22:10 -0700 |
| commit | 13092a916d7b8211fd828a6a7ee0d3cefff995e1 (patch) | |
| tree | edec0c5d32630cb5f78e06f8b0743199c503fcdd /mailmap.c | |
| parent | 74eeaf7b72a94bd3e0ff275edb90e6ee2423b529 (diff) | |
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>
Diffstat (limited to 'mailmap.c')
| -rw-r--r-- | mailmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mailmap.c b/mailmap.c index b5c521fdea..c1a79c100c 100644 --- a/mailmap.c +++ b/mailmap.c @@ -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; } |