From 263830f0004481cd4921f03f4242d7c80794b08d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Dec 2010 17:05:21 +0000 Subject: Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into. --- source/blender/editors/space_sequencer/sequencer_add.c | 2 +- source/blender/editors/space_sequencer/sequencer_edit.c | 6 +++--- source/blender/editors/space_sequencer/sequencer_intern.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index bf11d131b9c..807672623cd 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -559,7 +559,7 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) int start_frame, end_frame, channel, type; /* operator props */ Sequence *seq1, *seq2, *seq3; - char *error_msg; + const char *error_msg; start_frame= RNA_int_get(op->ptr, "frame_start"); end_frame= RNA_int_get(op->ptr, "frame_end"); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 9cc98556cba..a5361ec676f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -71,7 +71,7 @@ static void error(const char *UNUSED(dummy)) {} static void waitcursor(int UNUSED(val)) {} -static void activate_fileselect(int UNUSED(d1), char *UNUSED(d2), char *UNUSED(d3), void *UNUSED(d4)) {} +static void activate_fileselect(int UNUSED(d1), const char *UNUSED(d2), const char *UNUSED(d3), void *UNUSED(d4)) {} static int pupmenu(const char *UNUSED(dummy)) {return 0;} static int okee(const char *UNUSED(dummy)) {return 0;} @@ -603,7 +603,7 @@ void change_sequence(Scene *scene) } -int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, char **error_str) +int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char **error_str) { Editing *ed = seq_give_editing(scene, FALSE); Sequence *seq1= 0, *seq2= 0, *seq3= 0, *seq; @@ -1441,7 +1441,7 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); Sequence *seq1, *seq2, *seq3, *last_seq = seq_active_get(scene); - char *error_msg; + const char *error_msg; if(!seq_effect_find_selected(scene, last_seq, last_seq->type, &seq1, &seq2, &seq3, &error_msg)) { BKE_report(op->reports, RPT_ERROR, error_msg); diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 116786c3009..87872d36c24 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -64,7 +64,7 @@ struct Sequence *find_neighboring_sequence(struct Scene *scene, struct Sequence void deselect_all_seq(struct Scene *scene); void recurs_sel_seq(struct Sequence *seqm); int event_to_efftype(int event); -int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3, char **error_str); +int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3, const char **error_str); struct Sequence *alloc_sequence(struct ListBase *lb, int cfra, int machine); /* operator helpers */ -- cgit v1.2.3