diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-07-01 12:51:27 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-01 12:32:22 -0700 |
| commit | ce93a4c6127abdf1ad9eacd537edd1c571a18e41 (patch) | |
| tree | f5393dbc3f3ce9cd98ba2aa5d7f015b1bd796a30 /builtin/add.c | |
| parent | *.c *_init(): define in terms of corresponding *_INIT macro (diff) | |
| download | tgif-ce93a4c6127abdf1ad9eacd537edd1c571a18e41.tar.xz | |
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>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c index b773b5a499..09e684585d 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -470,7 +470,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) { int exit_status = 0; struct pathspec pathspec; - struct dir_struct dir; + struct dir_struct dir = DIR_INIT; int flags; int add_new_files; int require_pathspec; @@ -577,7 +577,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) die_in_unpopulated_submodule(&the_index, prefix); die_path_inside_submodule(&the_index, &pathspec); - dir_init(&dir); if (add_new_files) { int baselen; |