Marat Radchenko <ma...@slonopotamus.org> writes:
> Do not force users of OPT_SET_PTR to cast pointer to correct
> underlying pointer type by integrating cast into OPT_SET_PTR macro.
>
> Cast is required to prevent 'initialization makes integer from pointer
> without a cast' compiler warning.
> ---
Signed-off-by (and probably "From:" too): Junio C Hamano <gits...@pobox.com>
;-)
> parse-options.h | 2 +-
> test-parse-options.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/parse-options.h b/parse-options.h
> index 8fa02dc..54099d9 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -129,7 +129,7 @@ struct option {
> #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
> (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
> NULL, 1}
> #define OPT_SET_PTR(s, l, v, h, p) { OPTION_SET_PTR, (s), (l), (v), NULL, \
> - (h), PARSE_OPT_NOARG, NULL, (p) }
> + (h), PARSE_OPT_NOARG, NULL, (intptr_t)(p)
> }
> #define OPT_CMDMODE(s, l, v, h, i) { OPTION_CMDMODE, (s), (l), (v), NULL, \
> (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG,
> NULL, (i) }
> #define OPT_INTEGER(s, l, v, h) { OPTION_INTEGER, (s), (l), (v),
> N_("n"), (h) }
> diff --git a/test-parse-options.c b/test-parse-options.c
> index 6f6c656..10da63e 100644
> --- a/test-parse-options.c
> +++ b/test-parse-options.c
> @@ -60,7 +60,7 @@ int main(int argc, char **argv)
> OPT_STRING('o', NULL, &string, "str", "get another string"),
> OPT_NOOP_NOARG(0, "obsolete"),
> OPT_SET_PTR(0, "default-string", &string,
> - "set string to default", (intptr_t)"default"),
> + "set string to default", "default"),
> OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
> OPT_GROUP("Magic arguments"),
> OPT_ARGUMENT("quux", "means --quux"),
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
