kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ml/mailmap' into maint 

* ml/mailmap:
  mailmap: xcalloc mailmap_info

Conflicts:
	mailmap.c
maint
Junio C Hamano 2011-11-18 11:14:00 -08:00
parent 01e0f162a7 74b531f65f
commit 79cfe0c5c4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mailmap.c
View File

@ -70,8 +70,7 @@ static void add_mapping(struct string_list *map,
} else { } else {
/* create mailmap entry */ /* create mailmap entry */
struct string_list_item *item = string_list_insert_at_index(map, index, old_email); struct string_list_item *item = string_list_insert_at_index(map, index, old_email);
item->util = xmalloc(sizeof(struct mailmap_entry)); item->util = xcalloc(1, sizeof(struct mailmap_entry));
memset(item->util, 0, sizeof(struct mailmap_entry));
((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1; ((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1;
} }
me = (struct mailmap_entry *)map->items[index].util; 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); me->email = xstrdup(new_email);
} }
} else { } 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); debug_mm("mailmap: adding (complex) entry for %s at index %d\n", old_email, index);
if (new_name) if (new_name)
mi->name = xstrdup(new_name); mi->name = xstrdup(new_name);