# HG changeset patch # User stefano # Date 1271100079 0 # Node ID 17ce5438a9c95b27cfce109ea2bcfe61462a1b97 # Parent ab7aceed5286eb61135fff298e258e2996dde362 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. diff -r ab7aceed5286 -r 17ce5438a9c9 eval.c --- a/eval.c Mon Apr 12 19:21:15 2010 +0000 +++ b/eval.c Mon Apr 12 19:21:19 2010 +0000 @@ -35,9 +35,9 @@ const double *const_value; const char * const *const_name; // 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 - const char **func2_name; // NULL terminated + const char * const *func2_name; // NULL terminated void *opaque; const char **error; #define VARS 10 @@ -370,8 +370,8 @@ } AVExpr *ff_parse_expr(const char *s, const char * const *const_name, - double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), const char **func2_name, + double (**func1)(void *, double), const char * const *func1_name, + double (**func2)(void *, double, double), const char * const *func2_name, const char **error){ Parser p; AVExpr *e = NULL; @@ -413,8 +413,8 @@ } 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 (**func2)(void *, double, double), const char **func2_name, + double (**func1)(void *, double), const char * const *func1_name, + double (**func2)(void *, double, double), const char * const *func2_name, void *opaque, const char **error){ AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error); double d; diff -r ab7aceed5286 -r 17ce5438a9c9 eval.h --- a/eval.h Mon Apr 12 19:21:15 2010 +0000 +++ b/eval.h Mon Apr 12 19:21:19 2010 +0000 @@ -44,8 +44,8 @@ * @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 (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), const char **func2_name, + double (**func1)(void *, double), const char * const *func1_name, + double (**func2)(void *, double, double), const char * const *func2_name, void *opaque, const char **error); /** @@ -62,8 +62,8 @@ * NULL if anything went wrong */ AVExpr *ff_parse_expr(const char *s, const char * const *const_name, - double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), const char **func2_name, + double (**func1)(void *, double), const char * const *func1_name, + double (**func2)(void *, double, double), const char * const *func2_name, const char **error); /**