From 925c5010e8d5a132d4f64622602fddef1344211e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Jul 2013 11:42:07 +0000 Subject: fix for checking char arrays against NULL, instead check their first character. also remove some dead code (return directly after return). --- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenlib/intern/fileops.c | 2 +- source/blender/editors/include/ED_armature.h | 2 +- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/render/render_internal.c | 5 +++-- source/blender/editors/space_clip/tracking_ops.c | 3 --- source/blender/editors/space_outliner/outliner_select.c | 2 +- source/blender/editors/space_outliner/outliner_tree.c | 4 ++-- source/blender/editors/space_sequencer/sequencer_edit.c | 1 + source/blender/editors/space_view3d/view3d_draw.c | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 9fa4cc2ae40..b2c0a45cbc4 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2102,7 +2102,7 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd /* sample subframes */ else { int scene_frame = scene->r.cfra; - float scene_subframe = scene->r.subframe; + // float scene_subframe = scene->r.subframe; // UNUSED int subframe; for (subframe = 0; subframe <= subframes; subframe++) { EmissionMap em_temp = {0}; diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 26fe0f21cd5..26b9e08c7f6 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -199,7 +199,7 @@ bool BLI_file_touch(const char *file) { FILE *f = BLI_fopen(file, "r+b"); if (f != NULL) { - char c = getc(f); + int c = getc(f); rewind(f); putc(c, f); } diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 32436ebae2d..9b9a4c154db 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -155,7 +155,7 @@ void undo_push_armature(struct bContext *C, const char *name); /* low level selection functions which handle */ int ED_armature_ebone_selectflag_get(const EditBone *ebone); -void ED_armature_ebone_selectflag_set(EditBone *ebone, const int flag); +void ED_armature_ebone_selectflag_set(EditBone *ebone, int flag); void ED_armature_ebone_select_set(EditBone *ebone, bool select); void ED_armature_ebone_selectflag_enable(EditBone *ebone, int flag); void ED_armature_ebone_selectflag_disable(EditBone *ebone, int flag); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f563451f641..5b100d7b6c2 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -226,7 +226,7 @@ float ED_object_new_primitive_matrix(bContext *C, Object *obedit, return dia; } - return 1.0f; + // return 1.0f; } /********************* Add Object Operator ********************/ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index b9653da47e6..51bf1379605 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -831,9 +831,10 @@ static void render_view3d_renderinfo_cb(void *rjp, RenderStats *rs) RenderPreview *rp = rjp; /* during render, rv3d->engine can get freed */ - if (rp->rv3d->render_engine == NULL) + if (rp->rv3d->render_engine == NULL) { *rp->stop = 1; - else if (rp->engine->text) { + } + else if (rp->engine->text[0]) { make_renderinfo_string(rs, rp->scene, false, rp->engine->text); /* make jobs timer to send notifier */ diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 49b16a68dfc..7899f9faf90 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -420,7 +420,6 @@ static int mouse_on_slide_zone(SpaceClip *sc, MovieTrackingMarker *marker, float padding, int width, int height) { const float size = 12.0f; - int inside = 0; float min[2], max[2]; float dx, dy; @@ -445,8 +444,6 @@ static int mouse_on_slide_zone(SpaceClip *sc, MovieTrackingMarker *marker, return IN_RANGE_INCL(co[0], slide_zone[0] - dx, slide_zone[0] + dx) && IN_RANGE_INCL(co[1], slide_zone[1] - dy, slide_zone[1] + dy); - - return inside; } static int mouse_on_corner(SpaceClip *sc, MovieTrackingMarker *marker, diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 3f06db22f59..9720d981e85 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -704,7 +704,7 @@ static int tree_element_active_sequence_dup(Scene *scene, TreeElement *te, TreeS // XXX select_single_seq(seq, 1); p = ed->seqbasep->first; while (p) { - if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) { + if ((!p->strip) || (!p->strip->stripdata) || (p->strip->stripdata->name[0] == '\0')) { p = p->next; continue; } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index b5c74eea30e..08d32defd98 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -957,7 +957,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i else if (type == TSE_SEQ_STRIP) { Strip *strip = (Strip *)idv; - if (strip->dir) + if (strip->dir[0] != '\0') te->name = strip->dir; else te->name = IFACE_("Strip None"); @@ -1171,7 +1171,7 @@ static void outliner_add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *t p = seq; while (p) { - if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) { + if ((!p->strip) || (!p->strip->stripdata) || (p->strip->stripdata->name[0] == '\0')) { p = p->next; continue; } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index ff7220ea22d..a4dea4e25b1 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -551,6 +551,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen } if (seq1 == NULL) seq1 = seq2; if (seq3 == NULL) seq3 = seq2; + /* fall-through */ case 2: if (seq1 == NULL || seq2 == NULL) { *error_str = N_("2 selected sequence strips are needed"); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 0a2358aa137..61532e75ee9 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3033,7 +3033,7 @@ static void view3d_main_area_draw_engine_info(View3D *v3d, RegionView3D *rv3d, A { float fill_color[4] = {0.0f, 0.0f, 0.0f, 0.25f}; - if (!rv3d->render_engine || !rv3d->render_engine->text) + if (!rv3d->render_engine || !rv3d->render_engine->text[0]) return; if (render_border) { -- cgit v1.2.3