Hi Jeff
On 24.07.18 17:30, g...@jeffhostetler.com wrote:
> From: Jeff Hostetler <jeffh...@microsoft.com>
>
> In commit fb0dc3bac135e9f6243bd6d293e8c9293c73b9cd code was added
> to builtin/config.c to define a new function and a forward declaration
> for an array of unknown size. This causes a compile error under MSVC.
>
> Reorder the code to forward declare the function instead of the array.
This was already fixed (differently) in
<20180705183445.30901-1-dev+...@drbeat.li>.
Cheers,
Beat
> Signed-off-by: Jeff Hostetler <jeffh...@microsoft.com>
> ---
> builtin/config.c | 79
> ++++++++++++++++++++++++++++----------------------------
> 1 file changed, 40 insertions(+), 39 deletions(-)
>
> diff --git a/builtin/config.c b/builtin/config.c
> index b29d26d..564f18f 100644
> --- a/builtin/config.c
> +++ b/builtin/config.c
> @@ -67,7 +67,46 @@ static int show_origin;
> { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
> PARSE_OPT_NONEG, option_parse_type, (i) }
>
> -static struct option builtin_config_options[];
> +static int option_parse_type(const struct option *opt, const char *arg,
> + int unset);
> +
> +static struct option builtin_config_options[] = {
> + OPT_GROUP(N_("Config file location")),
> + OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
> + OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
> + OPT_BOOL(0, "local", &use_local_config, N_("use repository config
> file")),
> + OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use
> given config file")),
> + OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"),
> N_("read config from given blob object")),
> + OPT_GROUP(N_("Action")),
> + OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"),
> ACTION_GET),
> + OPT_BIT(0, "get-all", &actions, N_("get all values: key
> [value-regex]"), ACTION_GET_ALL),
> + OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp:
> name-regex [value-regex]"), ACTION_GET_REGEXP),
> + OPT_BIT(0, "get-urlmatch", &actions, N_("get value specific for the
> URL: section[.var] URL"), ACTION_GET_URLMATCH),
> + OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables:
> name value [value_regex]"), ACTION_REPLACE_ALL),
> + OPT_BIT(0, "add", &actions, N_("add a new variable: name value"),
> ACTION_ADD),
> + OPT_BIT(0, "unset", &actions, N_("remove a variable: name
> [value-regex]"), ACTION_UNSET),
> + OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name
> [value-regex]"), ACTION_UNSET_ALL),
> + OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name
> new-name"), ACTION_RENAME_SECTION),
> + OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"),
> ACTION_REMOVE_SECTION),
> + OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
> + OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
> + OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot
> [default]"), ACTION_GET_COLOR),
> + OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot
> [stdout-is-tty]"), ACTION_GET_COLORBOOL),
> + OPT_GROUP(N_("Type")),
> + OPT_CALLBACK('t', "type", &type, "", N_("value is given this type"),
> option_parse_type),
> + OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or
> \"false\""), TYPE_BOOL),
> + OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"),
> TYPE_INT),
> + OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or
> --int"), TYPE_BOOL_OR_INT),
> + OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or
> directory name)"), TYPE_PATH),
> + OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry
> date"), TYPE_EXPIRY_DATE),
> + OPT_GROUP(N_("Other")),
> + OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
> + OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
> + OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include
> directives on lookup")),
> + OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config
> (file, standard input, blob, command line)")),
> + OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get,
> use default value when missing entry")),
> + OPT_END(),
> +};
>
> static int option_parse_type(const struct option *opt, const char *arg,
> int unset)
> @@ -119,44 +158,6 @@ static int option_parse_type(const struct option *opt,
> const char *arg,
> return 0;
> }
>
> -static struct option builtin_config_options[] = {
> - OPT_GROUP(N_("Config file location")),
> - OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
> - OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
> - OPT_BOOL(0, "local", &use_local_config, N_("use repository config
> file")),
> - OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use
> given config file")),
> - OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"),
> N_("read config from given blob object")),
> - OPT_GROUP(N_("Action")),
> - OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"),
> ACTION_GET),
> - OPT_BIT(0, "get-all", &actions, N_("get all values: key
> [value-regex]"), ACTION_GET_ALL),
> - OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp:
> name-regex [value-regex]"), ACTION_GET_REGEXP),
> - OPT_BIT(0, "get-urlmatch", &actions, N_("get value specific for the
> URL: section[.var] URL"), ACTION_GET_URLMATCH),
> - OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables:
> name value [value_regex]"), ACTION_REPLACE_ALL),
> - OPT_BIT(0, "add", &actions, N_("add a new variable: name value"),
> ACTION_ADD),
> - OPT_BIT(0, "unset", &actions, N_("remove a variable: name
> [value-regex]"), ACTION_UNSET),
> - OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name
> [value-regex]"), ACTION_UNSET_ALL),
> - OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name
> new-name"), ACTION_RENAME_SECTION),
> - OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"),
> ACTION_REMOVE_SECTION),
> - OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
> - OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
> - OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot
> [default]"), ACTION_GET_COLOR),
> - OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot
> [stdout-is-tty]"), ACTION_GET_COLORBOOL),
> - OPT_GROUP(N_("Type")),
> - OPT_CALLBACK('t', "type", &type, "", N_("value is given this type"),
> option_parse_type),
> - OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or
> \"false\""), TYPE_BOOL),
> - OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"),
> TYPE_INT),
> - OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or
> --int"), TYPE_BOOL_OR_INT),
> - OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or
> directory name)"), TYPE_PATH),
> - OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry
> date"), TYPE_EXPIRY_DATE),
> - OPT_GROUP(N_("Other")),
> - OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
> - OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
> - OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include
> directives on lookup")),
> - OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config
> (file, standard input, blob, command line)")),
> - OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get,
> use default value when missing entry")),
> - OPT_END(),
> -};
> -
> static void check_argc(int argc, int min, int max) {
> if (argc >= min && argc <= max)
> return;
>
