зеркало из https://github.com/microsoft/git.git
dir.c: rename free_excludes() to clear_exclude_list()
It is clearer to use a 'clear_' prefix for functions which empty and deallocate the contents of a data structure without freeing the structure itself, and a 'free_' prefix for functions which also free the structure itself. http://article.gmane.org/gmane.comp.version-control.git/206128 Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a35341a86e
Коммит
f619881251
6
dir.c
6
dir.c
|
@ -400,7 +400,11 @@ static void *read_skip_worktree_file_from_index(const char *path, size_t *size)
|
|||
return data;
|
||||
}
|
||||
|
||||
void free_excludes(struct exclude_list *el)
|
||||
/*
|
||||
* Frees memory within el which was allocated for exclude patterns and
|
||||
* the file buffer. Does not free el itself.
|
||||
*/
|
||||
void clear_exclude_list(struct exclude_list *el)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
2
dir.h
2
dir.h
|
@ -135,7 +135,7 @@ extern void add_excludes_from_file(struct dir_struct *, const char *fname);
|
|||
extern void parse_exclude_pattern(const char **string, int *patternlen, int *flags, int *nowildcardlen);
|
||||
extern void add_exclude(const char *string, const char *base,
|
||||
int baselen, struct exclude_list *el);
|
||||
extern void free_excludes(struct exclude_list *el);
|
||||
extern void clear_exclude_list(struct exclude_list *el);
|
||||
extern int file_exists(const char *);
|
||||
|
||||
extern int is_inside_dir(const char *dir);
|
||||
|
|
|
@ -1153,7 +1153,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
|
|||
*o->dst_index = o->result;
|
||||
|
||||
done:
|
||||
free_excludes(&el);
|
||||
clear_exclude_list(&el);
|
||||
if (o->path_exclude_check) {
|
||||
path_exclude_check_clear(o->path_exclude_check);
|
||||
free(o->path_exclude_check);
|
||||
|
|
Загрузка…
Ссылка в новой задаче