Re: [PATCH v4 4/9] checkout.[ch]: introduce an *_INIT macro
flat view
From: Junio C Hamano <hidden>
Date: 2018-06-01 04:16:33
Ævar Arnfjörð Bjarmason [off-list ref] writes:
Add an *_INIT macro for the tracking_name_data similar to what exists elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This will make it more idiomatic in later changes to add more fields to the struct & its initialization macro.
Makes sense; Thomas's comment on 3/9 still stands at this point, as
we have no outside users of the definition of the callback data yet
at this point.
quoted hunk
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- checkout.c | 2 +- checkout.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)diff --git a/checkout.c b/checkout.c index 8d68f75ad1..629fc1d5c4 100644 --- a/checkout.c +++ b/checkout.c@@ -25,7 +25,7 @@ static int check_tracking_name(struct remote *remote, void *cb_data) const char *unique_tracking_name(const char *name, struct object_id *oid) { - struct tracking_name_data cb_data = { NULL, NULL, NULL, 1 }; + struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT; cb_data.src_ref = xstrfmt("refs/heads/%s", name); cb_data.dst_oid = oid; for_each_remote(check_tracking_name, &cb_data);diff --git a/checkout.h b/checkout.h index 04b52f9ffe..a61ec93e65 100644 --- a/checkout.h +++ b/checkout.h@@ -10,6 +10,8 @@ struct tracking_name_data { int unique; }; +#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 1 } + /* * Check if the branch name uniquely matches a branch name on a remote * tracking branch. Return the name of the remote if such a branch