diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:17 -0700 |
| commit | b389e04031ffe4c725161a082ff748bd33688641 (patch) | |
| tree | bb76d767a8c91617cccb15f15371240360b4fd64 /parse-options.c | |
| parent | ed15e20ba36eaf85453915ef5130a770caa8d3e7 (diff) | |
| parent | 20d1c6528c76242581e89c271679d35884d916dc (diff) | |
| download | git-b389e04031ffe4c725161a082ff748bd33688641.tar.gz git-b389e04031ffe4c725161a082ff748bd33688641.tar.xz | |
Merge branch 'mr/opt-set-ptr'
OPT_SET_PTR() implementation was broken on IL32P64 platforms;
it turns out that the macro is not used by any real user.
* mr/opt-set-ptr:
parse-options: remove unused OPT_SET_PTR
parse-options: add cast to correct pointer type to OPT_SET_PTR
MSVC: fix t0040-parse-options crash
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/parse-options.c b/parse-options.c index c81d3a065..b536896f2 100644 --- a/parse-options.c +++ b/parse-options.c @@ -127,10 +127,6 @@ static int get_value(struct parse_opt_ctx_t *p, *(int *)opt->value = opt->defval; return 0; - case OPTION_SET_PTR: - *(void **)opt->value = unset ? NULL : (void *)opt->defval; - return 0; - case OPTION_STRING: if (unset) *(const char **)opt->value = NULL; @@ -367,7 +363,6 @@ static void parse_options_check(const struct option *opts) case OPTION_BIT: case OPTION_NEGBIT: case OPTION_SET_INT: - case OPTION_SET_PTR: case OPTION_NUMBER: if ((opts->flags & PARSE_OPT_OPTARG) || !(opts->flags & PARSE_OPT_NOARG)) |