зеркало из https://github.com/microsoft/git.git
string-list.[ch]: remove string_list_init() compatibility function
Remove this function left over to accommodate in-flight changes, see770fedaf9f
(string-list.[ch]: add a string_list_init_{nodup,dup}(), 2021-07-01) for the recent change to add "string_list_init_{nodup,dup}()" initializers. There was only one user of the API left in remote-curl.c. I don't know why I didn't include this change to remote-curl.c inbc40dfb10a
(string-list.h users: change to use *_{nodup,dup}(), 2021-07-01), perhaps I just missed it. In any case, let's change that one user to use the new API, as of writing this there are no in-flight changes that use, so this seems like a good time to drop this before we get any new users of this compatibility API. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
cefe983a32
Коммит
abf897bacd
|
@ -1478,8 +1478,8 @@ int cmd_main(int argc, const char **argv)
|
||||||
options.verbosity = 1;
|
options.verbosity = 1;
|
||||||
options.progress = !!isatty(2);
|
options.progress = !!isatty(2);
|
||||||
options.thin = 1;
|
options.thin = 1;
|
||||||
string_list_init(&options.deepen_not, 1);
|
string_list_init_dup(&options.deepen_not);
|
||||||
string_list_init(&options.push_options, 1);
|
string_list_init_dup(&options.push_options);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Just report "remote-curl" here (folding all the various aliases
|
* Just report "remote-curl" here (folding all the various aliases
|
||||||
|
|
|
@ -13,14 +13,6 @@ void string_list_init_dup(struct string_list *list)
|
||||||
memcpy(list, &blank, sizeof(*list));
|
memcpy(list, &blank, sizeof(*list));
|
||||||
}
|
}
|
||||||
|
|
||||||
void string_list_init(struct string_list *list, int strdup_strings)
|
|
||||||
{
|
|
||||||
if (strdup_strings)
|
|
||||||
string_list_init_dup(list);
|
|
||||||
else
|
|
||||||
string_list_init_nodup(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if there is no exact match, point to the index where the entry could be
|
/* if there is no exact match, point to the index where the entry could be
|
||||||
* inserted */
|
* inserted */
|
||||||
static int get_entry_index(const struct string_list *list, const char *string,
|
static int get_entry_index(const struct string_list *list, const char *string,
|
||||||
|
|
|
@ -104,11 +104,6 @@ struct string_list {
|
||||||
void string_list_init_nodup(struct string_list *list);
|
void string_list_init_nodup(struct string_list *list);
|
||||||
void string_list_init_dup(struct string_list *list);
|
void string_list_init_dup(struct string_list *list);
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO remove: For compatibility with any in-flight older API users
|
|
||||||
*/
|
|
||||||
void string_list_init(struct string_list *list, int strdup_strings);
|
|
||||||
|
|
||||||
/** Callback function type for for_each_string_list */
|
/** Callback function type for for_each_string_list */
|
||||||
typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
|
typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче