{"thread":{"id":"24201","subject":"[PATCH v2 4/7] string_list: Fix argument order for string_list_insert_at_index","startedAt":"2010-06-25T23:41:32Z","lastAt":"2010-06-27T17:22:14Z","messageCount":9,"participants":["Julian Phillips","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":7},"messages":[{"id":"144274","messageId":"20100625234110.18927.33169.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":null,"subject":"[PATCH v2 0/7] Make the string_list API consistent","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:32Z","receivedAt":"2010-06-25T23:41:32Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"This is an re-roll of the series to make all the string_list functions take the\nlist as the first argument that I sent back in April.  The first 6 patches are\nbased on master as of a few minutes ago.  The last patch fixes up the only extra\nstring_list_...  calls in next, which are from the jn/grep-open topic (they are\nall string_list_append so patch 7 could be squashed into patch 6).\n\nJulian Phillips (7):\n  string_list: Fix argument order for print_string_list\n  string_list: Fix argument order for for_each_string_list\n  string_list: Fix argument order for string_list_insert\n  string_list: Fix argument order for string_list_insert_at_index\n  string_list: Fix argument order for string_list_lookup\n  string_list: Fix argument order for string_list_append\n  grep: fix string_list_append calls\n\n Documentation/technical/api-string-list.txt |    4 +-\n builtin/apply.c                             |   10 ++--\n builtin/commit.c                            |    2 +-\n builtin/fast-export.c                       |    4 +-\n builtin/fetch.c                             |   18 ++++----\n builtin/fmt-merge-msg.c                     |   18 ++++----\n builtin/grep.c                              |    6 +-\n builtin/log.c                               |   20 ++++----\n builtin/ls-files.c                          |    2 +-\n builtin/mailsplit.c                         |    2 +-\n builtin/mv.c                                |    2 +-\n builtin/receive-pack.c                      |    4 +-\n builtin/remote.c                            |   68 +++++++++++++-------------\n builtin/rerere.c                            |    2 +-\n builtin/shortlog.c                          |    4 +-\n builtin/show-ref.c                          |    2 +-\n diff-no-index.c                             |    2 +-\n http-backend.c                              |    6 +-\n mailmap.c                                   |    8 ++--\n merge-recursive.c                           |   24 +++++-----\n notes.c                                     |   12 ++--\n reflog-walk.c                               |    4 +-\n remote.c                                    |    6 +-\n rerere.c                                    |   10 ++--\n resolve-undo.c                              |    8 ++--\n revision.c                                  |    4 +-\n string-list.c                               |   18 ++++----\n string-list.h                               |   16 +++---\n transport-helper.c                          |    4 +-\n wt-status.c                                 |   10 ++--\n 30 files changed, 150 insertions(+), 150 deletions(-)\n"},{"id":"144275","messageId":"20100625234140.18927.89849.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 1/7] string_list: Fix argument order for print_string_list","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:33Z","receivedAt":"2010-06-25T23:41:33Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of print_string_list to use the\nstring_list as the first argument.  This helps make the API easier to\nuse by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n string-list.c |    2 +-\n string-list.h |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/string-list.c b/string-list.c\nindex c9ad7fc..b7e57a4 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -139,7 +139,7 @@ void string_list_clear_func(struct string_list *list, string_list_clear_func_t c\n }\n \n \n-void print_string_list(const char *text, const struct string_list *p)\n+void print_string_list(const struct string_list *p, const char *text)\n {\n \tint i;\n \tif ( text )\ndiff --git a/string-list.h b/string-list.h\nindex 63b69c8..de29dcd 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -12,7 +12,7 @@ struct string_list\n \tunsigned int strdup_strings:1;\n };\n \n-void print_string_list(const char *text, const struct string_list *p);\n+void print_string_list(const struct string_list *p, const char *text);\n void string_list_clear(struct string_list *list, int free_util);\n \n /* Use this function to call a custom clear function on each util pointer */\n-- \n1.7.0.4\n"},{"id":"144273","messageId":"20100625234140.18927.48317.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 2/7] string_list: Fix argument order for for_each_string_list","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:34Z","receivedAt":"2010-06-25T23:41:34Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of for_each_string_list to use the\nstring_list as the first argument.  This helps make the string_list\nAPI easier to use by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n builtin/fetch.c    |    2 +-\n builtin/ls-files.c |    2 +-\n builtin/remote.c   |   16 ++++++++--------\n notes.c            |    6 +++---\n resolve-undo.c     |    2 +-\n string-list.c      |    4 ++--\n string-list.h      |    4 ++--\n 7 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 5cb369c..7edeaef 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -634,7 +634,7 @@ static void find_non_local_tags(struct transport *transport,\n \t * For all the tags in the remote_refs string list, call\n \t * add_to_tail to add them to the list of refs to be fetched\n \t */\n-\tfor_each_string_list(add_to_tail, &remote_refs, &data);\n+\tfor_each_string_list(&remote_refs, add_to_tail, &data);\n \n \tstring_list_clear(&remote_refs, 0);\n }\ndiff --git a/builtin/ls-files.c b/builtin/ls-files.c\nindex 0804047..1b9b8a8 100644\n--- a/builtin/ls-files.c\n+++ b/builtin/ls-files.c\n@@ -190,7 +190,7 @@ static void show_ru_info(void)\n {\n \tif (!the_index.resolve_undo)\n \t\treturn;\n-\tfor_each_string_list(show_one_ru, the_index.resolve_undo, NULL);\n+\tfor_each_string_list(the_index.resolve_undo, show_one_ru, NULL);\n }\n \n static void show_files(struct dir_struct *dir)\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 0a52667..25c3daa 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -1096,24 +1096,24 @@ static int show(int argc, const char **argv)\n \n \t\t/* remote branch info */\n \t\tinfo.width = 0;\n-\t\tfor_each_string_list(add_remote_to_show_info, &states.new, &info);\n-\t\tfor_each_string_list(add_remote_to_show_info, &states.tracked, &info);\n-\t\tfor_each_string_list(add_remote_to_show_info, &states.stale, &info);\n+\t\tfor_each_string_list(&states.new, add_remote_to_show_info, &info);\n+\t\tfor_each_string_list(&states.tracked, add_remote_to_show_info, &info);\n+\t\tfor_each_string_list(&states.stale, add_remote_to_show_info, &info);\n \t\tif (info.list->nr)\n \t\t\tprintf(\"  Remote branch%s:%s\\n\",\n \t\t\t       info.list->nr > 1 ? \"es\" : \"\",\n \t\t\t\tno_query ? \" (status not queried)\" : \"\");\n-\t\tfor_each_string_list(show_remote_info_item, info.list, &info);\n+\t\tfor_each_string_list(info.list, show_remote_info_item, &info);\n \t\tstring_list_clear(info.list, 0);\n \n \t\t/* git pull info */\n \t\tinfo.width = 0;\n \t\tinfo.any_rebase = 0;\n-\t\tfor_each_string_list(add_local_to_show_info, &branch_list, &info);\n+\t\tfor_each_string_list(&branch_list, add_local_to_show_info, &info);\n \t\tif (info.list->nr)\n \t\t\tprintf(\"  Local branch%s configured for 'git pull':\\n\",\n \t\t\t       info.list->nr > 1 ? \"es\" : \"\");\n-\t\tfor_each_string_list(show_local_info_item, info.list, &info);\n+\t\tfor_each_string_list(info.list, show_local_info_item, &info);\n \t\tstring_list_clear(info.list, 0);\n \n \t\t/* git push info */\n@@ -1121,14 +1121,14 @@ static int show(int argc, const char **argv)\n \t\t\tprintf(\"  Local refs will be mirrored by 'git push'\\n\");\n \n \t\tinfo.width = info.width2 = 0;\n-\t\tfor_each_string_list(add_push_to_show_info, &states.push, &info);\n+\t\tfor_each_string_list(&states.push, add_push_to_show_info, &info);\n \t\tqsort(info.list->items, info.list->nr,\n \t\t\tsizeof(*info.list->items), cmp_string_with_push);\n \t\tif (info.list->nr)\n \t\t\tprintf(\"  Local ref%s configured for 'git push'%s:\\n\",\n \t\t\t\tinfo.list->nr > 1 ? \"s\" : \"\",\n \t\t\t\tno_query ? \" (status not queried)\" : \"\");\n-\t\tfor_each_string_list(show_push_info_item, info.list, &info);\n+\t\tfor_each_string_list(info.list, show_push_info_item, &info);\n \t\tstring_list_clear(info.list, 0);\n \n \t\tfree_remote_ref_states(&states);\ndiff --git a/notes.c b/notes.c\nindex 6ee04e7..f379681 100644\n--- a/notes.c\n+++ b/notes.c\n@@ -969,7 +969,7 @@ struct notes_tree **load_notes_trees(struct string_list *refs)\n \ttrees = xmalloc((refs->nr+1) * sizeof(struct notes_tree *));\n \tcb_data.counter = 0;\n \tcb_data.trees = trees;\n-\tfor_each_string_list(load_one_display_note_ref, refs, &cb_data);\n+\tfor_each_string_list(refs, load_one_display_note_ref, &cb_data);\n \ttrees[cb_data.counter] = NULL;\n \treturn trees;\n }\n@@ -996,8 +996,8 @@ void init_display_notes(struct display_notes_opt *opt)\n \tgit_config(notes_display_config, &load_config_refs);\n \n \tif (opt && opt->extra_notes_refs)\n-\t\tfor_each_string_list(string_list_add_refs_from_list,\n-\t\t\t\t     opt->extra_notes_refs,\n+\t\tfor_each_string_list(opt->extra_notes_refs,\n+\t\t\t\t     string_list_add_refs_from_list,\n \t\t\t\t     &display_notes_refs);\n \n \tdisplay_notes_trees = load_notes_trees(&display_notes_refs);\ndiff --git a/resolve-undo.c b/resolve-undo.c\nindex 0f50ee0..e93b3d1 100644\n--- a/resolve-undo.c\n+++ b/resolve-undo.c\n@@ -50,7 +50,7 @@ static int write_one(struct string_list_item *item, void *cbdata)\n \n void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)\n {\n-\tfor_each_string_list(write_one, resolve_undo, sb);\n+   for_each_string_list(resolve_undo, write_one, sb);\n }\n \n struct string_list *resolve_undo_read(const char *data, unsigned long size)\ndiff --git a/string-list.c b/string-list.c\nindex b7e57a4..09798a2 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -92,8 +92,8 @@ struct string_list_item *string_list_lookup(const char *string, struct string_li\n \treturn list->items + i;\n }\n \n-int for_each_string_list(string_list_each_func_t fn,\n-\t\t\t struct string_list *list, void *cb_data)\n+int for_each_string_list(struct string_list *list,\n+\t\t\t string_list_each_func_t fn, void *cb_data)\n {\n \tint i, ret = 0;\n \tfor (i = 0; i < list->nr; i++)\ndiff --git a/string-list.h b/string-list.h\nindex de29dcd..1e2dfc3 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -22,8 +22,8 @@ void string_list_clear_func(struct string_list *list, string_list_clear_func_t c\n \n /* Use this function to iterate over each item */\n typedef int (*string_list_each_func_t)(struct string_list_item *, void *);\n-int for_each_string_list(string_list_each_func_t,\n-\t\t\t struct string_list *list, void *cb_data);\n+int for_each_string_list(struct string_list *list,\n+\t\t\t string_list_each_func_t, void *cb_data);\n \n /* Use these functions only on sorted lists: */\n int string_list_has_string(const struct string_list *list, const char *string);\n-- \n1.7.0.4\n"},{"id":"144278","messageId":"20100625234140.18927.61112.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 3/7] string_list: Fix argument order for string_list_insert","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:35Z","receivedAt":"2010-06-25T23:41:35Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of string_list_insert to use the\nstring_list as the first argument.  This helps make the string_list\nAPI easier to use by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n builtin/apply.c     |    6 +++---\n builtin/commit.c    |    2 +-\n builtin/fetch.c     |    4 ++--\n builtin/mailsplit.c |    2 +-\n builtin/mv.c        |    2 +-\n builtin/remote.c    |    6 +++---\n builtin/shortlog.c  |    2 +-\n builtin/show-ref.c  |    2 +-\n diff-no-index.c     |    2 +-\n http-backend.c      |    2 +-\n mailmap.c           |    2 +-\n merge-recursive.c   |   16 ++++++++--------\n reflog-walk.c       |    2 +-\n remote.c            |    2 +-\n rerere.c            |   10 +++++-----\n resolve-undo.c      |    4 ++--\n string-list.c       |    2 +-\n string-list.h       |    2 +-\n wt-status.c         |   10 +++++-----\n 19 files changed, 40 insertions(+), 40 deletions(-)\n\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 562e534..d103837 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -2664,7 +2664,7 @@ static void add_to_fn_table(struct patch *patch)\n \t * file creations and copies\n \t */\n \tif (patch->new_name != NULL) {\n-\t\titem = string_list_insert(patch->new_name, &fn_table);\n+\t\titem = string_list_insert(&fn_table, patch->new_name);\n \t\titem->util = patch;\n \t}\n \n@@ -2673,7 +2673,7 @@ static void add_to_fn_table(struct patch *patch)\n \t * later chunks shouldn't patch old names\n \t */\n \tif ((patch->new_name == NULL) || (patch->is_rename)) {\n-\t\titem = string_list_insert(patch->old_name, &fn_table);\n+\t\titem = string_list_insert(&fn_table, patch->old_name);\n \t\titem->util = PATH_WAS_DELETED;\n \t}\n }\n@@ -2686,7 +2686,7 @@ static void prepare_fn_table(struct patch *patch)\n \twhile (patch) {\n \t\tif ((patch->new_name == NULL) || (patch->is_rename)) {\n \t\t\tstruct string_list_item *item;\n-\t\t\titem = string_list_insert(patch->old_name, &fn_table);\n+\t\t\titem = string_list_insert(&fn_table, patch->old_name);\n \t\t\titem->util = PATH_TO_BE_DELETED;\n \t\t}\n \t\tpatch = patch->next;\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 3d99cf9..c6b053a 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -219,7 +219,7 @@ static int list_paths(struct string_list *list, const char *with_tree,\n \t\t\tcontinue;\n \t\tif (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))\n \t\t\tcontinue;\n-\t\titem = string_list_insert(ce->name, list);\n+\t\titem = string_list_insert(list, ce->name);\n \t\tif (ce_skip_worktree(ce))\n \t\t\titem->util = item; /* better a valid pointer than a fake one */\n \t}\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 7edeaef..d1e5865 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -528,7 +528,7 @@ static int add_existing(const char *refname, const unsigned char *sha1,\n \t\t\tint flag, void *cbdata)\n {\n \tstruct string_list *list = (struct string_list *)cbdata;\n-\tstruct string_list_item *item = string_list_insert(refname, list);\n+\tstruct string_list_item *item = string_list_insert(list, refname);\n \titem->util = (void *)sha1;\n \treturn 0;\n }\n@@ -617,7 +617,7 @@ static void find_non_local_tags(struct transport *transport,\n \t\t    string_list_has_string(&existing_refs, ref->name))\n \t\t\tcontinue;\n \n-\t\titem = string_list_insert(ref->name, &remote_refs);\n+\t\titem = string_list_insert(&remote_refs, ref->name);\n \t\titem->util = (void *)ref->old_sha1;\n \t}\n \tstring_list_clear(&existing_refs, 0);\ndiff --git a/builtin/mailsplit.c b/builtin/mailsplit.c\nindex cdfc1b7..e4560da 100644\n--- a/builtin/mailsplit.c\n+++ b/builtin/mailsplit.c\n@@ -121,7 +121,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)\n \t\t\tif (dent->d_name[0] == '.')\n \t\t\t\tcontinue;\n \t\t\tsnprintf(name, sizeof(name), \"%s/%s\", *sub, dent->d_name);\n-\t\t\tstring_list_insert(name, list);\n+\t\t\tstring_list_insert(list, name);\n \t\t}\n \n \t\tclosedir(dir);\ndiff --git a/builtin/mv.c b/builtin/mv.c\nindex c07f53b..38574b8 100644\n--- a/builtin/mv.c\n+++ b/builtin/mv.c\n@@ -180,7 +180,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)\n \t\t} else if (string_list_has_string(&src_for_dst, dst))\n \t\t\tbad = \"multiple sources for the same target\";\n \t\telse\n-\t\t\tstring_list_insert(dst, &src_for_dst);\n+\t\t\tstring_list_insert(&src_for_dst, dst);\n \n \t\tif (bad) {\n \t\t\tif (ignore_errors) {\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 25c3daa..70ecf3d 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -263,7 +263,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n \t\t} else\n \t\t\treturn 0;\n \n-\t\titem = string_list_insert(name, &branch_list);\n+\t\titem = string_list_insert(&branch_list, name);\n \n \t\tif (!item->util)\n \t\t\titem->util = xcalloc(sizeof(struct branch_info), 1);\n@@ -885,7 +885,7 @@ static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)\n \tint n = strlen(item->string);\n \tif (n > info->width)\n \t\tinfo->width = n;\n-\tstring_list_insert(item->string, info->list);\n+\tstring_list_insert(info->list, item->string);\n \treturn 0;\n }\n \n@@ -932,7 +932,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb\n \tif (branch_info->rebase)\n \t\tshow_info->any_rebase = 1;\n \n-\titem = string_list_insert(branch_item->string, show_info->list);\n+\titem = string_list_insert(show_info->list, branch_item->string);\n \titem->util = branch_info;\n \n \treturn 0;\ndiff --git a/builtin/shortlog.c b/builtin/shortlog.c\nindex 5089502..86d32fb 100644\n--- a/builtin/shortlog.c\n+++ b/builtin/shortlog.c\n@@ -84,7 +84,7 @@ static void insert_one_record(struct shortlog *log,\n \t\tsnprintf(namebuf + len, room, \" <%.*s>\", maillen, emailbuf);\n \t}\n \n-\titem = string_list_insert(namebuf, &log->list);\n+\titem = string_list_insert(&log->list, namebuf);\n \tif (item->util == NULL)\n \t\titem->util = xcalloc(1, sizeof(struct string_list));\n \ndiff --git a/builtin/show-ref.c b/builtin/show-ref.c\nindex 17ada88..0b2a9ad 100644\n--- a/builtin/show-ref.c\n+++ b/builtin/show-ref.c\n@@ -105,7 +105,7 @@ match:\n static int add_existing(const char *refname, const unsigned char *sha1, int flag, void *cbdata)\n {\n \tstruct string_list *list = (struct string_list *)cbdata;\n-\tstring_list_insert(refname, list);\n+\tstring_list_insert(list, refname);\n \treturn 0;\n }\n \ndiff --git a/diff-no-index.c b/diff-no-index.c\nindex 4cd9dac..43aeeba 100644\n--- a/diff-no-index.c\n+++ b/diff-no-index.c\n@@ -26,7 +26,7 @@ static int read_directory(const char *path, struct string_list *list)\n \n \twhile ((e = readdir(dir)))\n \t\tif (strcmp(\".\", e->d_name) && strcmp(\"..\", e->d_name))\n-\t\t\tstring_list_insert(e->d_name, list);\n+\t\t\tstring_list_insert(list, e->d_name);\n \n \tclosedir(dir);\n \treturn 0;\ndiff --git a/http-backend.c b/http-backend.c\nindex 44ce6bb..d43732a 100644\n--- a/http-backend.c\n+++ b/http-backend.c\n@@ -39,7 +39,7 @@ static struct string_list *get_parameters(void)\n \n \t\t\ti = string_list_lookup(name, query_params);\n \t\t\tif (!i)\n-\t\t\t\ti = string_list_insert(name, query_params);\n+\t\t\t\ti = string_list_insert(query_params, name);\n \t\t\telse\n \t\t\t\tfree(i->util);\n \t\t\ti->util = value;\ndiff --git a/mailmap.c b/mailmap.c\nindex b68c1fe..badf6a4 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -92,7 +92,7 @@ static void add_mapping(struct string_list *map,\n \t\t\tmi->name = xstrdup(new_name);\n \t\tif (new_email)\n \t\t\tmi->email = xstrdup(new_email);\n-\t\tstring_list_insert(old_name, &me->namemap)->util = mi;\n+\t\tstring_list_insert(&me->namemap, old_name)->util = mi;\n \t}\n \n \tdebug_mm(\"mailmap:  '%s' <%s> -> '%s' <%s>\\n\",\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 206c103..5e60f4b 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -238,9 +238,9 @@ static int save_files_dirs(const unsigned char *sha1,\n \tnewpath[baselen + len] = '\\0';\n \n \tif (S_ISDIR(mode))\n-\t\tstring_list_insert(newpath, &o->current_directory_set);\n+\t\tstring_list_insert(&o->current_directory_set, newpath);\n \telse\n-\t\tstring_list_insert(newpath, &o->current_file_set);\n+\t\tstring_list_insert(&o->current_file_set, newpath);\n \tfree(newpath);\n \n \treturn (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);\n@@ -271,7 +271,7 @@ static struct stage_data *insert_stage_data(const char *path,\n \t\t\te->stages[2].sha, &e->stages[2].mode);\n \tget_tree_entry(b->object.sha1, path,\n \t\t\te->stages[3].sha, &e->stages[3].mode);\n-\titem = string_list_insert(path, entries);\n+\titem = string_list_insert(entries, path);\n \titem->util = e;\n \treturn e;\n }\n@@ -296,7 +296,7 @@ static struct string_list *get_unmerged(void)\n \n \t\titem = string_list_lookup(ce->name, unmerged);\n \t\tif (!item) {\n-\t\t\titem = string_list_insert(ce->name, unmerged);\n+\t\t\titem = string_list_insert(unmerged, ce->name);\n \t\t\titem->util = xcalloc(1, sizeof(struct stage_data));\n \t\t}\n \t\te = item->util;\n@@ -369,7 +369,7 @@ static struct string_list *get_renames(struct merge_options *o,\n \t\t\t\t\to_tree, a_tree, b_tree, entries);\n \t\telse\n \t\t\tre->dst_entry = item->util;\n-\t\titem = string_list_insert(pair->one->path, renames);\n+\t\titem = string_list_insert(renames, pair->one->path);\n \t\titem->util = re;\n \t}\n \topts.output_format = DIFF_FORMAT_NO_OUTPUT;\n@@ -432,7 +432,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *\n \t       lstat(newpath, &st) == 0)\n \t\tsprintf(p, \"_%d\", suffix++);\n \n-\tstring_list_insert(newpath, &o->current_file_set);\n+\tstring_list_insert(&o->current_file_set, newpath);\n \treturn newpath;\n }\n \n@@ -811,12 +811,12 @@ static int process_renames(struct merge_options *o,\n \n \tfor (i = 0; i < a_renames->nr; i++) {\n \t\tsre = a_renames->items[i].util;\n-\t\tstring_list_insert(sre->pair->two->path, &a_by_dst)->util\n+\t\tstring_list_insert(&a_by_dst, sre->pair->two->path)->util\n \t\t\t= sre->dst_entry;\n \t}\n \tfor (i = 0; i < b_renames->nr; i++) {\n \t\tsre = b_renames->items[i].util;\n-\t\tstring_list_insert(sre->pair->two->path, &b_by_dst)->util\n+\t\tstring_list_insert(&b_by_dst, sre->pair->two->path)->util\n \t\t\t= sre->dst_entry;\n \t}\n \ndiff --git a/reflog-walk.c b/reflog-walk.c\nindex caba4f7..f125f37 100644\n--- a/reflog-walk.c\n+++ b/reflog-walk.c\n@@ -190,7 +190,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,\n \t\t}\n \t\tif (!reflogs || reflogs->nr == 0)\n \t\t\treturn -1;\n-\t\tstring_list_insert(branch, &info->complete_reflogs)->util\n+\t\tstring_list_insert(&info->complete_reflogs, branch)->util\n \t\t\t= reflogs;\n \t}\n \ndiff --git a/remote.c b/remote.c\nindex e51cd22..851d860 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -777,7 +777,7 @@ void ref_remove_duplicates(struct ref *ref_map)\n \t\t\tcontinue;\n \t\t}\n \n-\t\titem = string_list_insert(ref_map->peer_ref->name, &refs);\n+\t\titem = string_list_insert(&refs, ref_map->peer_ref->name);\n \t\titem->util = ref_map;\n \t}\n \tstring_list_clear(&refs, 0);\ndiff --git a/rerere.c b/rerere.c\nindex 2197890..d03a696 100644\n--- a/rerere.c\n+++ b/rerere.c\n@@ -46,7 +46,7 @@ static void read_rr(struct string_list *rr)\n \t\t\t; /* do nothing */\n \t\tif (i == sizeof(buf))\n \t\t\tdie(\"filename too long\");\n-\t\tstring_list_insert(buf, rr)->util = name;\n+\t\tstring_list_insert(rr, buf)->util = name;\n \t}\n \tfclose(in);\n }\n@@ -354,7 +354,7 @@ static int find_conflict(struct string_list *conflict)\n \t\t    ce_same_name(e2, e3) &&\n \t\t    S_ISREG(e2->ce_mode) &&\n \t\t    S_ISREG(e3->ce_mode)) {\n-\t\t\tstring_list_insert((const char *)e2->name, conflict);\n+\t\t\tstring_list_insert(conflict, (const char *)e2->name);\n \t\t\ti++; /* skip over both #2 and #3 */\n \t\t}\n \t}\n@@ -449,7 +449,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)\n \t\t\tif (ret < 1)\n \t\t\t\tcontinue;\n \t\t\thex = xstrdup(sha1_to_hex(sha1));\n-\t\t\tstring_list_insert(path, rr)->util = hex;\n+\t\t\tstring_list_insert(rr, path)->util = hex;\n \t\t\tif (mkdir(git_path(\"rr-cache/%s\", hex), 0755))\n \t\t\t\tcontinue;\n \t\t\thandle_file(path, NULL, rerere_path(hex, \"preimage\"));\n@@ -471,7 +471,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)\n \t\tif (has_rerere_resolution(name)) {\n \t\t\tif (!merge(name, path)) {\n \t\t\t\tif (rerere_autoupdate)\n-\t\t\t\t\tstring_list_insert(path, &update);\n+\t\t\t\t\tstring_list_insert(&update, path);\n \t\t\t\tfprintf(stderr,\n \t\t\t\t\t\"%s '%s' using previous resolution.\\n\",\n \t\t\t\t\trerere_autoupdate\n@@ -577,7 +577,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)\n \tfprintf(stderr, \"Updated preimage for '%s'\\n\", path);\n \n \n-\tstring_list_insert(path, rr)->util = hex;\n+\tstring_list_insert(rr, path)->util = hex;\n \tfprintf(stderr, \"Forgot resolution for %s\\n\", path);\n \treturn 0;\n }\ndiff --git a/resolve-undo.c b/resolve-undo.c\nindex e93b3d1..8b93559 100644\n--- a/resolve-undo.c\n+++ b/resolve-undo.c\n@@ -20,7 +20,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)\n \t\tistate->resolve_undo = resolve_undo;\n \t}\n \tresolve_undo = istate->resolve_undo;\n-\tlost = string_list_insert(ce->name, resolve_undo);\n+\tlost = string_list_insert(resolve_undo, ce->name);\n \tif (!lost->util)\n \t\tlost->util = xcalloc(1, sizeof(*ui));\n \tui = lost->util;\n@@ -70,7 +70,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)\n \t\tlen = strlen(data) + 1;\n \t\tif (size <= len)\n \t\t\tgoto error;\n-\t\tlost = string_list_insert(data, resolve_undo);\n+\t\tlost = string_list_insert(resolve_undo, data);\n \t\tif (!lost->util)\n \t\t\tlost->util = xcalloc(1, sizeof(*ui));\n \t\tui = lost->util;\ndiff --git a/string-list.c b/string-list.c\nindex 09798a2..de89efd 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -51,7 +51,7 @@ static int add_entry(int insert_at, struct string_list *list, const char *string\n \treturn index;\n }\n \n-struct string_list_item *string_list_insert(const char *string, struct string_list *list)\n+struct string_list_item *string_list_insert(struct string_list *list, const char *string)\n {\n \treturn string_list_insert_at_index(-1, string, list);\n }\ndiff --git a/string-list.h b/string-list.h\nindex 1e2dfc3..3d5a8de 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -29,7 +29,7 @@ int for_each_string_list(struct string_list *list,\n int string_list_has_string(const struct string_list *list, const char *string);\n int string_list_find_insert_index(const struct string_list *list, const char *string,\n \t\t\t\t  int negative_existing_index);\n-struct string_list_item *string_list_insert(const char *string, struct string_list *list);\n+struct string_list_item *string_list_insert(struct string_list *list, const char *string);\n struct string_list_item *string_list_insert_at_index(int insert_at,\n \t\t\t\t\t\t     const char *string, struct string_list *list);\n struct string_list_item *string_list_lookup(const char *string, struct string_list *list);\ndiff --git a/wt-status.c b/wt-status.c\nindex 9d9cb95..38754ad 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -235,7 +235,7 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,\n \t\tstruct wt_status_change_data *d;\n \n \t\tp = q->queue[i];\n-\t\tit = string_list_insert(p->one->path, &s->change);\n+\t\tit = string_list_insert(&s->change, p->one->path);\n \t\td = it->util;\n \t\tif (!d) {\n \t\t\td = xcalloc(1, sizeof(*d));\n@@ -282,7 +282,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q,\n \t\tstruct wt_status_change_data *d;\n \n \t\tp = q->queue[i];\n-\t\tit = string_list_insert(p->two->path, &s->change);\n+\t\tit = string_list_insert(&s->change, p->two->path);\n \t\td = it->util;\n \t\tif (!d) {\n \t\t\td = xcalloc(1, sizeof(*d));\n@@ -349,7 +349,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)\n \n \t\tif (!ce_path_match(ce, s->pathspec))\n \t\t\tcontinue;\n-\t\tit = string_list_insert(ce->name, &s->change);\n+\t\tit = string_list_insert(&s->change, ce->name);\n \t\td = it->util;\n \t\tif (!d) {\n \t\t\td = xcalloc(1, sizeof(*d));\n@@ -384,7 +384,7 @@ static void wt_status_collect_untracked(struct wt_status *s)\n \t\t\tcontinue;\n \t\tif (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))\n \t\t\tcontinue;\n-\t\tstring_list_insert(ent->name, &s->untracked);\n+\t\tstring_list_insert(&s->untracked, ent->name);\n \t\tfree(ent);\n \t}\n \n@@ -398,7 +398,7 @@ static void wt_status_collect_untracked(struct wt_status *s)\n \t\t\t\tcontinue;\n \t\t\tif (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))\n \t\t\t\tcontinue;\n-\t\t\tstring_list_insert(ent->name, &s->ignored);\n+\t\t\tstring_list_insert(&s->ignored, ent->name);\n \t\t\tfree(ent);\n \t\t}\n \t}\n-- \n1.7.0.4\n"},{"id":"144272","messageId":"20100625234140.18927.40501.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 4/7] string_list: Fix argument order for string_list_insert_at_index","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:36Z","receivedAt":"2010-06-25T23:41:36Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of string_list_insert_at_index to\nuse the string_list as the first argument.  This helps make the\nstring_list API easier to use by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n mailmap.c     |    2 +-\n string-list.c |    6 +++---\n string-list.h |    4 ++--\n 3 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/mailmap.c b/mailmap.c\nindex badf6a4..8b6dc36 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -69,7 +69,7 @@ static void add_mapping(struct string_list *map,\n \t\tindex = -1 - index;\n \t} else {\n \t\t/* create mailmap entry */\n-\t\tstruct string_list_item *item = string_list_insert_at_index(index, old_email, map);\n+\t\tstruct string_list_item *item = string_list_insert_at_index(map, index, old_email);\n \t\titem->util = xmalloc(sizeof(struct mailmap_entry));\n \t\tmemset(item->util, 0, sizeof(struct mailmap_entry));\n \t\t((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1;\ndiff --git a/string-list.c b/string-list.c\nindex de89efd..84444c2 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -53,11 +53,11 @@ static int add_entry(int insert_at, struct string_list *list, const char *string\n \n struct string_list_item *string_list_insert(struct string_list *list, const char *string)\n {\n-\treturn string_list_insert_at_index(-1, string, list);\n+\treturn string_list_insert_at_index(list, -1, string);\n }\n \n-struct string_list_item *string_list_insert_at_index(int insert_at,\n-\t\t\t\t\t\t     const char *string, struct string_list *list)\n+struct string_list_item *string_list_insert_at_index(struct string_list *list,\n+\t\t\t\t\t\t     int insert_at, const char *string)\n {\n \tint index = add_entry(insert_at, list, string);\n \ndiff --git a/string-list.h b/string-list.h\nindex 3d5a8de..a4e1919 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -30,8 +30,8 @@ int string_list_has_string(const struct string_list *list, const char *string);\n int string_list_find_insert_index(const struct string_list *list, const char *string,\n \t\t\t\t  int negative_existing_index);\n struct string_list_item *string_list_insert(struct string_list *list, const char *string);\n-struct string_list_item *string_list_insert_at_index(int insert_at,\n-\t\t\t\t\t\t     const char *string, struct string_list *list);\n+struct string_list_item *string_list_insert_at_index(struct string_list *list,\n+\t\t\t\t\t\t     int insert_at, const char *string);\n struct string_list_item *string_list_lookup(const char *string, struct string_list *list);\n \n /* Use these functions only on unsorted lists: */\n-- \n1.7.0.4\n"},{"id":"144277","messageId":"20100625234140.18927.4201.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 5/7] string_list: Fix argument order for string_list_lookup","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:37Z","receivedAt":"2010-06-25T23:41:37Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of string_list_lookup to use the\nstring_list as the first argument.  This helps make the string_list\nAPI easier to use by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n builtin/apply.c        |    2 +-\n builtin/fetch.c        |    4 ++--\n builtin/receive-pack.c |    2 +-\n http-backend.c         |    4 ++--\n mailmap.c              |    4 ++--\n merge-recursive.c      |    8 ++++----\n reflog-walk.c          |    2 +-\n remote.c               |    2 +-\n resolve-undo.c         |    2 +-\n string-list.c          |    2 +-\n string-list.h          |    2 +-\n 11 files changed, 17 insertions(+), 17 deletions(-)\n\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex d103837..c5c6d10 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -2628,7 +2628,7 @@ static struct patch *in_fn_table(const char *name)\n \tif (name == NULL)\n \t\treturn NULL;\n \n-\titem = string_list_lookup(name, &fn_table);\n+\titem = string_list_lookup(&fn_table, name);\n \tif (item != NULL)\n \t\treturn (struct patch *)item->util;\n \ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex d1e5865..bb8337a 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -696,8 +696,8 @@ static int do_fetch(struct transport *transport,\n \n \tfor (rm = ref_map; rm; rm = rm->next) {\n \t\tif (rm->peer_ref) {\n-\t\t\tpeer_item = string_list_lookup(rm->peer_ref->name,\n-\t\t\t\t\t\t       &existing_refs);\n+\t\t\tpeer_item = string_list_lookup(&existing_refs,\n+\t\t\t\t\t\t       rm->peer_ref->name);\n \t\t\tif (peer_item)\n \t\t\t\thashcpy(rm->peer_ref->old_sha1,\n \t\t\t\t\tpeer_item->util);\ndiff --git a/builtin/receive-pack.c b/builtin/receive-pack.c\nindex 29bc8d5..08bc089 100644\n--- a/builtin/receive-pack.c\n+++ b/builtin/receive-pack.c\n@@ -501,7 +501,7 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)\n \tif (!(flag & REF_ISSYMREF))\n \t\treturn;\n \n-\tif ((item = string_list_lookup(dst_name, list)) == NULL)\n+\tif ((item = string_list_lookup(list, dst_name)) == NULL)\n \t\treturn;\n \n \tcmd->skip_update = 1;\ndiff --git a/http-backend.c b/http-backend.c\nindex d43732a..14c90c2 100644\n--- a/http-backend.c\n+++ b/http-backend.c\n@@ -37,7 +37,7 @@ static struct string_list *get_parameters(void)\n \t\t\tchar *value = url_decode_parameter_value(&query);\n \t\t\tstruct string_list_item *i;\n \n-\t\t\ti = string_list_lookup(name, query_params);\n+\t\t\ti = string_list_lookup(query_params, name);\n \t\t\tif (!i)\n \t\t\t\ti = string_list_insert(query_params, name);\n \t\t\telse\n@@ -51,7 +51,7 @@ static struct string_list *get_parameters(void)\n static const char *get_parameter(const char *name)\n {\n \tstruct string_list_item *i;\n-\ti = string_list_lookup(name, get_parameters());\n+\ti = string_list_lookup(get_parameters(), name);\n \treturn i ? i->util : NULL;\n }\n \ndiff --git a/mailmap.c b/mailmap.c\nindex 8b6dc36..f80b701 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -214,13 +214,13 @@ int map_user(struct string_list *map,\n \tmailbuf[i] = 0;\n \n \tdebug_mm(\"map_user: map '%s' <%s>\\n\", name, mailbuf);\n-\titem = string_list_lookup(mailbuf, map);\n+\titem = string_list_lookup(map, mailbuf);\n \tif (item != NULL) {\n \t\tme = (struct mailmap_entry *)item->util;\n \t\tif (me->namemap.nr) {\n \t\t\t/* The item has multiple items, so we'll look up on name too */\n \t\t\t/* If the name is not found, we choose the simple entry      */\n-\t\t\tstruct string_list_item *subitem = string_list_lookup(name, &me->namemap);\n+\t\t\tstruct string_list_item *subitem = string_list_lookup(&me->namemap, name);\n \t\t\tif (subitem)\n \t\t\t\titem = subitem;\n \t\t}\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 5e60f4b..856e98c 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -294,7 +294,7 @@ static struct string_list *get_unmerged(void)\n \t\tif (!ce_stage(ce))\n \t\t\tcontinue;\n \n-\t\titem = string_list_lookup(ce->name, unmerged);\n+\t\titem = string_list_lookup(unmerged, ce->name);\n \t\tif (!item) {\n \t\t\titem = string_list_insert(unmerged, ce->name);\n \t\t\titem->util = xcalloc(1, sizeof(struct stage_data));\n@@ -356,14 +356,14 @@ static struct string_list *get_renames(struct merge_options *o,\n \t\tre = xmalloc(sizeof(*re));\n \t\tre->processed = 0;\n \t\tre->pair = pair;\n-\t\titem = string_list_lookup(re->pair->one->path, entries);\n+\t\titem = string_list_lookup(entries, re->pair->one->path);\n \t\tif (!item)\n \t\t\tre->src_entry = insert_stage_data(re->pair->one->path,\n \t\t\t\t\to_tree, a_tree, b_tree, entries);\n \t\telse\n \t\t\tre->src_entry = item->util;\n \n-\t\titem = string_list_lookup(re->pair->two->path, entries);\n+\t\titem = string_list_lookup(entries, re->pair->two->path);\n \t\tif (!item)\n \t\t\tre->dst_entry = insert_stage_data(re->pair->two->path,\n \t\t\t\t\to_tree, a_tree, b_tree, entries);\n@@ -988,7 +988,7 @@ static int process_renames(struct merge_options *o,\n \t\t\t\t\toutput(o, 1, \"Adding as %s instead\", new_path);\n \t\t\t\t\tupdate_file(o, 0, dst_other.sha1, dst_other.mode, new_path);\n \t\t\t\t}\n-\t\t\t} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {\n+\t\t\t} else if ((item = string_list_lookup(renames2Dst, ren1_dst))) {\n \t\t\t\tren2 = item->util;\n \t\t\t\tclean_merge = 0;\n \t\t\t\tren2->processed = 1;\ndiff --git a/reflog-walk.c b/reflog-walk.c\nindex f125f37..4879615 100644\n--- a/reflog-walk.c\n+++ b/reflog-walk.c\n@@ -162,7 +162,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,\n \t} else\n \t\trecno = 0;\n \n-\titem = string_list_lookup(branch, &info->complete_reflogs);\n+\titem = string_list_lookup(&info->complete_reflogs, branch);\n \tif (item)\n \t\treflogs = item->util;\n \telse {\ndiff --git a/remote.c b/remote.c\nindex 851d860..43f00f1 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -762,7 +762,7 @@ void ref_remove_duplicates(struct ref *ref_map)\n \t\tif (!ref_map->peer_ref)\n \t\t\tcontinue;\n \n-\t\titem = string_list_lookup(ref_map->peer_ref->name, &refs);\n+\t\titem = string_list_lookup(&refs, ref_map->peer_ref->name);\n \t\tif (item) {\n \t\t\tif (strcmp(((struct ref *)item->util)->name,\n \t\t\t\t   ref_map->name))\ndiff --git a/resolve-undo.c b/resolve-undo.c\nindex 8b93559..174ebec 100644\n--- a/resolve-undo.c\n+++ b/resolve-undo.c\n@@ -135,7 +135,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)\n \t\t\tpos++;\n \t\treturn pos - 1; /* return the last entry processed */\n \t}\n-\titem = string_list_lookup(ce->name, istate->resolve_undo);\n+\titem = string_list_lookup(istate->resolve_undo, ce->name);\n \tif (!item)\n \t\treturn pos;\n \tru = item->util;\ndiff --git a/string-list.c b/string-list.c\nindex 84444c2..7b616ae 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -84,7 +84,7 @@ int string_list_find_insert_index(const struct string_list *list, const char *st\n \treturn index;\n }\n \n-struct string_list_item *string_list_lookup(const char *string, struct string_list *list)\n+struct string_list_item *string_list_lookup(struct string_list *list, const char *string)\n {\n \tint exact_match, i = get_entry_index(list, string, &exact_match);\n \tif (!exact_match)\ndiff --git a/string-list.h b/string-list.h\nindex a4e1919..4a30e9d 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -32,7 +32,7 @@ int string_list_find_insert_index(const struct string_list *list, const char *st\n struct string_list_item *string_list_insert(struct string_list *list, const char *string);\n struct string_list_item *string_list_insert_at_index(struct string_list *list,\n \t\t\t\t\t\t     int insert_at, const char *string);\n-struct string_list_item *string_list_lookup(const char *string, struct string_list *list);\n+struct string_list_item *string_list_lookup(struct string_list *list, const char *string);\n \n /* Use these functions only on unsorted lists: */\n struct string_list_item *string_list_append(const char *string, struct string_list *list);\n-- \n1.7.0.4\n"},{"id":"144279","messageId":"20100625234140.18927.79321.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 6/7] string_list: Fix argument order for string_list_append","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:38Z","receivedAt":"2010-06-25T23:41:38Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"Update the definition and callers of string_list_append to use the\nstring_list as the first argument.  This helps make the string_list\nAPI easier to use by being more consistent.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n Documentation/technical/api-string-list.txt |    4 +-\n builtin/apply.c                             |    2 +-\n builtin/fast-export.c                       |    4 +-\n builtin/fetch.c                             |    8 ++--\n builtin/fmt-merge-msg.c                     |   18 +++++-----\n builtin/log.c                               |   20 ++++++------\n builtin/receive-pack.c                      |    2 +-\n builtin/remote.c                            |   46 +++++++++++++-------------\n builtin/rerere.c                            |    2 +-\n builtin/shortlog.c                          |    2 +-\n notes.c                                     |    6 ++--\n remote.c                                    |    2 +-\n revision.c                                  |    4 +-\n string-list.c                               |    2 +-\n string-list.h                               |    2 +-\n transport-helper.c                          |    4 +-\n 16 files changed, 64 insertions(+), 64 deletions(-)\n\ndiff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt\nindex 6d8c24b..3f575bd 100644\n--- a/Documentation/technical/api-string-list.txt\n+++ b/Documentation/technical/api-string-list.txt\n@@ -38,8 +38,8 @@ struct string_list list;\n int i;\n \n memset(&list, 0, sizeof(struct string_list));\n-string_list_append(\"foo\", &list);\n-string_list_append(\"bar\", &list);\n+string_list_append(&list, \"foo\");\n+string_list_append(&list, \"bar\");\n for (i = 0; i < list.nr; i++)\n \tprintf(\"%s\\n\", list.items[i].string)\n ----\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex c5c6d10..12ef9ea 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -3394,7 +3394,7 @@ static void add_name_limit(const char *name, int exclude)\n {\n \tstruct string_list_item *it;\n \n-\tit = string_list_append(name, &limit_by_name);\n+\tit = string_list_append(&limit_by_name, name);\n \tit->util = exclude ? NULL : (void *) 1;\n }\n \ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex c6dd71a..9fe25ff 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -438,7 +438,7 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t\t/* handle nested tags */\n \t\t\twhile (tag && tag->object.type == OBJ_TAG) {\n \t\t\t\tparse_object(tag->object.sha1);\n-\t\t\t\tstring_list_append(full_name, extra_refs)->util = tag;\n+\t\t\t\tstring_list_append(extra_refs, full_name)->util = tag;\n \t\t\t\ttag = (struct tag *)tag->tagged;\n \t\t\t}\n \t\t\tif (!tag)\n@@ -464,7 +464,7 @@ static void get_tags_and_duplicates(struct object_array *pending,\n \t\t}\n \t\tif (commit->util)\n \t\t\t/* more than one name for the same object */\n-\t\t\tstring_list_append(full_name, extra_refs)->util = commit;\n+\t\t\tstring_list_append(extra_refs, full_name)->util = commit;\n \t\telse\n \t\t\tcommit->util = full_name;\n \t}\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex bb8337a..6eb1dfe 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -746,7 +746,7 @@ static int get_one_remote_for_fetch(struct remote *remote, void *priv)\n {\n \tstruct string_list *list = priv;\n \tif (!remote->skip_default_update)\n-\t\tstring_list_append(remote->name, list);\n+\t\tstring_list_append(list, remote->name);\n \treturn 0;\n }\n \n@@ -765,8 +765,8 @@ static int get_remote_group(const char *key, const char *value, void *priv)\n \t\tint space = strcspn(value, \" \\t\\n\");\n \t\twhile (*value) {\n \t\t\tif (space > 1) {\n-\t\t\t\tstring_list_append(xstrndup(value, space),\n-\t\t\t\t\t\t   g->list);\n+\t\t\t\tstring_list_append(g->list,\n+\t\t\t\t\t\t   xstrndup(value, space));\n \t\t\t}\n \t\t\tvalue += space + (value[space] != '\\0');\n \t\t\tspace = strcspn(value, \" \\t\\n\");\n@@ -788,7 +788,7 @@ static int add_remote_or_group(const char *name, struct string_list *list)\n \t\tif (!remote_is_configured(name))\n \t\t\treturn 0;\n \t\tremote = remote_get(name);\n-\t\tstring_list_append(remote->name, list);\n+\t\tstring_list_append(list, remote->name);\n \t}\n \treturn 1;\n }\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex 4420425..bc3c5e6 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -82,7 +82,7 @@ static int handle_line(char *line)\n \n \titem = unsorted_string_list_lookup(&srcs, src);\n \tif (!item) {\n-\t\titem = string_list_append(src, &srcs);\n+\t\titem = string_list_append(&srcs, src);\n \t\titem->util = xcalloc(1, sizeof(struct src_data));\n \t\tinit_src_data(item->util);\n \t}\n@@ -93,19 +93,19 @@ static int handle_line(char *line)\n \t\tsrc_data->head_status |= 1;\n \t} else if (!prefixcmp(line, \"branch \")) {\n \t\torigin = line + 7;\n-\t\tstring_list_append(origin, &src_data->branch);\n+\t\tstring_list_append(&src_data->branch, origin);\n \t\tsrc_data->head_status |= 2;\n \t} else if (!prefixcmp(line, \"tag \")) {\n \t\torigin = line;\n-\t\tstring_list_append(origin + 4, &src_data->tag);\n+\t\tstring_list_append(&src_data->tag, origin + 4);\n \t\tsrc_data->head_status |= 2;\n \t} else if (!prefixcmp(line, \"remote branch \")) {\n \t\torigin = line + 14;\n-\t\tstring_list_append(origin, &src_data->r_branch);\n+\t\tstring_list_append(&src_data->r_branch, origin);\n \t\tsrc_data->head_status |= 2;\n \t} else {\n \t\torigin = src;\n-\t\tstring_list_append(line, &src_data->generic);\n+\t\tstring_list_append(&src_data->generic, line);\n \t\tsrc_data->head_status |= 2;\n \t}\n \n@@ -118,7 +118,7 @@ static int handle_line(char *line)\n \t\tsprintf(new_origin, \"%s of %s\", origin, src);\n \t\torigin = new_origin;\n \t}\n-\tstring_list_append(origin, &origins)->util = sha1;\n+\tstring_list_append(&origins, origin)->util = sha1;\n \treturn 0;\n }\n \n@@ -176,10 +176,10 @@ static void shortlog(const char *name, unsigned char *sha1,\n \t\tstrbuf_ltrim(&sb);\n \n \t\tif (!sb.len)\n-\t\t\tstring_list_append(sha1_to_hex(commit->object.sha1),\n-\t\t\t\t\t   &subjects);\n+\t\t\tstring_list_append(&subjects,\n+\t\t\t\t\t   sha1_to_hex(commit->object.sha1));\n \t\telse\n-\t\t\tstring_list_append(strbuf_detach(&sb, NULL), &subjects);\n+\t\t\tstring_list_append(&subjects, strbuf_detach(&sb, NULL));\n \t}\n \n \tif (count > limit)\ndiff --git a/builtin/log.c b/builtin/log.c\nindex f068583..7cb9317 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -535,13 +535,13 @@ static void add_header(const char *value)\n \t\tlen--;\n \n \tif (!strncasecmp(value, \"to: \", 4)) {\n-\t\titem = string_list_append(value + 4, &extra_to);\n+\t\titem = string_list_append(&extra_to, value + 4);\n \t\tlen -= 4;\n \t} else if (!strncasecmp(value, \"cc: \", 4)) {\n-\t\titem = string_list_append(value + 4, &extra_cc);\n+\t\titem = string_list_append(&extra_cc, value + 4);\n \t\tlen -= 4;\n \t} else {\n-\t\titem = string_list_append(value, &extra_hdr);\n+\t\titem = string_list_append(&extra_hdr, value);\n \t}\n \n \titem->string[len] = '\\0';\n@@ -566,13 +566,13 @@ static int git_format_config(const char *var, const char *value, void *cb)\n \tif (!strcmp(var, \"format.to\")) {\n \t\tif (!value)\n \t\t\treturn config_error_nonbool(var);\n-\t\tstring_list_append(value, &extra_to);\n+\t\tstring_list_append(&extra_to, value);\n \t\treturn 0;\n \t}\n \tif (!strcmp(var, \"format.cc\")) {\n \t\tif (!value)\n \t\t\treturn config_error_nonbool(var);\n-\t\tstring_list_append(value, &extra_cc);\n+\t\tstring_list_append(&extra_cc, value);\n \t\treturn 0;\n \t}\n \tif (!strcmp(var, \"diff.color\") || !strcmp(var, \"color.diff\")) {\n@@ -959,7 +959,7 @@ static int to_callback(const struct option *opt, const char *arg, int unset)\n \tif (unset)\n \t\tstring_list_clear(&extra_to, 0);\n \telse\n-\t\tstring_list_append(arg, &extra_to);\n+\t\tstring_list_append(&extra_to, arg);\n \treturn 0;\n }\n \n@@ -968,7 +968,7 @@ static int cc_callback(const struct option *opt, const char *arg, int unset)\n \tif (unset)\n \t\tstring_list_clear(&extra_cc, 0);\n \telse\n-\t\tstring_list_append(arg, &extra_cc);\n+\t\tstring_list_append(&extra_cc, arg);\n \treturn 0;\n }\n \n@@ -1251,7 +1251,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)\n \t\trev.ref_message_ids = xcalloc(1, sizeof(struct string_list));\n \tif (in_reply_to) {\n \t\tconst char *msgid = clean_message_id(in_reply_to);\n-\t\tstring_list_append(msgid, rev.ref_message_ids);\n+\t\tstring_list_append(rev.ref_message_ids, msgid);\n \t}\n \trev.numbered_files = numbered_files;\n \trev.patch_suffix = fmt_patch_suffix;\n@@ -1298,8 +1298,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)\n \t\t\t\t    && (!cover_letter || rev.nr > 1))\n \t\t\t\t\tfree(rev.message_id);\n \t\t\t\telse\n-\t\t\t\t\tstring_list_append(rev.message_id,\n-\t\t\t\t\t\t\t   rev.ref_message_ids);\n+\t\t\t\t\tstring_list_append(rev.ref_message_ids,\n+\t\t\t\t\t\t\t   rev.message_id);\n \t\t\t}\n \t\t\tgen_message_id(&rev, sha1_to_hex(commit->object.sha1));\n \t\t}\ndiff --git a/builtin/receive-pack.c b/builtin/receive-pack.c\nindex 08bc089..d634b5a 100644\n--- a/builtin/receive-pack.c\n+++ b/builtin/receive-pack.c\n@@ -534,7 +534,7 @@ static void check_aliased_updates(struct command *commands)\n \n \tfor (cmd = commands; cmd; cmd = cmd->next) {\n \t\tstruct string_list_item *item =\n-\t\t\tstring_list_append(cmd->ref_name, &ref_list);\n+\t\t\tstring_list_append(&ref_list, cmd->ref_name);\n \t\titem->util = (void *)cmd;\n \t}\n \tsort_string_list(&ref_list);\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 70ecf3d..6699bc5 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -94,7 +94,7 @@ static int opt_parse_track(const struct option *opt, const char *arg, int not)\n \tif (not)\n \t\tstring_list_clear(list, 0);\n \telse\n-\t\tstring_list_append(arg, list);\n+\t\tstring_list_append(list, arg);\n \treturn 0;\n }\n \n@@ -181,7 +181,7 @@ static int add(int argc, const char **argv)\n \tstrbuf_addf(&buf, \"remote.%s.fetch\", name);\n \n \tif (track.nr == 0)\n-\t\tstring_list_append(\"*\", &track);\n+\t\tstring_list_append(&track, \"*\");\n \tfor (i = 0; i < track.nr; i++) {\n \t\tif (add_branch(buf.buf, track.items[i].string,\n \t\t\t\tname, mirror, &buf2))\n@@ -278,11 +278,11 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n \t\t\twhile (space) {\n \t\t\t\tchar *merge;\n \t\t\t\tmerge = xstrndup(value, space - value);\n-\t\t\t\tstring_list_append(merge, &info->merge);\n+\t\t\t\tstring_list_append(&info->merge, merge);\n \t\t\t\tvalue = abbrev_branch(space + 1);\n \t\t\t\tspace = strchr(value, ' ');\n \t\t\t}\n-\t\t\tstring_list_append(xstrdup(value), &info->merge);\n+\t\t\tstring_list_append(&info->merge, xstrdup(value));\n \t\t} else\n \t\t\tinfo->rebase = git_config_bool(orig_key, value);\n \t}\n@@ -319,14 +319,14 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat\n \tfor (ref = fetch_map; ref; ref = ref->next) {\n \t\tunsigned char sha1[20];\n \t\tif (!ref->peer_ref || read_ref(ref->peer_ref->name, sha1))\n-\t\t\tstring_list_append(abbrev_branch(ref->name), &states->new);\n+\t\t\tstring_list_append(&states->new, abbrev_branch(ref->name));\n \t\telse\n-\t\t\tstring_list_append(abbrev_branch(ref->name), &states->tracked);\n+\t\t\tstring_list_append(&states->tracked, abbrev_branch(ref->name));\n \t}\n \tstale_refs = get_stale_heads(states->remote, fetch_map);\n \tfor (ref = stale_refs; ref; ref = ref->next) {\n \t\tstruct string_list_item *item =\n-\t\t\tstring_list_append(abbrev_branch(ref->name), &states->stale);\n+\t\t\tstring_list_append(&states->stale, abbrev_branch(ref->name));\n \t\titem->util = xstrdup(ref->name);\n \t}\n \tfree_refs(stale_refs);\n@@ -375,8 +375,8 @@ static int get_push_ref_states(const struct ref *remote_refs,\n \t\t\tcontinue;\n \t\thashcpy(ref->new_sha1, ref->peer_ref->new_sha1);\n \n-\t\titem = string_list_append(abbrev_branch(ref->peer_ref->name),\n-\t\t\t\t\t  &states->push);\n+\t\titem = string_list_append(&states->push,\n+\t\t\t\t\t  abbrev_branch(ref->peer_ref->name));\n \t\titem->util = xcalloc(sizeof(struct push_info), 1);\n \t\tinfo = item->util;\n \t\tinfo->forced = ref->force;\n@@ -411,7 +411,7 @@ static int get_push_ref_states_noquery(struct ref_states *states)\n \n \tstates->push.strdup_strings = 1;\n \tif (!remote->push_refspec_nr) {\n-\t\titem = string_list_append(\"(matching)\", &states->push);\n+\t\titem = string_list_append(&states->push, \"(matching)\");\n \t\tinfo = item->util = xcalloc(sizeof(struct push_info), 1);\n \t\tinfo->status = PUSH_STATUS_NOTQUERIED;\n \t\tinfo->dest = xstrdup(item->string);\n@@ -419,11 +419,11 @@ static int get_push_ref_states_noquery(struct ref_states *states)\n \tfor (i = 0; i < remote->push_refspec_nr; i++) {\n \t\tstruct refspec *spec = remote->push + i;\n \t\tif (spec->matching)\n-\t\t\titem = string_list_append(\"(matching)\", &states->push);\n+\t\t\titem = string_list_append(&states->push, \"(matching)\");\n \t\telse if (strlen(spec->src))\n-\t\t\titem = string_list_append(spec->src, &states->push);\n+\t\t\titem = string_list_append(&states->push, spec->src);\n \t\telse\n-\t\t\titem = string_list_append(\"(delete)\", &states->push);\n+\t\t\titem = string_list_append(&states->push, \"(delete)\");\n \n \t\tinfo = item->util = xcalloc(sizeof(struct push_info), 1);\n \t\tinfo->forced = spec->force;\n@@ -447,7 +447,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat\n \tmatches = guess_remote_head(find_ref_by_name(remote_refs, \"HEAD\"),\n \t\t\t\t    fetch_map, 1);\n \tfor (ref = matches; ref; ref = ref->next)\n-\t\tstring_list_append(abbrev_branch(ref->name), &states->heads);\n+\t\tstring_list_append(&states->heads, abbrev_branch(ref->name));\n \n \tfree_refs(fetch_map);\n \tfree_refs(matches);\n@@ -511,8 +511,8 @@ static int add_branch_for_removal(const char *refname,\n \tif (prefixcmp(refname, \"refs/remotes\")) {\n \t\t/* advise user how to delete local branches */\n \t\tif (!prefixcmp(refname, \"refs/heads/\"))\n-\t\t\tstring_list_append(abbrev_branch(refname),\n-\t\t\t\t\t   branches->skipped);\n+\t\t\tstring_list_append(branches->skipped,\n+\t\t\t\t\t   abbrev_branch(refname));\n \t\t/* silently skip over other non-remote refs */\n \t\treturn 0;\n \t}\n@@ -521,7 +521,7 @@ static int add_branch_for_removal(const char *refname,\n \tif (flags & REF_ISSYMREF)\n \t\treturn unlink(git_path(\"%s\", refname));\n \n-\titem = string_list_append(refname, branches->branches);\n+\titem = string_list_append(branches->branches, refname);\n \titem->util = xmalloc(20);\n \thashcpy(item->util, sha1);\n \n@@ -546,7 +546,7 @@ static int read_remote_branches(const char *refname,\n \n \tstrbuf_addf(&buf, \"refs/remotes/%s\", rename->old);\n \tif (!prefixcmp(refname, buf.buf)) {\n-\t\titem = string_list_append(xstrdup(refname), rename->remote_branches);\n+\t\titem = string_list_append(rename->remote_branches, xstrdup(refname));\n \t\tsymref = resolve_ref(refname, orig_sha1, 1, &flag);\n \t\tif (flag & REF_ISSYMREF)\n \t\t\titem->util = xstrdup(symref);\n@@ -832,7 +832,7 @@ static int append_ref_to_tracked_list(const char *refname,\n \tmemset(&refspec, 0, sizeof(refspec));\n \trefspec.dst = (char *)refname;\n \tif (!remote_find_tracking(states->remote, &refspec))\n-\t\tstring_list_append(abbrev_branch(refspec.src), &states->tracked);\n+\t\tstring_list_append(&states->tracked, abbrev_branch(refspec.src));\n \n \treturn 0;\n }\n@@ -980,7 +980,7 @@ static int add_push_to_show_info(struct string_list_item *push_item, void *cb_da\n \t\tshow_info->width = n;\n \tif ((n = strlen(push_info->dest)) > show_info->width2)\n \t\tshow_info->width2 = n;\n-\titem = string_list_append(push_item->string, show_info->list);\n+\titem = string_list_append(show_info->list, push_item->string);\n \titem->util = push_item->util;\n \treturn 0;\n }\n@@ -1460,10 +1460,10 @@ static int get_one_entry(struct remote *remote, void *priv)\n \n \tif (remote->url_nr > 0) {\n \t\tstrbuf_addf(&url_buf, \"%s (fetch)\", remote->url[0]);\n-\t\tstring_list_append(remote->name, list)->util =\n+\t\tstring_list_append(list, remote->name)->util =\n \t\t\t\tstrbuf_detach(&url_buf, NULL);\n \t} else\n-\t\tstring_list_append(remote->name, list)->util = NULL;\n+\t\tstring_list_append(list, remote->name)->util = NULL;\n \tif (remote->pushurl_nr) {\n \t\turl = remote->pushurl;\n \t\turl_nr = remote->pushurl_nr;\n@@ -1474,7 +1474,7 @@ static int get_one_entry(struct remote *remote, void *priv)\n \tfor (i = 0; i < url_nr; i++)\n \t{\n \t\tstrbuf_addf(&url_buf, \"%s (push)\", url[i]);\n-\t\tstring_list_append(remote->name, list)->util =\n+\t\tstring_list_append(list, remote->name)->util =\n \t\t\t\tstrbuf_detach(&url_buf, NULL);\n \t}\n \ndiff --git a/builtin/rerere.c b/builtin/rerere.c\nindex 0048f9e..980d542 100644\n--- a/builtin/rerere.c\n+++ b/builtin/rerere.c\n@@ -59,7 +59,7 @@ static void garbage_collect(struct string_list *rr)\n \t\tcutoff = (has_rerere_resolution(e->d_name)\n \t\t\t  ? cutoff_resolve : cutoff_noresolve);\n \t\tif (then < now - cutoff * 86400)\n-\t\t\tstring_list_append(e->d_name, &to_remove);\n+\t\t\tstring_list_append(&to_remove, e->d_name);\n \t}\n \tfor (i = 0; i < to_remove.nr; i++)\n \t\tunlink_rr_item(to_remove.items[i].string);\ndiff --git a/builtin/shortlog.c b/builtin/shortlog.c\nindex 86d32fb..0a9681b 100644\n--- a/builtin/shortlog.c\n+++ b/builtin/shortlog.c\n@@ -115,7 +115,7 @@ static void insert_one_record(struct shortlog *log,\n \t\t}\n \t}\n \n-\tstring_list_append(buffer, item->util);\n+\tstring_list_append(item->util, buffer);\n }\n \n static void read_from_stdin(struct shortlog *log)\ndiff --git a/notes.c b/notes.c\nindex f379681..d4e0df2 100644\n--- a/notes.c\n+++ b/notes.c\n@@ -838,7 +838,7 @@ static int string_list_add_one_ref(const char *path, const unsigned char *sha1,\n {\n \tstruct string_list *refs = cb;\n \tif (!unsorted_string_list_has_string(refs, path))\n-\t\tstring_list_append(path, refs);\n+\t\tstring_list_append(refs, path);\n \treturn 0;\n }\n \n@@ -851,7 +851,7 @@ void string_list_add_refs_by_glob(struct string_list *list, const char *glob)\n \t\tif (get_sha1(glob, sha1))\n \t\t\twarning(\"notes ref %s is invalid\", glob);\n \t\tif (!unsorted_string_list_has_string(list, glob))\n-\t\t\tstring_list_append(glob, list);\n+\t\t\tstring_list_append(list, glob);\n \t}\n }\n \n@@ -983,7 +983,7 @@ void init_display_notes(struct display_notes_opt *opt)\n \tassert(!display_notes_trees);\n \n \tif (!opt || !opt->suppress_default_notes) {\n-\t\tstring_list_append(default_notes_ref(), &display_notes_refs);\n+\t\tstring_list_append(&display_notes_refs, default_notes_ref());\n \t\tdisplay_ref_env = getenv(GIT_NOTES_DISPLAY_REF_ENVIRONMENT);\n \t\tif (display_ref_env) {\n \t\t\tstring_list_add_refs_from_colon_sep(&display_notes_refs,\ndiff --git a/remote.c b/remote.c\nindex 43f00f1..afbba47 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -1710,7 +1710,7 @@ struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map)\n \tinfo.ref_names = &ref_names;\n \tinfo.stale_refs_tail = &stale_refs;\n \tfor (ref = fetch_map; ref; ref = ref->next)\n-\t\tstring_list_append(ref->name, &ref_names);\n+\t\tstring_list_append(&ref_names, ref->name);\n \tsort_string_list(&ref_names);\n \tfor_each_ref(get_stale_heads_cb, &info);\n \tstring_list_clear(&ref_names, 0);\ndiff --git a/revision.c b/revision.c\nindex 5403581..52379e1 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -1312,8 +1312,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg\n \t\telse\n \t\t\tstrbuf_addstr(&buf, \"refs/notes/\");\n \t\tstrbuf_addstr(&buf, arg+13);\n-\t\tstring_list_append(strbuf_detach(&buf, NULL),\n-\t\t\t\t   revs->notes_opt.extra_notes_refs);\n+\t\tstring_list_append(revs->notes_opt.extra_notes_refs,\n+\t\t\t\t   strbuf_detach(&buf, NULL));\n \t} else if (!strcmp(arg, \"--no-notes\")) {\n \t\trevs->show_notes = 0;\n \t\trevs->show_notes_given = 1;\ndiff --git a/string-list.c b/string-list.c\nindex 7b616ae..9b023a2 100644\n--- a/string-list.c\n+++ b/string-list.c\n@@ -148,7 +148,7 @@ void print_string_list(const struct string_list *p, const char *text)\n \t\tprintf(\"%s:%p\\n\", p->items[i].string, p->items[i].util);\n }\n \n-struct string_list_item *string_list_append(const char *string, struct string_list *list)\n+struct string_list_item *string_list_append(struct string_list *list, const char *string)\n {\n \tALLOC_GROW(list->items, list->nr + 1, list->alloc);\n \tlist->items[list->nr].string =\ndiff --git a/string-list.h b/string-list.h\nindex 4a30e9d..680d600 100644\n--- a/string-list.h\n+++ b/string-list.h\n@@ -35,7 +35,7 @@ struct string_list_item *string_list_insert_at_index(struct string_list *list,\n struct string_list_item *string_list_lookup(struct string_list *list, const char *string);\n \n /* Use these functions only on unsorted lists: */\n-struct string_list_item *string_list_append(const char *string, struct string_list *list);\n+struct string_list_item *string_list_append(struct string_list *list, const char *string);\n void sort_string_list(struct string_list *list);\n int unsorted_string_list_has_string(struct string_list *list, const char *string);\n struct string_list_item *unsorted_string_list_lookup(struct string_list *list,\ndiff --git a/transport-helper.c b/transport-helper.c\nindex 0381de5..191fbf7 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -727,10 +727,10 @@ static int push_refs_with_export(struct transport *transport,\n \t\tprivate = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);\n \t\tif (private && !get_sha1(private, sha1)) {\n \t\t\tstrbuf_addf(&buf, \"^%s\", private);\n-\t\t\tstring_list_append(strbuf_detach(&buf, NULL), &revlist_args);\n+\t\t\tstring_list_append(&revlist_args, strbuf_detach(&buf, NULL));\n \t\t}\n \n-\t\tstring_list_append(ref->name, &revlist_args);\n+\t\tstring_list_append(&revlist_args, ref->name);\n \n \t}\n \n-- \n1.7.0.4\n"},{"id":"144276","messageId":"20100625234140.18927.35025.julian@quantumfyre.co.uk","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"[PATCH v2 7/7] grep: fix string_list_append calls","fromName":"Julian Phillips","fromEmail":"julian@quantumfyre.co.uk","sentAt":"2010-06-25T23:41:39Z","receivedAt":"2010-06-25T23:41:39Z","isPatch":true,"sender":{"key":"julian@quantumfyre.co.uk","avatar":"https://avatars.githubusercontent.com/u/948888?v=4"},"body":"This updates string_list_append calls added in the new grep -O\nfunctionality to have the string list as the first argument.\n\nSigned-off-by: Julian Phillips <julian@quantumfyre.co.uk>\n---\n builtin/grep.c |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/grep.c b/builtin/grep.c\nindex 0374a76..232cd1c 100644\n--- a/builtin/grep.c\n+++ b/builtin/grep.c\n@@ -564,7 +564,7 @@ static void append_path(struct grep_opt *opt, const void *data, size_t len)\n \n \tif (len == 1 && *(const char *)data == '\\0')\n \t\treturn;\n-\tstring_list_append(xstrndup(data, len), path_list);\n+\tstring_list_append(path_list, xstrndup(data, len));\n }\n \n static void run_pager(struct grep_opt *opt, const char *prefix)\n@@ -1005,7 +1005,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)\n \t\topt.null_following_name = 1;\n \t\topt.output_priv = &path_list;\n \t\topt.output = append_path;\n-\t\tstring_list_append(show_in_pager, &path_list);\n+\t\tstring_list_append(&path_list, show_in_pager);\n \t\tuse_threads = 0;\n \t}\n \n@@ -1080,7 +1080,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)\n \t\t\tstrbuf_addf(&buf, \"+/%s%s\",\n \t\t\t\t\tstrcmp(\"less\", pager) ? \"\" : \"*\",\n \t\t\t\t\topt.pattern_list->pattern);\n-\t\t\tstring_list_append(buf.buf, &path_list);\n+\t\t\tstring_list_append(&path_list, buf.buf);\n \t\t\tstrbuf_detach(&buf, NULL);\n \t\t}\n \t}\n-- \n1.7.0.4\n"},{"id":"144351","messageId":"7v4ogoie61.fsf@alter.siamese.dyndns.org","threadId":"24201","inReplyTo":"20100625234110.18927.33169.julian@quantumfyre.co.uk","subject":"Re: [PATCH v2 0/7] Make the string_list API consistent","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-06-27T17:22:14Z","receivedAt":"2010-06-27T17:22:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The way you split the patches, together with the timing you chose,\ni.e. the topics in flight right now have much less interaction with the\nstring-list API than in April, made it very pleasant to apply the series.\n\nWill queue to 'next' and also update 'jn/grep-open' with it.\n\nThanks.\n"}]}