diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 15 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 8 |
3 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 39cd537ce00..903c769877f 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -199,7 +199,7 @@ static void rna_sortlist(ListBase *listbase, int(*cmp)(const void*, const void*) static void rna_print_c_string(FILE *f, const char *str) { - static char *escape[] = {"\''", "\"\"", "\??", "\\\\","\aa", "\bb", "\ff", "\nn", "\rr", "\tt", "\vv", NULL}; + static const char *escape[] = {"\''", "\"\"", "\??", "\\\\","\aa", "\bb", "\ff", "\nn", "\rr", "\tt", "\vv", NULL}; int i, j; if(!str) { @@ -1402,7 +1402,8 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA FunctionRNA *func; PropertyDefRNA *dparm; PropertyType type; - char *funcname, *ptrstr, *valstr; + const char *funcname, *valstr; + const char *ptrstr; int flag, pout, cptr, first; srna= dsrna->srna; @@ -1483,7 +1484,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA if(dparm->prop==func->c_ret) fprintf(f, "\t_retdata= _data;\n"); else { - char *data_str; + const char *data_str; if (cptr || (flag & PROP_DYNAMIC)) { ptrstr= "**"; valstr= "*"; @@ -1808,7 +1809,7 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA StructDefRNA *dsrna; PropertyType type; int flag, pout, cptr, first; - char *ptrstr; + const char *ptrstr; dsrna= rna_find_struct_def(srna); func= dfunc->func; @@ -2254,8 +2255,8 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f) } typedef struct RNAProcessItem { - char *filename; - char *api_filename; + const char *filename; + const char *api_filename; void (*define)(BlenderRNA *brna); } RNAProcessItem; @@ -2317,7 +2318,7 @@ RNAProcessItem PROCESS_ITEMS[]= { {"rna_world.c", NULL, RNA_def_world}, {NULL, NULL}}; -static void rna_generate(BlenderRNA *brna, FILE *f, char *filename, char *api_filename) +static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const char *api_filename) { StructDefRNA *ds; PropertyDefRNA *dp; diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 83d40a3802b..0af8828be01 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -98,7 +98,7 @@ EnumPropertyItem brush_imagepaint_tool_items[] = { #include "WM_api.h" -static void rna_Brush_reset_icon(Brush *br, char *type) +static void rna_Brush_reset_icon(Brush *br, const char *UNUSED(type)) { ID *id = &br->id; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index c44b55764b6..214a79dbd34 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -264,8 +264,8 @@ static ContainerDefRNA *rna_find_container_def(ContainerRNA *cont) /* DNA utility function for looking up members */ typedef struct DNAStructMember { - char *type; - char *name; + const char *type; + const char *name; int arraylength; int pointerlevel; } DNAStructMember; @@ -295,7 +295,7 @@ static int rna_member_cmp(const char *name, const char *oname) static int rna_find_sdna_member(SDNA *sdna, const char *structname, const char *membername, DNAStructMember *smember) { - char *dnaname; + const char *dnaname; short *sp; int a, b, structnr, totmember, cmp; @@ -359,7 +359,7 @@ static int rna_validate_identifier(const char *identifier, char *error, int prop int a=0; /* list from http://docs.python.org/reference/lexical_analysis.html#id5 */ - static char *kwlist[] = { + static const char *kwlist[] = { "and", "as", "assert", "break", "class", "continue", "def", "del", "elif", "else", "except", "exec", |