cmdutils: add support for caller-provided option context.

This is the first step to removing the globals plague from avtools.
This commit is contained in:
Anton Khirnov
2011-08-28 14:43:54 +02:00
parent 7efe05ab29
commit 7cc8d6385a
7 changed files with 26 additions and 16 deletions

View File

@@ -346,7 +346,7 @@ static int opt_format(const char *opt, const char *arg)
return 0;
}
static void opt_input_file(const char *arg)
static void opt_input_file(void *optctx, const char *arg)
{
if (input_filename) {
fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
#endif
show_banner();
parse_options(argc, argv, options, opt_input_file);
parse_options(NULL, argc, argv, options, opt_input_file);
if (!input_filename) {
show_usage();