| Message ID | 20200221031027.204486-2-emilyshaffer@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | propagate --single-branch during clone --recurse-submodules | expand |
On Thu, Feb 20, 2020 at 07:10:26PM -0800, Emily Shaffer wrote: > Start using a named initializer list for SUBMODULE_UPDATE_CLONE_INIT, as > the struct is becoming cumbersome for a typical struct initializer list. Much nicer. :) I manually compared the struct declaration to the existing initializer to double-check that you counted the offsets correctly, and all looks good. -Peff
Emily Shaffer <emilyshaffer@google.com> writes: > Start using a named initializer list for SUBMODULE_UPDATE_CLONE_INIT, as The feature has its own name. Instead of coming up with your own name for it, let's say "designated initializers". > -#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ > - SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, 0, \ > - NULL, NULL, NULL, \ > - NULL, 0, 0, 0, NULL, 0, 0, 1} > +#define SUBMODULE_UPDATE_CLONE_INIT { \ > + .list = MODULE_LIST_INIT, \ > + .update = SUBMODULE_UPDATE_STRATEGY_INIT, \ > + .recommend_shallow = -1, \ > + .references = STRING_LIST_INIT_DUP, \ > + .max_jobs = 1 \ > +} This does make it read more easily. If you ended the last field with trailing comma, that would have been even better as a future proofing ;-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b6e4c79968..1737a91890 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1586,10 +1586,13 @@ struct submodule_update_clone { int max_jobs; }; -#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ - SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, 0, \ - NULL, NULL, NULL, \ - NULL, 0, 0, 0, NULL, 0, 0, 1} +#define SUBMODULE_UPDATE_CLONE_INIT { \ + .list = MODULE_LIST_INIT, \ + .update = SUBMODULE_UPDATE_STRATEGY_INIT, \ + .recommend_shallow = -1, \ + .references = STRING_LIST_INIT_DUP, \ + .max_jobs = 1 \ +} static void next_submodule_warn_missing(struct submodule_update_clone *suc,
Start using a named initializer list for SUBMODULE_UPDATE_CLONE_INIT, as the struct is becoming cumbersome for a typical struct initializer list. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> --- builtin/submodule--helper.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)