parse-options: remove unused OPT_SET_PTR
OPT_SET_PTR was never used since its creation at db7244bd
(parse-options new features., 2007-11-07).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
			
			
				maint
			
			
		
							parent
							
								
									9ff8ff310b
								
							
						
					
					
						commit
						20d1c6528c
					
				|  | @ -160,10 +160,6 @@ There are some macros to easily define options: | |||
| 	`int_var` is set to `integer` with `--option`, and | ||||
| 	reset to zero with `--no-option`. | ||||
|  | ||||
| `OPT_SET_PTR(short, long, &ptr_var, description, ptr)`:: | ||||
| 	Introduce a boolean option. | ||||
| 	If used, set `ptr_var` to `ptr`. | ||||
|  | ||||
| `OPT_STRING(short, long, &str_var, arg_str, description)`:: | ||||
| 	Introduce an option with string argument. | ||||
| 	The string argument is put into `str_var`. | ||||
|  |  | |||
|  | @ -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; | ||||
|  | @ -370,7 +366,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)) | ||||
|  |  | |||
|  | @ -12,7 +12,6 @@ enum parse_opt_type { | |||
| 	OPTION_NEGBIT, | ||||
| 	OPTION_COUNTUP, | ||||
| 	OPTION_SET_INT, | ||||
| 	OPTION_SET_PTR, | ||||
| 	OPTION_CMDMODE, | ||||
| 	/* options with arguments (usually) */ | ||||
| 	OPTION_STRING, | ||||
|  | @ -96,7 +95,7 @@ typedef int parse_opt_ll_cb(struct parse_opt_ctx_t *ctx, | |||
|  * | ||||
|  * `defval`:: | ||||
|  *   default value to fill (*->value) with for PARSE_OPT_OPTARG. | ||||
|  *   OPTION_{BIT,SET_INT,SET_PTR} store the {mask,integer,pointer} to put in | ||||
|  *   OPTION_{BIT,SET_INT} store the {mask,integer,pointer} to put in | ||||
|  *   the value when met. | ||||
|  *   CALLBACKS can use it like they want. | ||||
|  */ | ||||
|  | @ -128,8 +127,6 @@ struct option { | |||
| #define OPT_BOOL(s, l, v, h)        OPT_SET_INT(s, l, v, h, 1) | ||||
| #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, (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) } | ||||
|  |  | |||
|  | @ -30,7 +30,6 @@ String options | |||
|     --string2 <str>       get another string | ||||
|     --st <st>             get another string (pervert ordering) | ||||
|     -o <str>              get another string | ||||
|     --default-string      set string to default | ||||
|     --list <str>          add str to list | ||||
|  | ||||
| Magic arguments | ||||
|  | @ -293,7 +292,7 @@ cat > expect <<EOF | |||
| boolean: 0 | ||||
| integer: 0 | ||||
| timestamp: 1 | ||||
| string: default | ||||
| string: (not set) | ||||
| abbrev: 7 | ||||
| verbose: 0 | ||||
| quiet: yes | ||||
|  | @ -302,8 +301,8 @@ file: (not set) | |||
| arg 00: foo | ||||
| EOF | ||||
|  | ||||
| test_expect_success 'OPT_DATE() and OPT_SET_PTR() work' ' | ||||
| 	test-parse-options -t "1970-01-01 00:00:01 +0000" --default-string \ | ||||
| test_expect_success 'OPT_DATE() works' ' | ||||
| 	test-parse-options -t "1970-01-01 00:00:01 +0000" \ | ||||
| 		foo -q > output 2> output.err && | ||||
| 	test_must_be_empty output.err && | ||||
| 	test_cmp expect output | ||||
|  |  | |||
|  | @ -59,8 +59,6 @@ int main(int argc, char **argv) | |||
| 		OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"), | ||||
| 		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", "default"), | ||||
| 		OPT_STRING_LIST(0, "list", &list, "str", "add str to list"), | ||||
| 		OPT_GROUP("Magic arguments"), | ||||
| 		OPT_ARGUMENT("quux", "means --quux"), | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Marat Radchenko
						Marat Radchenko