[PATCH 2/3 v2] mailmap: use higher level string list functions
- From
Stefan Beller <sbeller@google.com>
- Date
- Nov 24, 2014, 21:52 UTC
- Message-ID
- <1416865932-18285-1-git-send-email-sbeller@google.com>
- In-Reply-To
- <xmqq3898w9v4.fsf@gitster.dls.corp.google.com>
No functional changes intended. This commit makes user of higher level and better documented functions of the string list API, so the code is more understandable.
Note that also the required computational amount should not change in principal as we need to look up the item no matter if it is already part of the list or not. Once looked up, insertion comes for free.
Signed-off-by: Stefan Beller <sbeller@google.com> ---
Changes since Version 1: * Remove declaration-after-statement.
mailmap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/mailmap.c b/mailmap.c index 81890a6..3b00a65 100644 --- a/mailmap.c +++ b/mailmap.c @@ -71,6 +71,7 @@ static void add_mapping(struct string_list *map, char *old_name, char *old_email) { struct mailmap_entry *me; + struct string_list_item *item; int index; if (old_email == NULL) { @@ -78,15 +79,10 @@ static void add_mapping(struct string_list *map, new_email = NULL; } - if ((index = string_list_find_insert_index(map, old_email, 1)) < 0) { - /* mailmap entry exists, invert index value */ - index = -1 - index; - me = (struct mailmap_entry *)map->items[index].util; + item = string_list_insert(map, old_email); + if (item->util) { + me = (struct mailmap_entry *)item->util; } else { - /* create mailmap entry */ - struct string_list_item *item; - - item = string_list_insert_at_index(map, index, old_email); me = xcalloc(1, sizeof(struct mailmap_entry)); me->namemap.strdup_strings = 1; me->namemap.cmp = namemap_cmp;
-- 2.2.0.rc3