diff options
author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-09-30 12:51:26 +0300 |
---|---|---|
committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-09-30 12:51:26 +0300 |
commit | 09e6d4c4d4a5cfd2dbcfe3651450568c1a8b8af3 (patch) | |
tree | 56373f0b5fd2e9eff3b96b54d2b0812c2bd1266b | |
parent | d798e853e78b76791df0e993dc76b6250daae9de (diff) | |
download | xine-lib-09e6d4c4d4a5cfd2dbcfe3651450568c1a8b8af3.tar.gz xine-lib-09e6d4c4d4a5cfd2dbcfe3651450568c1a8b8af3.tar.bz2 |
goom: add const to eliminate warnings
-rw-r--r-- | src/post/goom/config_param.c | 14 | ||||
-rw-r--r-- | src/post/goom/goom_config_param.h | 20 | ||||
-rw-r--r-- | src/post/goom/goomsl.c | 2 | ||||
-rw-r--r-- | src/post/goom/goomsl_lex.c | 2 | ||||
-rw-r--r-- | src/post/goom/goomsl_private.h | 2 | ||||
-rw-r--r-- | src/post/goom/goomsl_yacc.c | 10 |
6 files changed, 25 insertions, 25 deletions
diff --git a/src/post/goom/config_param.c b/src/post/goom/config_param.c index c6402834a..db3f7c8c9 100644 --- a/src/post/goom/config_param.c +++ b/src/post/goom/config_param.c @@ -26,7 +26,7 @@ PluginParam goom_secure_param() { return p; } -PluginParam goom_secure_f_param(char *name) { +PluginParam goom_secure_f_param(const char *name) { PluginParam p = secure_param(); p.name = name; p.type = PARAM_FLOATVAL; @@ -37,13 +37,13 @@ PluginParam goom_secure_f_param(char *name) { return p; } -PluginParam goom_secure_f_feedback(char *name) { +PluginParam goom_secure_f_feedback(const char *name) { PluginParam p = secure_f_param(name); p.rw = 0; return p; } -PluginParam goom_secure_s_param(char *name) { +PluginParam goom_secure_s_param(const char *name) { PluginParam p = secure_param(); p.name = name; p.type = PARAM_STRVAL; @@ -51,7 +51,7 @@ PluginParam goom_secure_s_param(char *name) { return p; } -PluginParam goom_secure_b_param(char *name, int value) { +PluginParam goom_secure_b_param(const char *name, int value) { PluginParam p = secure_param(); p.name = name; p.type = PARAM_BOOLVAL; @@ -59,7 +59,7 @@ PluginParam goom_secure_b_param(char *name, int value) { return p; } -PluginParam goom_secure_i_param(char *name) { +PluginParam goom_secure_i_param(const char *name) { PluginParam p = secure_param(); p.name = name; p.type = PARAM_INTVAL; @@ -70,7 +70,7 @@ PluginParam goom_secure_i_param(char *name) { return p; } -PluginParam goom_secure_i_feedback(char *name) { +PluginParam goom_secure_i_feedback(const char *name) { PluginParam p = secure_i_param(name); p.rw = 0; return p; @@ -78,7 +78,7 @@ PluginParam goom_secure_i_feedback(char *name) { PluginParameters goom_plugin_parameters(const char *name, int nb) { PluginParameters p; - p.name = (char *)name; + p.name = name; p.desc = ""; p.nbParams = nb; p.params = (PluginParam**)malloc(nb*sizeof(PluginParam*)); diff --git a/src/post/goom/goom_config_param.h b/src/post/goom/goom_config_param.h index 3c6838d30..82bc5e3ae 100644 --- a/src/post/goom/goom_config_param.h +++ b/src/post/goom/goom_config_param.h @@ -44,8 +44,8 @@ struct BoolVal { typedef struct _PARAM { - char *name; - char *desc; + const char *name; + const char *desc; char rw; ParamType type; union { @@ -81,20 +81,20 @@ typedef struct _PARAM { PluginParam goom_secure_param(void); -PluginParam goom_secure_f_param(char *name); -PluginParam goom_secure_i_param(char *name); -PluginParam goom_secure_b_param(char *name, int value); -PluginParam goom_secure_s_param(char *name); +PluginParam goom_secure_f_param(const char *name); +PluginParam goom_secure_i_param(const char *name); +PluginParam goom_secure_b_param(const char *name, int value); +PluginParam goom_secure_s_param(const char *name); -PluginParam goom_secure_f_feedback(char *name); -PluginParam goom_secure_i_feedback(char *name); +PluginParam goom_secure_f_feedback(const char *name); +PluginParam goom_secure_i_feedback(const char *name); void goom_set_str_param_value(PluginParam *p, const char *str); void goom_set_list_param_value(PluginParam *p, const char *str); typedef struct _PARAMETERS { - char *name; - char *desc; + const char *name; + const char *desc; int nbParams; PluginParam **params; } PluginParameters; diff --git a/src/post/goom/goomsl.c b/src/post/goom/goomsl.c index e978506d3..182da5401 100644 --- a/src/post/goom/goomsl.c +++ b/src/post/goom/goomsl.c @@ -133,7 +133,7 @@ void gsl_instr_set_namespace(Instruction *_this, GoomHash *ns) _this->vnamespace[_this->cur_param-1] = ns; } /* }}} */ -void gsl_instr_add_param(Instruction *instr, char *param, int type) +void gsl_instr_add_param(Instruction *instr, const char *param, int type) { /* {{{ */ int len; if (instr==NULL) diff --git a/src/post/goom/goomsl_lex.c b/src/post/goom/goomsl_lex.c index 988fb99da..7e8889cd5 100644 --- a/src/post/goom/goomsl_lex.c +++ b/src/post/goom/goomsl_lex.c @@ -626,7 +626,7 @@ char *yytext_ptr; #include "goomsl.h" #include "goomsl_private.h" #include "goomsl_yacc.h" -void yyerror(char *); +void yyerror(const char *); void yyparse(void); GoomSL *currentGoomSL; diff --git a/src/post/goom/goomsl_private.h b/src/post/goom/goomsl_private.h index 8be151577..4b6beabba 100644 --- a/src/post/goom/goomsl_private.h +++ b/src/post/goom/goomsl_private.h @@ -196,7 +196,7 @@ struct _GoomSL { /* {{{ */ extern GoomSL *currentGoomSL; Instruction *gsl_instr_init(GoomSL *parent, const char *name, int id, int nb_param, int line_number); -void gsl_instr_add_param(Instruction *_this, char *param, int type); +void gsl_instr_add_param(Instruction *_this, const char *param, int type); void gsl_instr_set_namespace(Instruction *_this, GoomHash *ns); void gsl_declare_task(const char *name); diff --git a/src/post/goom/goomsl_yacc.c b/src/post/goom/goomsl_yacc.c index cfe80b27c..a83c9f218 100644 --- a/src/post/goom/goomsl_yacc.c +++ b/src/post/goom/goomsl_yacc.c @@ -115,7 +115,7 @@ /* #define VERBOSE */ int yylex(void); - void yyerror(char *); + void yyerror(const char *); extern GoomSL *currentGoomSL; static NodeType *nodeNew(const char *str, int type, int line_number); @@ -173,7 +173,7 @@ gsl_instr_add_param(currentGoomSL->instr, name, TYPE_LABEL); } /* }}} */ - static void GSL_PUT_JXXX(char *name, char *iname, int instr_id, int line_number) + static void GSL_PUT_JXXX(const char *name, const char *iname, int instr_id, int line_number) { /* {{{ */ #ifdef VERBOSE printf("%s %s\n", iname, name); @@ -181,11 +181,11 @@ currentGoomSL->instr = gsl_instr_init(currentGoomSL, iname, instr_id, 1, line_number); gsl_instr_add_param(currentGoomSL->instr, name, TYPE_LABEL); } /* }}} */ - static void GSL_PUT_JZERO(char *name,int line_number) + static void GSL_PUT_JZERO(const char *name,int line_number) { /* {{{ */ GSL_PUT_JXXX(name,"jzero.i",INSTR_JZERO,line_number); } /* }}} */ - static void GSL_PUT_JNZERO(char *name, int line_number) + static void GSL_PUT_JNZERO(const char *name, int line_number) { /* {{{ */ GSL_PUT_JXXX(name,"jnzero.i",INSTR_JNZERO,line_number); } /* }}} */ @@ -2986,7 +2986,7 @@ yyreturn: -void yyerror(char *str) +void yyerror(const char *str) { /* {{{ */ fprintf(stderr, "ERROR: Line %d, %s\n", currentGoomSL->num_lines, str); currentGoomSL->compilationOK = 0; |