string-list.h users: change to use *_{nodup,dup}()

Change all in-tree users of the string_list_init(LIST, BOOL) API to
use string_list_init_{nodup,dup}(LIST) instead.

As noted in the preceding commit let's leave the now-unused
string_list_init() wrapper in-place for any in-flight users, it can be
removed at some later date.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull/1049/head
Ævar Arnfjörð Bjarmason 1 year ago committed by Junio C Hamano
parent 770fedaf9f
commit bc40dfb10a
  1. 6
      apply.c
  2. 2
      archive.c
  3. 2
      config.c
  4. 4
      entry.c
  5. 4
      merge-ort.c
  6. 4
      merge-recursive.c
  7. 2
      refs/packed-backend.c
  8. 2
      transport.c

@ -101,9 +101,9 @@ int init_apply_state(struct apply_state *state,
state->ws_error_action = warn_on_ws_error;
state->ws_ignore_action = ignore_ws_none;
state->linenr = 1;
string_list_init(&state->fn_table, 0);
string_list_init(&state->limit_by_name, 0);
string_list_init(&state->symlink_changes, 0);
string_list_init_nodup(&state->fn_table);
string_list_init_nodup(&state->limit_by_name);
string_list_init_nodup(&state->symlink_changes);
strbuf_init(&state->root, 0);
git_apply_config();

@ -645,7 +645,7 @@ int write_archive(int argc, const char **argv, const char *prefix,
args.pretty_ctx = &ctx;
args.repo = repo;
args.prefix = prefix;
string_list_init(&args.extra_files, 1);
string_list_init_dup(&args.extra_files);
argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
if (!startup_info->have_repository) {
/*

@ -2072,7 +2072,7 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
e = xmalloc(sizeof(*e));
hashmap_entry_init(&e->ent, strhash(key));
e->key = xstrdup(key);
string_list_init(&e->value_list, 1);
string_list_init_dup(&e->value_list);
hashmap_add(&cs->config_hash, &e->ent);
}
si = string_list_append_nodup(&e->value_list, xstrdup_or_null(value));

@ -143,8 +143,8 @@ void enable_delayed_checkout(struct checkout *state)
if (!state->delayed_checkout) {
state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout));
state->delayed_checkout->state = CE_CAN_DELAY;
string_list_init(&state->delayed_checkout->filters, 0);
string_list_init(&state->delayed_checkout->paths, 0);
string_list_init_nodup(&state->delayed_checkout->filters);
string_list_init_nodup(&state->delayed_checkout->paths);
}
}

@ -1729,7 +1729,7 @@ static void compute_collisions(struct strmap *collisions,
free(new_path);
} else {
CALLOC_ARRAY(collision_info, 1);
string_list_init(&collision_info->source_files, 0);
string_list_init_nodup(&collision_info->source_files);
strmap_put(collisions, new_path, collision_info);
}
string_list_insert(&collision_info->source_files,
@ -3689,7 +3689,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
*/
strmap_init_with_options(&opt->priv->paths, NULL, 0);
strmap_init_with_options(&opt->priv->conflicted, NULL, 0);
string_list_init(&opt->priv->paths_to_free, 0);
string_list_init_nodup(&opt->priv->paths_to_free);
/*
* keys & strbufs in output will sometimes need to outlive "paths",

@ -121,7 +121,7 @@ static void dir_rename_entry_init(struct dir_rename_entry *entry,
entry->dir = directory;
entry->non_unique_new_dir = 0;
strbuf_init(&entry->new_dir, 0);
string_list_init(&entry->possible_new_dirs, 0);
string_list_init_nodup(&entry->possible_new_dirs);
}
struct collision_entry {
@ -3703,7 +3703,7 @@ static int merge_start(struct merge_options *opt, struct tree *head)
}
CALLOC_ARRAY(opt->priv, 1);
string_list_init(&opt->priv->df_conflict_file_set, 1);
string_list_init_dup(&opt->priv->df_conflict_file_set);
return 0;
}

@ -1425,7 +1425,7 @@ static int packed_transaction_prepare(struct ref_store *ref_store,
*/
CALLOC_ARRAY(data, 1);
string_list_init(&data->updates, 0);
string_list_init_nodup(&data->updates);
transaction->backend_data = data;

@ -1050,7 +1050,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
struct transport *ret = xcalloc(1, sizeof(*ret));
ret->progress = isatty(2);
string_list_init(&ret->pack_lockfiles, 1);
string_list_init_dup(&ret->pack_lockfiles);
if (!remote)
BUG("No remote provided to transport_get()");

Loading…
Cancel
Save