From eb8bc57240d5d3e4680ff1df18a0a7792e96bd0c Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 24 May 2011 18:14:42 +0200 Subject: cmdutils: remove OPT_FUNC2 Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. --- cmdutils.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'cmdutils.h') diff --git a/cmdutils.h b/cmdutils.h index 9e5827fc2b..eea44018b6 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -121,17 +121,15 @@ typedef struct { #define OPT_INT 0x0080 #define OPT_FLOAT 0x0100 #define OPT_SUBTITLE 0x0200 -#define OPT_FUNC2 0x0400 -#define OPT_INT64 0x0800 -#define OPT_EXIT 0x1000 -#define OPT_DATA 0x2000 -#define OPT_DUMMY 0x4000 +#define OPT_INT64 0x0400 +#define OPT_EXIT 0x0800 +#define OPT_DATA 0x1000 +#define OPT_DUMMY 0x2000 union { - void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func int *int_arg; char **str_arg; float *float_arg; - int (*func2_arg)(const char *, const char *); + int (*func_arg)(const char *, const char *); int64_t *int64_arg; } u; const char *help; -- cgit v1.2.3