Merge branch 'sb/string-list'

API simplification.

* sb/string-list:
string_list: remove string_list_insert_at_index() from its API
mailmap: use higher level string list functions
string_list: document string_list_(insert,lookup)

diff --combined string-list.c
index 2f69c32a8abdc2e1490ff1bf5948a8ec2260150c,9584fa6c0a10a5e5bc657d55d0cac0bdc0386ac4..2a32a3f1f5d250d7ea2a1b4a65998eeddb44962e
--- 1/string-list.c
--- 2/string-list.c
+++ b/string-list.c
@@@ -59,13 -59,7 +59,7 @@@ static int add_entry(int insert_at, str
  
  struct string_list_item *string_list_insert(struct string_list *list, const char *string)
  {
-       return string_list_insert_at_index(list, -1, string);
- }
- 
- struct string_list_item *string_list_insert_at_index(struct string_list *list,
-                                                    int insert_at, const char *string)
- {
-       int index = add_entry(insert_at, list, string);
+       int index = add_entry(-1, list, string);
  
        if (index < 0)
                index = -1 - index;
@@@ -220,7 -214,7 +214,7 @@@ struct string_list_item *string_list_ap
  /* Yuck */
  static compare_strings_fn compare_for_qsort;
  
 -/* Only call this from inside sort_string_list! */
 +/* Only call this from inside string_list_sort! */
  static int cmp_items(const void *a, const void *b)
  {
        const struct string_list_item *one = a;
@@@ -228,7 -222,7 +222,7 @@@
        return compare_for_qsort(one->string, two->string);
  }
  
 -void sort_string_list(struct string_list *list)
 +void string_list_sort(struct string_list *list)
  {
        compare_for_qsort = list->cmp ? list->cmp : strcmp;
        qsort(list->items, list->nr, sizeof(*list->items), cmp_items);

diff --combined string-list.h
index 2cc5e4842766d03b8fd67af1a80440d94c467742,ee9b10097087b0e77c8d30ad8a24389d02538479..d3809a14172da5b1512b08fa411136821465659e
--- 1/string-list.h
--- 2/string-list.h
+++ b/string-list.h
@@@ -55,9 -55,17 +55,17 @@@ void string_list_remove_empty_items(str
  int string_list_has_string(const struct string_list *list, const char *string);
  int string_list_find_insert_index(const struct string_list *list, const char *string,
                                  int negative_existing_index);
+ /*
+  * Inserts the given string into the sorted list.
+  * If the string already exists, the list is not altered.
+  * Returns the string_list_item, the string is part of.
+  */
  struct string_list_item *string_list_insert(struct string_list *list, const char *string);
- struct string_list_item *string_list_insert_at_index(struct string_list *list,
-                                                    int insert_at, const char *string);
+ 
+ /*
+  * Checks if the given string is part of a sorted list. If it is part of the list,
+  * return the coresponding string_list_item, NULL otherwise.
+  */
  struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
  
  /*
@@@ -85,7 -93,7 +93,7 @@@ struct string_list_item *string_list_ap
   */
  struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
  
 -void sort_string_list(struct string_list *list);
 +void string_list_sort(struct string_list *list);
  int unsorted_string_list_has_string(struct string_list *list, const char *string);
  struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
                                                     const char *string);