| Message ID | 13179d3e-f1d5-55f7-3572-829b5ddc9827@ramsayjones.plus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | config.h: fix hdr-check warnings | expand |
On Mon, Jan 14, 2019 at 4:02 AM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote: > > > commit 8f7c7f5555 ("config.c: add repo_config_set_worktree_gently()", > 2018-12-27) adds three function declarations that cause the hdr-check > make target to complain. The hdr-check complaint is caused by placing > the new declarations, which include 'struct repository *' parameters, > before the declaration of 'struct repository'. Move the struct > declaration to the top of the file. > > Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> > --- > > Hi Duy, > > If you need to re-roll your 'nd/config-move-to' branch, could you please > squash this into the relevant patch (commit 8f7c7f5555). Hi Junio, I notice you squashed in all changes of this series (I was preparing to resend last weekend). Will you squash this in too? It's of course ok if you don't, I'll resend. > BTW, none of the three new functions are called outside of config.c on > the 'pu' branch - I assume future patches will add some calls to these > functions (yes?). Yes. Once this part lands I'll submit the fun stuff.
diff --git a/config.h b/config.h index 62204dc252..77c5b12873 100644 --- a/config.h +++ b/config.h @@ -5,6 +5,7 @@ #include "string-list.h" struct object_id; +struct repository; /* git_config_parse_key() returns these negated: */ #define CONFIG_INVALID_KEY 1 @@ -215,7 +216,6 @@ extern int git_configset_get_maybe_bool(struct config_set *cs, const char *key, extern int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest); /* Functions for reading a repository's config */ -struct repository; extern void repo_config(struct repository *repo, config_fn_t fn, void *data); extern int repo_config_get_value(struct repository *repo, const char *key, const char **value);
commit 8f7c7f5555 ("config.c: add repo_config_set_worktree_gently()", 2018-12-27) adds three function declarations that cause the hdr-check make target to complain. The hdr-check complaint is caused by placing the new declarations, which include 'struct repository *' parameters, before the declaration of 'struct repository'. Move the struct declaration to the top of the file. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> --- Hi Duy, If you need to re-roll your 'nd/config-move-to' branch, could you please squash this into the relevant patch (commit 8f7c7f5555). BTW, none of the three new functions are called outside of config.c on the 'pu' branch - I assume future patches will add some calls to these functions (yes?). Thanks! ATB, Ramsay Jones config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)