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

Merge branch 'ab/struct-init'

Browse Source 
Code cleanup around struct_type_init() functions.

* ab/struct-init:
  string-list.h users: change to use *_{nodup,dup}()
  string-list.[ch]: add a string_list_init_{nodup,dup}()
  dir.[ch]: replace dir_init() with DIR_INIT
  *.c *_init(): define in terms of corresponding *_INIT macro
  *.h: move some *_INIT to designated initializers
This commit is contained in:
Junio C Hamano
2021-07-16 17:42:52 -07:00
parent 832a239b72 bc40dfb10a
commit bd4232fac3
29 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-ort.c
View File

@ -1840,7 +1840,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,
@ -4030,7 +4030,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",