[Bf-blender-cvs] [a91247c] master: Code cleanup: unreachable break/return
Campbell Barton
noreply at git.blender.org
Wed Mar 19 02:47:41 CET 2014
Commit: a91247c2b4702cbdd423fb5526c2f5a8d04c65d8
Author: Campbell Barton
Date: Wed Mar 19 12:46:33 2014 +1100
https://developer.blender.org/rBa91247c2b4702cbdd423fb5526c2f5a8d04c65d8
Code cleanup: unreachable break/return
===================================================================
M source/blender/avi/intern/avi_codecs.c
M source/blender/avi/intern/avi_options.c
M source/blender/blenkernel/intern/mask_evaluate.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/cpu.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_nla/nla_select.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/freestyle/intern/python/BPy_Id.cpp
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/indexer.c
M source/blender/python/intern/bpy_rna.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/avi/intern/avi_codecs.c
index e438260..c14d088 100644
--- a/source/blender/avi/intern/avi_codecs.c
+++ b/source/blender/avi/intern/avi_codecs.c
@@ -106,10 +106,8 @@ int avi_get_format_type(AviFormat format)
case AVI_FORMAT_AVI_RGB:
case AVI_FORMAT_MJPEG:
return FCC("vids");
- break;
default:
return 0;
- break;
}
}
@@ -120,13 +118,10 @@ int avi_get_format_fcc(AviFormat format)
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
return FCC("DIB ");
- break;
case AVI_FORMAT_MJPEG:
return FCC("MJPG");
- break;
default:
return 0;
- break;
}
}
@@ -137,12 +132,9 @@ int avi_get_format_compression(AviFormat format)
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
return 0;
- break;
case AVI_FORMAT_MJPEG:
return FCC("MJPG");
- break;
default:
return 0;
- break;
}
}
diff --git a/source/blender/avi/intern/avi_options.c b/source/blender/avi/intern/avi_options.c
index c552cbe..47c1883 100644
--- a/source/blender/avi/intern/avi_options.c
+++ b/source/blender/avi/intern/avi_options.c
@@ -125,7 +125,6 @@ AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, A
break;
default:
return AVI_ERROR_OPTION;
- break;
}
return AVI_ERROR_NONE;
diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c
index 4d9791a..33e7458 100644
--- a/source/blender/blenkernel/intern/mask_evaluate.c
+++ b/source/blender/blenkernel/intern/mask_evaluate.c
@@ -718,11 +718,9 @@ float (*BKE_mask_spline_feather_differentiated_points_with_resolution(
switch (spline->offset_mode) {
case MASK_SPLINE_OFFSET_EVEN:
return mask_spline_feather_differentiated_points_with_resolution__even(spline, tot_feather_point, resol, do_feather_isect);
- break;
case MASK_SPLINE_OFFSET_SMOOTH:
default:
return mask_spline_feather_differentiated_points_with_resolution__double(spline, tot_feather_point, resol, do_feather_isect);
- break;
}
}
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 5f63313..0dd62ae 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -507,13 +507,10 @@ Material ***give_matarar_id(ID *id)
switch (GS(id->name)) {
case ID_ME:
return &(((Mesh *)id)->mat);
- break;
case ID_CU:
return &(((Curve *)id)->mat);
- break;
case ID_MB:
return &(((MetaBall *)id)->mat);
- break;
}
return NULL;
}
@@ -526,13 +523,10 @@ short *give_totcolp_id(ID *id)
switch (GS(id->name)) {
case ID_ME:
return &(((Mesh *)id)->totcol);
- break;
case ID_CU:
return &(((Curve *)id)->totcol);
- break;
case ID_MB:
return &(((MetaBall *)id)->totcol);
- break;
}
return NULL;
}
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 41c5707..7ea0834 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -127,10 +127,12 @@ MINLINE axis_t min_axis(axis_t a, axis_t b)
{
return (a < b) ? a : b;
}
+#if 0
MINLINE axis_t max_axis(axis_t a, axis_t b)
{
return (b < a) ? a : b;
}
+#endif
#if 0
diff --git a/source/blender/blenlib/intern/cpu.c b/source/blender/blenlib/intern/cpu.c
index d942ffd..784b190 100644
--- a/source/blender/blenlib/intern/cpu.c
+++ b/source/blender/blenlib/intern/cpu.c
@@ -52,8 +52,8 @@ int BLI_cpu_support_sse2(void)
mov d, edx
}
return (d & 0x04000000) != 0;
-#endif
-
+#else
return 0;
+#endif
}
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 00a9ff2..3f81bb3 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -3049,7 +3049,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0;
else
return ((*val) & flag) != 0;
- break;
}
case sizeof(short): /* short pointer for setting */
{
@@ -3059,7 +3058,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0;
else
return ((*val) & flag) != 0;
- break;
}
case sizeof(char): /* char pointer for setting */
{
@@ -3069,7 +3067,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0;
else
return ((*val) & flag) != 0;
- break;
}
}
}
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 8ffc319..069f661 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -2026,8 +2026,6 @@ short id_frame_has_keyframe(ID *id, float frame, short filter)
switch (GS(id->name)) {
case ID_OB: /* object */
return object_frame_has_keyframe((Object *)id, frame, filter);
- break;
-
#if 0
// XXX TODO... for now, just use 'normal' behavior
case ID_SCE: /* scene */
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 9087643..cffd38b 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -2861,7 +2861,6 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
ED_region_tag_redraw(kcd->ar);
return OPERATOR_PASS_THROUGH;
- break;
}
}
else { /* non-modal-mapped events */
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index a6e4f50..373c4ef 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -176,11 +176,10 @@ static bool edgetag_test_cb(BMEdge *e, void *user_data_v)
return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? true : false;
#ifdef WITH_FREESTYLE
case EDGE_MODE_TAG_FREESTYLE:
- {
- FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
- return (!fed) ? FALSE : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false;
- }
- break;
+ {
+ FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
+ return (!fed) ? FALSE : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false;
+ }
#endif
}
return 0;
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 0a4bbf1..1f022c9 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -765,7 +765,6 @@ static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const
switch (event->type) {
case ESCKEY:
return OPERATOR_RUNNING_MODAL;
- break;
}
return OPERATOR_PASS_THROUGH;
}
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index eae15e7..9531c77 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -744,7 +744,6 @@ static int screen_render_modal(bContext *C, wmOperator *op, const wmEvent *event
switch (event->type) {
case ESCKEY:
return OPERATOR_RUNNING_MODAL;
- break;
}
return OPERATOR_PASS_THROUGH;
}
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index bb6c50d..14cd7de 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -1378,7 +1378,6 @@ static int clip_prefetch_modal(bContext *C, wmOperator *UNUSED(op), const wmEven
switch (event->type) {
case ESCKEY:
return OPERATOR_RUNNING_MODAL;
- break;
}
return OPERATOR_PASS_THROUGH;
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 85e420f..708c597 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -191,7 +191,6 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const
switch (event->type) {
case MOUSEMOVE:
return OPERATOR_RUNNING_MODAL;
- break;
case LEFTMOUSE:
ED_area_headerprint(CTX_wm_area(C), NULL);
@@ -206,7 +205,6 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const
WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
return OPERATOR_FINISHED;
- break;
case ESCKEY:
ED_area_headerprint(CTX_wm_area(C), NULL);
@@ -1497,7 +1495,6 @@ static int track_markers_modal(bContext *C, wmOperator *UNUSED(op), const wmEven
switch (event->type) {
case ESCKEY:
return OPERATOR_RUNNING_MODAL;
- break;
}
return OPERATOR_PASS_THROUGH;
@@ -1765,7 +1762,6 @@ static int solve_camera_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent
switch (event->type) {
case ESCKEY:
return OPERATOR_RUNNING_MODAL;
- break;
}
return OPERATOR_PASS_THROUGH;
diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c
index f723696..2bd2b66 100644
--- a/source/blender/editors/space_nla/nla_select.c
+++ b/source/blender/editors/space_nla/nla_select.c
@@ -67,16 +67,13 @@ static short selmodes_to_flagmodes(short sel)
switch (sel) {
case SELECT_SUBTRACT:
return ACHANNEL_SETFLAG_CLEAR;
- break;
-
+
case SELECT_INVERT:
return ACHANNEL_SETFLAG_INVERT;
- break;
-
+
case SELECT_ADD:
default:
return ACHANNEL_SETFLAG_ADD;
- break;
}
}
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 0182e7a..0279ee0 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -229,7 +229,6 @@ static TransformOrientation *createMeshSpace(bContext *C, ReportList *reports,
break;
default:
return NULL;
- break;
}
return addMa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list