Mercurial > libavcodec.hg

changeset 11615:17ce5438a9c9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author stefano
date Mon, 12 Apr 2010 19:21:19 +0000
parents ab7aceed5286
children 1461e6044153
files eval.c eval.h
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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);
 
 /**