kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

submodule--helper: replace memset() with { 0 }-initialization 

Use the less verbose { 0 }-initialization syntax rather than memset()
in builtin/submodule--helper.c, this doesn't make a difference in
terms of behavior, but as we're about to modify adjacent code makes
this more consistent, and lets us avoid worrying about when the
memset() happens v.s. a "goto cleanup".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2022-09-01 01:17:53 +02:00 committed by Junio C Hamano
parent 0b83b2b03a
commit 4b82d75b51
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/submodule--helper.c
View File

@ -1664,7 +1664,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
{ {
int dissociate = 0, quiet = 0, progress = 0, require_init = 0; int dissociate = 0, quiet = 0, progress = 0, require_init = 0;
struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT; struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT;
struct list_objects_filter_options filter_options; struct list_objects_filter_options filter_options = { 0 };
struct option module_clone_options[] = { struct option module_clone_options[] = {
OPT_STRING(0, "prefix", &clone_data.prefix, OPT_STRING(0, "prefix", &clone_data.prefix,
N_("path"), N_("path"),
@ -1704,7 +1704,6 @@ static int module_clone(int argc, const char **argv, const char *prefix)
NULL NULL
}; };


memset(&filter_options, 0, sizeof(filter_options));
argc = parse_options(argc, argv, prefix, module_clone_options, argc = parse_options(argc, argv, prefix, module_clone_options,
git_submodule_helper_usage, 0); git_submodule_helper_usage, 0);


@ -2488,7 +2487,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
{ {
struct pathspec pathspec; struct pathspec pathspec;
struct update_data opt = UPDATE_DATA_INIT; struct update_data opt = UPDATE_DATA_INIT;
struct list_objects_filter_options filter_options; struct list_objects_filter_options filter_options = { 0 };
int ret; int ret;
struct option module_update_options[] = { struct option module_update_options[] = {
OPT__FORCE(&opt.force, N_("force checkout updates"), 0), OPT__FORCE(&opt.force, N_("force checkout updates"), 0),
@ -2546,7 +2545,6 @@ static int module_update(int argc, const char **argv, const char *prefix)
update_clone_config_from_gitmodules(&opt.max_jobs); update_clone_config_from_gitmodules(&opt.max_jobs);
git_config(git_update_clone_config, &opt.max_jobs); git_config(git_update_clone_config, &opt.max_jobs);


memset(&filter_options, 0, sizeof(filter_options));
argc = parse_options(argc, argv, prefix, module_update_options, argc = parse_options(argc, argv, prefix, module_update_options,
git_submodule_helper_usage, 0); git_submodule_helper_usage, 0);