mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/retire-string-list-init'

Browse Source 
Code cleanup.

* ab/retire-string-list-init:
  string-list.[ch]: remove string_list_init() compatibility function
This commit is contained in:
Junio C Hamano
2021-10-06 13:40:13 -07:00
parent 870de59af0 abf897bacd
commit 7ca97f5222
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote-curl.c
View File

@ -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

8
string-list.c
View File

@ -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,

5
string-list.h
View File

@ -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 *);