RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmdutils: declare only one pointer type in OptionDef 

This will be useful in the following commit.
This commit is contained in:
Anton Khirnov 2011-08-28 14:27:27 +02:00
parent cac651c834
commit 7efe05ab29
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmdutils.c
View File

@ -216,6 +216,7 @@ void parse_options(int argc, char **argv, const OptionDef *options,
/* parse options */
optindex = 1;
while (optindex < argc) {
void *dst;
opt = argv[optindex++];
if (handleoptions && opt[0] == '-' && opt[1] != '\0') {
@ -248,18 +249,19 @@ unknown_opt:
exit_program(1);
}
}
dst = po->u.dst_ptr;
if (po->flags & OPT_STRING) {
char *str;
str = av_strdup(arg);
*po->u.str_arg = str;
*(char**)dst = str;
} else if (po->flags & OPT_BOOL) {
*po->u.int_arg = bool_val;
*(int*)dst = bool_val;
} else if (po->flags & OPT_INT) {
*po->u.int_arg = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
*(int*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
} else if (po->flags & OPT_INT64) {
*po->u.int64_arg = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);
*(int64_t*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);
} else if (po->flags & OPT_FLOAT) {
*po->u.float_arg = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
*(float*)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
} else if (po->u.func_arg) {
if (po->u.func_arg(opt, arg) < 0) {
fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt);

5
cmdutils.h
View File

@ -125,11 +125,8 @@ typedef struct {
#define OPT_EXIT 0x0800
#define OPT_DATA 0x1000
union {
int *int_arg;
char **str_arg;
float *float_arg;
void *dst_ptr;
int (*func_arg)(const char *, const char *);
int64_t *int64_arg;
} u;
const char *help;
const char *argname;