Mercurial > libavutil.hg
diff eval.c @ 945:4059de4c9f90 libavutil
Improve av_parse_eval() error reporting.
author | stefano |
---|---|
date | Wed, 16 Jun 2010 18:27:46 +0000 |
parents | be49bac1a894 |
children | f05ed9190133 |
line wrap: on
line diff
--- a/eval.c Wed Jun 16 10:35:56 2010 +0000 +++ b/eval.c Wed Jun 16 18:27:46 2010 +0000 @@ -182,7 +182,7 @@ static int parse_primary(AVExpr **e, Parser *p) { AVExpr *d = av_mallocz(sizeof(AVExpr)); - char *next= p->s; + char *next = p->s, *s0 = p->s; int ret, i; if (!d) @@ -211,7 +211,7 @@ p->s= strchr(p->s, '('); if (p->s==NULL) { - av_log(p, AV_LOG_ERROR, "undefined constant or missing (\n"); + av_log(p, AV_LOG_ERROR, "Undefined constant or missing '(' in '%s'\n", s0); p->s= next; av_free_expr(d); return AVERROR(EINVAL); @@ -222,7 +222,7 @@ if ((ret = parse_expr(&d, p)) < 0) return ret; if (p->s[0] != ')') { - av_log(p, AV_LOG_ERROR, "missing )\n"); + av_log(p, AV_LOG_ERROR, "Missing ')' in '%s'\n", s0); av_free_expr(d); return AVERROR(EINVAL); } @@ -239,7 +239,7 @@ parse_expr(&d->param[1], p); } if (p->s[0] != ')') { - av_log(p, AV_LOG_ERROR, "missing )\n"); + av_log(p, AV_LOG_ERROR, "Missing ')' or too many args in '%s'\n", s0); av_free_expr(d); return AVERROR(EINVAL); } @@ -290,7 +290,7 @@ } } - av_log(p, AV_LOG_ERROR, "unknown function\n"); + av_log(p, AV_LOG_ERROR, "Unknown function in '%s'\n", s0); av_free_expr(d); return AVERROR(EINVAL); }