mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
dir.[ch]: replace dir_init() with DIR_INIT
Remove the dir_init() function and replace it with a DIR_INIT macro. In many cases in the codebase we need to initialize things with a function for good reasons, e.g. needing to call another function on initialization. The "dir_init()" function was not one such case, and could trivially be replaced with a more idiomatic macro initialization pattern. The only place where we made use of its use of memset() was in dir_clear() itself, which resets the contents of an an existing struct pointer. Let's use the new "memcpy() a 'blank' struct on the stack" idiom to do that reset. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
5726a6b401
commit
ce93a4c612
4
dir.h
4
dir.h
@@ -342,6 +342,8 @@ struct dir_struct {
|
||||
unsigned visited_directories;
|
||||
};
|
||||
|
||||
#define DIR_INIT { 0 }
|
||||
|
||||
struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp);
|
||||
|
||||
/*Count the number of slashes for string s*/
|
||||
@@ -367,8 +369,6 @@ int match_pathspec(struct index_state *istate,
|
||||
int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
|
||||
int within_depth(const char *name, int namelen, int depth, int max_depth);
|
||||
|
||||
void dir_init(struct dir_struct *dir);
|
||||
|
||||
int fill_directory(struct dir_struct *dir,
|
||||
struct index_state *istate,
|
||||
const struct pathspec *pathspec);
|
||||
|
||||
Reference in New Issue
Block a user