RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-08 13:38:07 +00:00
Code Issues Projects Releases Wiki Activity

cmdutils: pass number of groups to split_commandline().

Browse Source 
This makes the code simpler and avoids mixing designated and
non-designated initializers in a potentially unsafe way in avconv.
This commit is contained in:
Anton Khirnov 2012-12-19 21:53:22 +01:00
parent bb2bab92e7
commit c661cb6672
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avconv_opt.c
View File

@ -1862,7 +1862,6 @@ enum OptGroup {
static const OptionGroupDef groups[] = { static const OptionGroupDef groups[] = {
[GROUP_OUTFILE] = { "output file", NULL }, [GROUP_OUTFILE] = { "output file", NULL },
[GROUP_INFILE] = { "input file", "i" }, [GROUP_INFILE] = { "input file", "i" },
{ 0 },
}; };
static int open_files(OptionGroupList *l, const char *inout, static int open_files(OptionGroupList *l, const char *inout,
@ -1907,7 +1906,8 @@ int avconv_parse_options(int argc, char **argv)
memset(&octx, 0, sizeof(octx)); memset(&octx, 0, sizeof(octx));
/* split the commandline into an internal representation */ /* split the commandline into an internal representation */
ret = split_commandline(&octx, argc, argv, options, groups); ret = split_commandline(&octx, argc, argv, options, groups,
FF_ARRAY_ELEMS(groups));
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "Error splitting the argument list: "); av_log(NULL, AV_LOG_FATAL, "Error splitting the argument list: ");
goto fail; goto fail;

24
cmdutils.c
View File

@ -443,14 +443,15 @@ int opt_default(void *optctx, const char *opt, const char *arg)
* *
* @return index of the group definition that matched or -1 if none * @return index of the group definition that matched or -1 if none
*/ */
static int match_group_separator(const OptionGroupDef *groups, const char *opt) static int match_group_separator(const OptionGroupDef *groups, int nb_groups,
const char *opt)
{ {
const OptionGroupDef *p = groups; int i;
while (p->name) { for (i = 0; i < nb_groups; i++) {
const OptionGroupDef *p = &groups[i];
if (p->sep && !strcmp(p->sep, opt)) if (p->sep && !strcmp(p->sep, opt))
return p - groups; return i;
p++;
} }
return -1; return -1;
@ -506,17 +507,14 @@ static void add_opt(OptionParseContext *octx, const OptionDef *opt,
} }
static void init_parse_context(OptionParseContext *octx, static void init_parse_context(OptionParseContext *octx,
const OptionGroupDef *groups) const OptionGroupDef *groups, int nb_groups)
{ {
static const OptionGroupDef global_group = { "global" }; static const OptionGroupDef global_group = { "global" };
const OptionGroupDef *g = groups;
int i; int i;
memset(octx, 0, sizeof(*octx)); memset(octx, 0, sizeof(*octx));
while (g->name) octx->nb_groups = nb_groups;
g++;
octx->nb_groups = g - groups;
octx->groups = av_mallocz(sizeof(*octx->groups) * octx->nb_groups); octx->groups = av_mallocz(sizeof(*octx->groups) * octx->nb_groups);
if (!octx->groups) if (!octx->groups)
exit(1); exit(1);
@ -557,14 +555,14 @@ void uninit_parse_context(OptionParseContext *octx)
int split_commandline(OptionParseContext *octx, int argc, char *argv[], int split_commandline(OptionParseContext *octx, int argc, char *argv[],
const OptionDef *options, const OptionDef *options,
const OptionGroupDef *groups) const OptionGroupDef *groups, int nb_groups)
{ {
int optindex = 1; int optindex = 1;
/* perform system-dependent conversions for arguments list */ /* perform system-dependent conversions for arguments list */
prepare_app_arguments(&argc, &argv); prepare_app_arguments(&argc, &argv);
init_parse_context(octx, groups); init_parse_context(octx, groups, nb_groups);
av_log(NULL, AV_LOG_DEBUG, "Splitting the commandline.\n"); av_log(NULL, AV_LOG_DEBUG, "Splitting the commandline.\n");
while (optindex < argc) { while (optindex < argc) {
@ -592,7 +590,7 @@ do { \
} while (0) } while (0)
/* named group separators, e.g. -i */ /* named group separators, e.g. -i */
if ((ret = match_group_separator(groups, opt)) >= 0) { if ((ret = match_group_separator(groups, nb_groups, opt)) >= 0) {
GET_ARG(arg); GET_ARG(arg);
finish_group(octx, ret, arg); finish_group(octx, ret, arg);
av_log(NULL, AV_LOG_DEBUG, " matched as %s with argument '%s'.\n", av_log(NULL, AV_LOG_DEBUG, " matched as %s with argument '%s'.\n",

2
cmdutils.h
View File

@ -286,7 +286,7 @@ int parse_optgroup(void *optctx, OptionGroup *g);
*/ */
int split_commandline(OptionParseContext *octx, int argc, char *argv[], int split_commandline(OptionParseContext *octx, int argc, char *argv[],
const OptionDef *options, const OptionDef *options,
const OptionGroupDef *groups); const OptionGroupDef *groups, int nb_groups);
/** /**
* Free all allocated memory in an OptionParseContext. * Free all allocated memory in an OptionParseContext.