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

replace memset with string-list initializers

Browse Source 
Using memset and then manually setting values of the string-list
members is not future proof as the internal representation of
string-list may change any time.
Use `string_list_init()` or STRING_LIST_INIT_* macros instead of
memset.

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tanay Abhra
2014-07-18 02:19:00 -07:00
committed by Junio C Hamano
parent 3ed3f5fe85
commit f93d7c6fa0
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -2062,12 +2062,9 @@ void init_merge_options(struct merge_options *o)
if (o->verbosity >= 5)
o->buffer_output = 0;
strbuf_init(&o->obuf, 0);
memset(&o->current_file_set, 0, sizeof(struct string_list));
o->current_file_set.strdup_strings = 1;
memset(&o->current_directory_set, 0, sizeof(struct string_list));
o->current_directory_set.strdup_strings = 1;
memset(&o->df_conflict_file_set, 0, sizeof(struct string_list));
o->df_conflict_file_set.strdup_strings = 1;
string_list_init(&o->current_file_set, 1);
string_list_init(&o->current_directory_set, 1);
string_list_init(&o->df_conflict_file_set, 1);
}
int parse_merge_opt(struct merge_options *o, const char *s)