78a395d371 · matheusbsbs/matheus-bagliano

builtin/apply.c

+3 -3

@@ -2664,7 +2664,7 @@ static void add_to_fn_table(struct patch *patch)

2664 * file creations and copies

2665 */

2666 if (patch->new_name != NULL) {

2667 - item = string_list_insert(patch->new_name, &fn_table);

2667 + item = string_list_insert(&fn_table, patch->new_name);

2668 item->util = patch;

2669 }

2670

@@ -2673,7 +2673,7 @@ static void add_to_fn_table(struct patch *patch)

2673 * later chunks shouldn't patch old names

2674 */

2675 if ((patch->new_name == NULL) || (patch->is_rename)) {

2676 - item = string_list_insert(patch->old_name, &fn_table);

2676 + item = string_list_insert(&fn_table, patch->old_name);

2677 item->util = PATH_WAS_DELETED;

2678 }

2679 }

@@ -2686,7 +2686,7 @@ static void prepare_fn_table(struct patch *patch)

2686 while (patch) {

2687 if ((patch->new_name == NULL) || (patch->is_rename)) {

2688 struct string_list_item *item;

2689 - item = string_list_insert(patch->old_name, &fn_table);

2689 + item = string_list_insert(&fn_table, patch->old_name);

2690 item->util = PATH_TO_BE_DELETED;

2691 }

2692 patch = patch->next;

builtin/commit.c

+1 -1

@@ -212,7 +212,7 @@ static int list_paths(struct string_list *list, const char *with_tree,

212 continue;

213 if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))

214 continue;

215 - item = string_list_insert(ce->name, list);

215 + item = string_list_insert(list, ce->name);

216 if (ce_skip_worktree(ce))

217 item->util = item; /* better a valid pointer than a fake one */

218 }

builtin/fetch.c

+2 -2

@@ -528,7 +528,7 @@ static int add_existing(const char *refname, const unsigned char *sha1,

528 int flag, void *cbdata)

529 {

530 struct string_list *list = (struct string_list *)cbdata;

531 - struct string_list_item *item = string_list_insert(refname, list);

531 + struct string_list_item *item = string_list_insert(list, refname);

532 item->util = (void *)sha1;

533 return 0;

534 }

@@ -616,7 +616,7 @@ static void find_non_local_tags(struct transport *transport,

616 string_list_has_string(&existing_refs, ref->name))

617 continue;

618

619 - item = string_list_insert(ref->name, &remote_refs);

619 + item = string_list_insert(&remote_refs, ref->name);

620 item->util = (void *)ref->old_sha1;

621 }

622 string_list_clear(&existing_refs, 0);

builtin/mailsplit.c

+1 -1

@@ -121,7 +121,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)

121 if (dent->d_name[0] == '.')

122 continue;

123 snprintf(name, sizeof(name), "%s/%s", *sub, dent->d_name);

124 - string_list_insert(name, list);

124 + string_list_insert(list, name);

125 }

126

127 closedir(dir);

builtin/mv.c

+1 -1

@@ -180,7 +180,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

180 } else if (string_list_has_string(&src_for_dst, dst))

181 bad = "multiple sources for the same target";

182 else

183 - string_list_insert(dst, &src_for_dst);

183 + string_list_insert(&src_for_dst, dst);

184

185 if (bad) {

186 if (ignore_errors) {

builtin/remote.c

+3 -3

@@ -251,7 +251,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)

251 } else

252 return 0;

253

254 - item = string_list_insert(name, &branch_list);

254 + item = string_list_insert(&branch_list, name);

255

256 if (!item->util)

257 item->util = xcalloc(sizeof(struct branch_info), 1);

@@ -870,7 +870,7 @@ static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)

870 int n = strlen(item->string);

871 if (n > info->width)

872 info->width = n;

873 - string_list_insert(item->string, info->list);

873 + string_list_insert(info->list, item->string);

874 return 0;

875 }

876

@@ -917,7 +917,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb

917 if (branch_info->rebase)

918 show_info->any_rebase = 1;

919

920 - item = string_list_insert(branch_item->string, show_info->list);

920 + item = string_list_insert(show_info->list, branch_item->string);

921 item->util = branch_info;

922

923 return 0;

builtin/shortlog.c

+1 -1

@@ -84,7 +84,7 @@ static void insert_one_record(struct shortlog *log,

84 snprintf(namebuf + len, room, " <%.*s>", maillen, emailbuf);

85 }

86

87 - item = string_list_insert(namebuf, &log->list);

87 + item = string_list_insert(&log->list, namebuf);

88 if (item->util == NULL)

89 item->util = xcalloc(1, sizeof(struct string_list));

90

builtin/show-ref.c

+1 -1

@@ -105,7 +105,7 @@ match:

105 static int add_existing(const char *refname, const unsigned char *sha1, int flag, void *cbdata)

106 {

107 struct string_list *list = (struct string_list *)cbdata;

108 - string_list_insert(refname, list);

108 + string_list_insert(list, refname);

109 return 0;

110 }

111

diff-no-index.c

+1 -1

@@ -26,7 +26,7 @@ static int read_directory(const char *path, struct string_list *list)

26

27 while ((e = readdir(dir)))

28 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))

29 - string_list_insert(e->d_name, list);

29 + string_list_insert(list, e->d_name);

30

31 closedir(dir);

32 return 0;

http-backend.c

+1 -1

@@ -92,7 +92,7 @@ static struct string_list *get_parameters(void)

92

93 i = string_list_lookup(name, query_params);

94 if (!i)

95 - i = string_list_insert(name, query_params);

95 + i = string_list_insert(query_params, name);

96 else

97 free(i->util);

98 i->util = value;

mailmap.c

+1 -1

@@ -92,7 +92,7 @@ static void add_mapping(struct string_list *map,

92 mi->name = xstrdup(new_name);

93 if (new_email)

94 mi->email = xstrdup(new_email);

95 - string_list_insert(old_name, &me->namemap)->util = mi;

95 + string_list_insert(&me->namemap, old_name)->util = mi;

96 }

97

98 debug_mm("mailmap: '%s' <%s> -> '%s' <%s>\n",

merge-recursive.c

+8 -8

@@ -238,9 +238,9 @@ static int save_files_dirs(const unsigned char *sha1,

238 newpath[baselen + len] = '\0';

239

240 if (S_ISDIR(mode))

241 - string_list_insert(newpath, &o->current_directory_set);

241 + string_list_insert(&o->current_directory_set, newpath);

242 else

243 - string_list_insert(newpath, &o->current_file_set);

243 + string_list_insert(&o->current_file_set, newpath);

244 free(newpath);

245

246 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);

@@ -271,7 +271,7 @@ static struct stage_data *insert_stage_data(const char *path,

271 e->stages[2].sha, &e->stages[2].mode);

272 get_tree_entry(b->object.sha1, path,

273 e->stages[3].sha, &e->stages[3].mode);

274 - item = string_list_insert(path, entries);

274 + item = string_list_insert(entries, path);

275 item->util = e;

276 return e;

277 }

@@ -296,7 +296,7 @@ static struct string_list *get_unmerged(void)

296

297 item = string_list_lookup(ce->name, unmerged);

298 if (!item) {

299 - item = string_list_insert(ce->name, unmerged);

299 + item = string_list_insert(unmerged, ce->name);

300 item->util = xcalloc(1, sizeof(struct stage_data));

301 }

302 e = item->util;

@@ -369,7 +369,7 @@ static struct string_list *get_renames(struct merge_options *o,

369 o_tree, a_tree, b_tree, entries);

370 else

371 re->dst_entry = item->util;

372 - item = string_list_insert(pair->one->path, renames);

372 + item = string_list_insert(renames, pair->one->path);

373 item->util = re;

374 }

375 opts.output_format = DIFF_FORMAT_NO_OUTPUT;

@@ -432,7 +432,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *

432 lstat(newpath, &st) == 0)

433 sprintf(p, "_%d", suffix++);

434

435 - string_list_insert(newpath, &o->current_file_set);

435 + string_list_insert(&o->current_file_set, newpath);

436 return newpath;

437 }

438

@@ -811,12 +811,12 @@ static int process_renames(struct merge_options *o,

811

812 for (i = 0; i < a_renames->nr; i++) {

813 sre = a_renames->items[i].util;

814 - string_list_insert(sre->pair->two->path, &a_by_dst)->util

814 + string_list_insert(&a_by_dst, sre->pair->two->path)->util

815 = sre->dst_entry;

816 }

817 for (i = 0; i < b_renames->nr; i++) {

818 sre = b_renames->items[i].util;

819 - string_list_insert(sre->pair->two->path, &b_by_dst)->util

819 + string_list_insert(&b_by_dst, sre->pair->two->path)->util

820 = sre->dst_entry;

821 }

822

reflog-walk.c

+1 -1

@@ -190,7 +190,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,

190 }

191 if (!reflogs || reflogs->nr == 0)

192 return -1;

193 - string_list_insert(branch, &info->complete_reflogs)->util

193 + string_list_insert(&info->complete_reflogs, branch)->util

194 = reflogs;

195 }

196

remote.c

+1 -1

@@ -778,7 +778,7 @@ void ref_remove_duplicates(struct ref *ref_map)

778 continue;

779 }

780

781 - item = string_list_insert(ref_map->peer_ref->name, &refs);

781 + item = string_list_insert(&refs, ref_map->peer_ref->name);

782 item->util = ref_map;

783 }

784 string_list_clear(&refs, 0);

rerere.c

+5 -5

@@ -46,7 +46,7 @@ static void read_rr(struct string_list *rr)

46 ; /* do nothing */

47 if (i == sizeof(buf))

48 die("filename too long");

49 - string_list_insert(buf, rr)->util = name;

49 + string_list_insert(rr, buf)->util = name;

50 }

51 fclose(in);

52 }

@@ -354,7 +354,7 @@ static int find_conflict(struct string_list *conflict)

354 ce_same_name(e2, e3) &&

355 S_ISREG(e2->ce_mode) &&

356 S_ISREG(e3->ce_mode)) {

357 - string_list_insert((const char *)e2->name, conflict);

357 + string_list_insert(conflict, (const char *)e2->name);

358 i++; /* skip over both #2 and #3 */

359 }

360 }

@@ -449,7 +449,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)

449 if (ret < 1)

450 continue;

451 hex = xstrdup(sha1_to_hex(sha1));

452 - string_list_insert(path, rr)->util = hex;

452 + string_list_insert(rr, path)->util = hex;

453 if (mkdir(git_path("rr-cache/%s", hex), 0755))

454 continue;

455 handle_file(path, NULL, rerere_path(hex, "preimage"));

@@ -471,7 +471,7 @@ static int do_plain_rerere(struct string_list *rr, int fd)

471 if (has_rerere_resolution(name)) {

472 if (!merge(name, path)) {

473 if (rerere_autoupdate)

474 - string_list_insert(path, &update);

474 + string_list_insert(&update, path);

475 fprintf(stderr,

476 "%s '%s' using previous resolution.\n",

477 rerere_autoupdate

@@ -577,7 +577,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)

577 fprintf(stderr, "Updated preimage for '%s'\n", path);

578

579

580 - string_list_insert(path, rr)->util = hex;

580 + string_list_insert(rr, path)->util = hex;

581 fprintf(stderr, "Forgot resolution for %s\n", path);

582 return 0;

583 }

resolve-undo.c

+2 -2

@@ -20,7 +20,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)

20 istate->resolve_undo = resolve_undo;

21 }

22 resolve_undo = istate->resolve_undo;

23 - lost = string_list_insert(ce->name, resolve_undo);

23 + lost = string_list_insert(resolve_undo, ce->name);

24 if (!lost->util)

25 lost->util = xcalloc(1, sizeof(*ui));

26 ui = lost->util;

@@ -70,7 +70,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)

70 len = strlen(data) + 1;

71 if (size <= len)

72 goto error;

73 - lost = string_list_insert(data, resolve_undo);

73 + lost = string_list_insert(resolve_undo, data);

74 if (!lost->util)

75 lost->util = xcalloc(1, sizeof(*ui));

76 ui = lost->util;

string-list.c

+1 -1

@@ -51,7 +51,7 @@ static int add_entry(int insert_at, struct string_list *list, const char *string

51 return index;

52 }

53

54 -struct string_list_item *string_list_insert(const char *string, struct string_list *list)

54 +struct string_list_item *string_list_insert(struct string_list *list, const char *string)

55 {

56 return string_list_insert_at_index(-1, string, list);

57 }

string-list.h

+1 -1

@@ -29,7 +29,7 @@ int for_each_string_list(struct string_list *list,

29 int string_list_has_string(const struct string_list *list, const char *string);

30 int string_list_find_insert_index(const struct string_list *list, const char *string,

31 int negative_existing_index);

32 -struct string_list_item *string_list_insert(const char *string, struct string_list *list);

32 +struct string_list_item *string_list_insert(struct string_list *list, const char *string);

33 struct string_list_item *string_list_insert_at_index(int insert_at,

34 const char *string, struct string_list *list);

35 struct string_list_item *string_list_lookup(const char *string, struct string_list *list);

wt-status.c

+5 -5

@@ -232,7 +232,7 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,

232 struct wt_status_change_data *d;

233

234 p = q->queue[i];

235 - it = string_list_insert(p->one->path, &s->change);

235 + it = string_list_insert(&s->change, p->one->path);

236 d = it->util;

237 if (!d) {

238 d = xcalloc(1, sizeof(*d));

@@ -279,7 +279,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q,

279 struct wt_status_change_data *d;

280

281 p = q->queue[i];

282 - it = string_list_insert(p->two->path, &s->change);

282 + it = string_list_insert(&s->change, p->two->path);

283 d = it->util;

284 if (!d) {

285 d = xcalloc(1, sizeof(*d));

@@ -346,7 +346,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)

346

347 if (!ce_path_match(ce, s->pathspec))

348 continue;

349 - it = string_list_insert(ce->name, &s->change);

349 + it = string_list_insert(&s->change, ce->name);

350 d = it->util;

351 if (!d) {

352 d = xcalloc(1, sizeof(*d));

@@ -381,7 +381,7 @@ static void wt_status_collect_untracked(struct wt_status *s)

381 continue;

382 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))

383 continue;

384 - string_list_insert(ent->name, &s->untracked);

384 + string_list_insert(&s->untracked, ent->name);

385 free(ent);

386 }

387

@@ -395,7 +395,7 @@ static void wt_status_collect_untracked(struct wt_status *s)

395 continue;

396 if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))

397 continue;

398 - string_list_insert(ent->name, &s->ignored);

398 + string_list_insert(&s->ignored, ent->name);

399 free(ent);

400 }

401 }

string_list: Fix argument order for string_list_insert