stuff mailmap into struct

Author: peff

builtin/blame.c

@@ -74,7 +74,7 @@ static int mark_ignored_lines;
 static struct date_mode blame_date_mode = { DATE_ISO8601 };
 static size_t blame_date_width;
 
-static struct string_list mailmap = STRING_LIST_INIT_NODUP;
+static struct mailmap mailmap = MAILMAP_INIT;
 
 #ifndef DEBUG_BLAME
 #define DEBUG_BLAME 0

builtin/cat-file.c

@@ -52,7 +52,7 @@ struct batch_options {
 
 static const char *force_path;
 
-static struct string_list mailmap = STRING_LIST_INIT_NODUP;
+static struct mailmap mailmap = MAILMAP_INIT;
 static int use_mailmap;
 
 static char *replace_idents_using_mailmap(char *, size_t *);

builtin/check-mailmap.c

@@ -24,7 +24,7 @@ static const struct option check_mailmap_options[] = {
 	OPT_END()
 };
 
-static void check_mailmap(struct string_list *mailmap, const char *contact)
+static void check_mailmap(struct mailmap *mailmap, const char *contact)
 {
 	const char *name, *mail;
 	size_t namelen, maillen;
@@ -55,7 +55,7 @@ int cmd_check_mailmap(int argc,
 		      struct repository *repo UNUSED)
 {
 	int i;
-	struct string_list mailmap = STRING_LIST_INIT_NODUP;
+	struct mailmap mailmap = MAILMAP_INIT;
 
 	repo_config(the_repository, git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, check_mailmap_options,

builtin/commit.c

@@ -1153,8 +1153,8 @@ static const char *find_author_by_nickname(const char *name)
 	av[++ac] = buf.buf;
 	av[++ac] = NULL;
 	setup_revisions(ac, av, &revs, NULL);
-	revs.mailmap = xmalloc(sizeof(struct string_list));
-	string_list_init_nodup(revs.mailmap);
+	revs.mailmap = xmalloc(sizeof(*revs.mailmap));
+	mailmap_init(revs.mailmap);
 	read_mailmap(the_repository, revs.mailmap);
 
 	if (prepare_revision_walk(&revs))

builtin/log.c

@@ -336,8 +336,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	}
 
 	if (mailmap) {
-		rev->mailmap = xmalloc(sizeof(struct string_list));
-		string_list_init_nodup(rev->mailmap);
+		rev->mailmap = xmalloc(sizeof(*rev->mailmap));
+		mailmap_init(rev->mailmap);
 		read_mailmap(the_repository, rev->mailmap);
 	}
 

ident.c

@@ -354,7 +354,7 @@ int split_ident_line(struct ident_split *split, const char *line, size_t len)
  */
 static ssize_t rewrite_ident_line(const char *person, size_t len,
 				   struct strbuf *buf,
-				   struct string_list *mailmap)
+				   struct mailmap *mailmap)
 {
 	size_t namelen, maillen;
 	const char *name;
@@ -390,7 +390,7 @@ static ssize_t rewrite_ident_line(const char *person, size_t len,
 }
 
 void apply_mailmap_to_header(struct strbuf *buf, const char **header,
-			       struct string_list *mailmap)
+			     struct mailmap *mailmap)
 {
 	size_t buf_offset = 0;
 

ident.h

@@ -1,7 +1,7 @@
 #ifndef IDENT_H
 #define IDENT_H
 
-#include "string-list.h"
+#include "mailmap.h"
 
 struct ident_split {
 	const char *name_begin;
@@ -41,7 +41,7 @@ int split_ident_line(struct ident_split *, const char *, size_t);
  * Given a commit or tag object buffer and the commit or tag headers, replaces
  * the idents in the headers with their canonical versions using the mailmap mechanism.
  */
-void apply_mailmap_to_header(struct strbuf *, const char **, struct string_list *);
+void apply_mailmap_to_header(struct strbuf *, const char **, struct mailmap *);
 
 /*
  * Compare split idents for equality or strict ordering. Note that we

mailmap.c

@@ -9,6 +9,12 @@
 #include "setup.h"
 #include "config.h"
 
+void mailmap_init(struct mailmap *map)
+{
+	struct mailmap blank = MAILMAP_INIT;
+	memcpy(map, &blank, sizeof(*map));
+}
+
 struct mailmap_info {
 	char *name;
 	char *email;
@@ -56,7 +62,7 @@ static int namemap_cmp(const char *a, const char *b)
 	return strcasecmp(a, b);
 }
 
-static void add_mapping(struct string_list *map,
+static void add_mapping(struct mailmap *map,
 			char *new_name, char *new_email,
 			char *old_name, char *old_email)
 {
@@ -68,7 +74,7 @@ static void add_mapping(struct string_list *map,
 		new_email = NULL;
 	}
 
-	item = string_list_insert(map, old_email);
+	item = string_list_insert(&map->map, old_email);
 	if (item->util) {
 		me = (struct mailmap_entry *)item->util;
 	} else {
@@ -125,7 +131,7 @@ static char *parse_name_and_email(char *buffer, char **name,
 	return (*right == '\0' ? NULL : right);
 }
 
-static void read_mailmap_line(struct string_list *map, char *buffer)
+static void read_mailmap_line(struct mailmap *map, char *buffer)
 {
 	char *name1 = NULL, *email1 = NULL, *name2 = NULL, *email2 = NULL;
 
@@ -139,7 +145,7 @@ static void read_mailmap_line(struct string_list *map, char *buffer)
 		add_mapping(map, name1, email1, name2, email2);
 }
 
-int read_mailmap_file(struct string_list *map, const char *filename,
+int read_mailmap_file(struct mailmap *map, const char *filename,
 		      unsigned flags)
 {
 	char buffer[1024];
@@ -167,7 +173,7 @@ int read_mailmap_file(struct string_list *map, const char *filename,
 	return 0;
 }
 
-static void read_mailmap_string(struct string_list *map, char *buf)
+static void read_mailmap_string(struct mailmap *map, char *buf)
 {
 	while (*buf) {
 		char *end = strchrnul(buf, '\n');
@@ -180,7 +186,7 @@ static void read_mailmap_string(struct string_list *map, char *buf)
 	}
 }
 
-int read_mailmap_blob(struct repository *repo, struct string_list *map,
+int read_mailmap_blob(struct repository *repo, struct mailmap *map,
 		      const char *name)
 {
 	struct object_id oid;
@@ -207,16 +213,16 @@ int read_mailmap_blob(struct repository *repo, struct string_list *map,
 	return 0;
 }
 
-int read_mailmap(struct repository *repo, struct string_list *map)
+int read_mailmap(struct repository *repo, struct mailmap *map)
 {
 	int err = 0;
 	char *mailmap_file = NULL, *mailmap_blob = NULL;
 
 	repo_config_get_pathname(repo, "mailmap.file", &mailmap_file);
 	repo_config_get_string(repo, "mailmap.blob", &mailmap_blob);
 
-	string_list_init_dup(map);
-	map->cmp = namemap_cmp;
+	string_list_init_dup(&map->map);
+	map->map.cmp = namemap_cmp;
 
 	if (!mailmap_blob && is_bare_repository())
 		mailmap_blob = xstrdup("HEAD:.mailmap");
@@ -236,9 +242,9 @@ int read_mailmap(struct repository *repo, struct string_list *map)
 	return err;
 }
 
-void clear_mailmap(struct string_list *map)
+void clear_mailmap(struct mailmap *map)
 {
-	string_list_clear_func(map, free_mailmap_entry);
+	string_list_clear_func(&map->map, free_mailmap_entry);
 }
 
 /*
@@ -291,14 +297,14 @@ static struct string_list_item *lookup_prefix(struct string_list *map,
 	return NULL;
 }
 
-int map_user(struct string_list *map,
+int map_user(struct mailmap *map,
 	     const char **email, size_t *emaillen,
 	     const char **name, size_t *namelen)
 {
 	struct string_list_item *item;
 	struct mailmap_entry *me;
 
-	item = lookup_prefix(map, *email, *emaillen);
+	item = lookup_prefix(&map->map, *email, *emaillen);
 	if (item) {
 		me = (struct mailmap_entry *)item->util;
 		if (me->namemap.nr) {

mailmap.h

@@ -1,21 +1,30 @@
 #ifndef MAILMAP_H
 #define MAILMAP_H
 
+#include "string-list.h"
+
 struct repository;
-struct string_list;
+
+struct mailmap {
+	struct string_list map;
+};
+
+#define MAILMAP_INIT { STRING_LIST_INIT_DUP }
+
+void mailmap_init(struct mailmap *map);
 
 /* Flags for read_mailmap_file() */
 #define MAILMAP_NOFOLLOW (1<<0)
 
-int read_mailmap_file(struct string_list *map, const char *filename,
+int read_mailmap_file(struct mailmap *map, const char *filename,
 		      unsigned flags);
-int read_mailmap_blob(struct repository *repo, struct string_list *map,
+int read_mailmap_blob(struct repository *repo, struct mailmap *map,
 		      const char *name);
 
-int read_mailmap(struct repository *repo, struct string_list *map);
-void clear_mailmap(struct string_list *map);
+int read_mailmap(struct repository *repo, struct mailmap *map);
+void clear_mailmap(struct mailmap *map);
 
-int map_user(struct string_list *map,
+int map_user(struct mailmap *map,
 			 const char **email, size_t *emaillen, const char **name, size_t *namelen);
 
 #endif

pretty.c

@@ -777,12 +777,13 @@ const char *repo_logmsg_reencode(struct repository *r,
 static int mailmap_name(const char **email, size_t *email_len,
 			const char **name, size_t *name_len)
 {
-	static struct string_list *mail_map;
+	static struct mailmap *mail_map;
 	if (!mail_map) {
-		CALLOC_ARRAY(mail_map, 1);
+		ALLOC_ARRAY(mail_map, 1);
+		mailmap_init(mail_map);
 		read_mailmap(the_repository, mail_map);
 	}
-	return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
+	return mail_map->map.nr && map_user(mail_map, email, email_len, name, name_len);
 }
 
 static size_t format_person_part(struct strbuf *sb, char part,