Commit 82fdcd44 authored by Stefano Sabatini's avatar Stefano Sabatini

Change constness for func[12]_name parameters of ff_parse_expr() and

ff_parse_and_eval_expr().

Change attribute from "const char **" to "const char * const *".
The name arrays are not supposed to be changed by the function.

Originally committed as revision 22859 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1235429c
...@@ -35,9 +35,9 @@ typedef struct Parser{ ...@@ -35,9 +35,9 @@ typedef struct Parser{
const double *const_value; const double *const_value;
const char * const *const_name; // NULL terminated const char * const *const_name; // NULL terminated
double (**func1)(void *, double a); // NULL terminated double (**func1)(void *, double a); // NULL terminated
const char **func1_name; // NULL terminated const char * const *func1_name; // NULL terminated
double (**func2)(void *, double a, double b); // NULL terminated double (**func2)(void *, double a, double b); // NULL terminated
const char **func2_name; // NULL terminated const char * const *func2_name; // NULL terminated
void *opaque; void *opaque;
const char **error; const char **error;
#define VARS 10 #define VARS 10
...@@ -370,8 +370,8 @@ static int verify_expr(AVExpr * e) { ...@@ -370,8 +370,8 @@ static int verify_expr(AVExpr * e) {
} }
AVExpr *ff_parse_expr(const char *s, const char * const *const_name, AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char * const *func2_name,
const char **error){ const char **error){
Parser p; Parser p;
AVExpr *e = NULL; AVExpr *e = NULL;
...@@ -413,8 +413,8 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) { ...@@ -413,8 +413,8 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) {
} }
double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char * const *func2_name,
void *opaque, const char **error){ void *opaque, const char **error){
AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error); AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error);
double d; double d;
......
...@@ -44,8 +44,8 @@ typedef struct AVExpr AVExpr; ...@@ -44,8 +44,8 @@ typedef struct AVExpr AVExpr;
* @return the value of the expression * @return the value of the expression
*/ */
double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char * const *func2_name,
void *opaque, const char **error); void *opaque, const char **error);
/** /**
...@@ -62,8 +62,8 @@ double ff_parse_and_eval_expr(const char *s, const double *const_value, const ch ...@@ -62,8 +62,8 @@ double ff_parse_and_eval_expr(const char *s, const double *const_value, const ch
* NULL if anything went wrong * NULL if anything went wrong
*/ */
AVExpr *ff_parse_expr(const char *s, const char * const *const_name, AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char * const *func2_name,
const char **error); const char **error);
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment