summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorJulian Phillips <julian@quantumfyre.co.uk>2010-06-26 00:41:37 +0100
committerJunio C Hamano <gitster@pobox.com>2010-06-27 10:06:51 -0700
commite8c8b7139c87c3e3017d3bff07f91c4349850d58 (patch)
treeb9de12fa2da7003bf851889938d22c99ad0d1c6b /mailmap.c
parentaadceea641806b363ca555ffdc04109ea716c497 (diff)
downloadgit-e8c8b7139c87c3e3017d3bff07f91c4349850d58.tar.gz
string_list: Fix argument order for string_list_lookup
Update the definition and callers of string_list_lookup to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mailmap.c')
-rw-r--r--mailmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mailmap.c b/mailmap.c
index 8b6dc36bbc..f80b701292 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -214,13 +214,13 @@ int map_user(struct string_list *map,
mailbuf[i] = 0;
debug_mm("map_user: map '%s' <%s>\n", name, mailbuf);
- item = string_list_lookup(mailbuf, map);
+ item = string_list_lookup(map, mailbuf);
if (item != NULL) {
me = (struct mailmap_entry *)item->util;
if (me->namemap.nr) {
/* The item has multiple items, so we'll look up on name too */
/* If the name is not found, we choose the simple entry */
- struct string_list_item *subitem = string_list_lookup(name, &me->namemap);
+ struct string_list_item *subitem = string_list_lookup(&me->namemap, name);
if (subitem)
item = subitem;
}