diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:14:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:14:00 -0800 |
| commit | 79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f (patch) | |
| tree | 9ae710ca2bcb33eca92ebcb1fff61b98d4e08194 | |
| parent | Merge branch 'jn/maint-notes-avoid-va-args' into maint (diff) | |
| parent | mailmap: xcalloc mailmap_info (diff) | |
| download | tgif-79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f.tar.xz | |
Merge branch 'ml/mailmap' into maint
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
| -rw-r--r-- | mailmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -70,8 +70,7 @@ static void add_mapping(struct string_list *map, } else { /* create mailmap entry */ struct string_list_item *item = string_list_insert_at_index(map, index, old_email); - item->util = xmalloc(sizeof(struct mailmap_entry)); - memset(item->util, 0, sizeof(struct mailmap_entry)); + item->util = xcalloc(1, sizeof(struct mailmap_entry)); ((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1; } me = (struct mailmap_entry *)map->items[index].util; @@ -88,7 +87,7 @@ static void add_mapping(struct string_list *map, me->email = xstrdup(new_email); } } else { - struct mailmap_info *mi = xmalloc(sizeof(struct mailmap_info)); + struct mailmap_info *mi = xcalloc(1, sizeof(struct mailmap_info)); debug_mm("mailmap: adding (complex) entry for %s at index %d\n", old_email, index); if (new_name) mi->name = xstrdup(new_name); |