[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58465] trunk/blender/source: code cleanup : add break statements in switch ()'s, (even at the last case).
Campbell Barton
ideasman42 at gmail.com
Sun Jul 21 10:16:37 CEST 2013
Revision: 58465
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58465
Author: campbellbarton
Date: 2013-07-21 08:16:37 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
code cleanup: add break statements in switch ()'s, (even at the last case).
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi_options.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/editmesh.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenkernel/intern/rigidbody.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/string.c
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/operators/bmo_similar.c
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/mask/mask_ops.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_info/space_info.c
trunk/blender/source/blender/editors/space_nla/nla_channels.c
trunk/blender/source/blender/editors/space_nla/nla_draw.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/space_text.c
trunk/blender/source/blender/editors/space_text/text_autocomplete.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/util/numinput.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
trunk/blender/source/blender/imbuf/intern/colormanagement.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_rna_array.c
trunk/blender/source/blender/python/mathutils/mathutils_Color.c
trunk/blender/source/blender/python/mathutils/mathutils_Euler.c
trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
Modified: trunk/blender/source/blender/avi/intern/avi_options.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi_options.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/avi/intern/avi_options.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -112,7 +112,7 @@
awrite(movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
-
+ break;
}
fseek(movie->fp, movie->offset_table[0], SEEK_SET);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -1329,6 +1329,7 @@
mat3_to_compatible_eulO(pchan->eul, pchan->eul, pchan->rotmode, mat);
else
mat3_to_eulO(pchan->eul, pchan->rotmode, mat);
+ break;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -2173,6 +2173,7 @@
break;
default: /* CU_TWIST_Z_UP default, pre 2.49c */
make_bevel_list_3D_zup(bl);
+ break;
}
if (bl->poly == -1) /* check its not cyclic */
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -2391,6 +2391,7 @@
BLI_assert(!"invalid type given");
iter_type = BM_VERTS_OF_MESH;
totelem = bm->totvert;
+ break;
}
dest->pool = NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/editmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -373,5 +373,6 @@
break;
default:
BLI_assert(0);
+ break;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -1764,6 +1764,7 @@
* This is currently used as the mechanism which allows animated settings to be able
* to be changed via the UI.
*/
+ break;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -343,6 +343,8 @@
}
default:
printf("Invalid Function-Generator for F-Modifier - %d\n", data->type);
+ break;
+
}
/* execute function callback to set value if appropriate */
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -445,6 +445,7 @@
IDP_FreeProperty(tmp);
MEM_freeN(tmp);
+ break;
}
}
}
@@ -709,9 +710,7 @@
if (prop1->len == prop2->len && prop1->subtype == prop2->subtype) {
return memcmp(IDP_Array(prop1), IDP_Array(prop2), idp_size_table[(int)prop1->subtype] * prop1->len);
}
- else {
- return 0;
- }
+ return 0;
case IDP_GROUP:
{
IDProperty *link1, *link2;
@@ -813,9 +812,7 @@
prop->len = prop->totallen = val->array.len;
break;
}
- else {
- return NULL;
- }
+ return NULL;
}
case IDP_STRING:
{
@@ -911,5 +908,6 @@
switch (prop->type) {
case IDP_ID:
IDP_UnlinkID(prop);
+ break;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -695,6 +695,7 @@
break;
default:
BKE_image_buf_fill_color(rect, rect_float, width, height, color);
+ break;
}
if (rect_float) {
@@ -1120,6 +1121,7 @@
case R_IMF_IMTYPE_QUICKTIME:
case R_IMF_IMTYPE_DPX:
chan_flag |= IMA_CHAN_FLAG_ALPHA;
+ break;
}
/* bw */
@@ -1131,6 +1133,7 @@
case R_IMF_IMTYPE_TIFF:
case R_IMF_IMTYPE_IRIS:
chan_flag |= IMA_CHAN_FLAG_BW;
+ break;
}
return chan_flag;
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -1057,6 +1057,7 @@
case 32: BKE_libblock_free(lb, id); break;
default:
BLI_assert(0);
+ break;
}
#endif
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -1614,6 +1614,7 @@
if (use_compat) mat3_to_compatible_eulO(ob->rot, ob->rot, ob->rotmode, tmat);
else mat3_to_eulO(ob->rot, ob->rotmode, tmat);
+ break;
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -85,6 +85,7 @@
break;
default:
oldseek = -1;
+ break;
}
if (seek < 0) {
seek = 0;
@@ -448,7 +449,8 @@
temp = local_name;
break;
}
- /* else fall through and create it */
+ /* else create it */
+ /* fall-through */
case PF_WRITE_LOCAL:
if (writePackedFile(reports, local_name, pf, 1) == RET_OK) {
temp = local_name;
@@ -461,7 +463,8 @@
temp = abs_name;
break;
}
- /* else fall through and create it */
+ /* else create it */
+ /* fall-through */
case PF_WRITE_ORIGINAL:
if (writePackedFile(reports, abs_name, pf, 1) == RET_OK) {
temp = abs_name;
Modified: trunk/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/paint.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/paint.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -139,8 +139,7 @@
case OB_MODE_EDIT:
if (ts->use_uv_sculpt)
return &ts->uvsculpt->paint;
- else
- return &ts->imapaint.paint;
+ return &ts->imapaint.paint;
}
}
@@ -187,8 +186,7 @@
case OB_MODE_EDIT:
if (ts->use_uv_sculpt)
return &ts->uvsculpt->paint;
- else
- return &ts->imapaint.paint;
+ return &ts->imapaint.paint;
default:
return &ts->imapaint.paint;
}
@@ -238,8 +236,7 @@
case OB_MODE_EDIT:
if (ts->use_uv_sculpt)
return PAINT_SCULPT_UV;
- else
- return PAINT_TEXTURE_2D;
+ return PAINT_TEXTURE_2D;
default:
return PAINT_TEXTURE_2D;
}
Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -602,7 +602,7 @@
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_LIN_Z, rbc->spring_damping_z);
RB_constraint_set_equilibrium_6dof_spring(rbc->physics_constraint);
- /* fall through */
+ /* fall-through */
case RBC_TYPE_6DOF:
if (rbc->type == RBC_TYPE_6DOF) /* a litte awkward but avoids duplicate code for limits */
rbc->physics_constraint = RB_constraint_new_6dof(loc, rot, rb1, rb2);
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -1607,6 +1607,7 @@
c_len = BLI_str_utf8_from_unicode(uc, c);
c[c_len] = '\0';
puts(c);
+ break;
}
}
}
@@ -1850,6 +1851,7 @@
/* should never happen */
BLI_assert(0);
unicode = 0;
+ break;
}
return unicode;
@@ -1925,6 +1927,7 @@
/* should never happen */
BLI_assert(0);
unicode = 0;
+ break;
}
return unicode;
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2013-07-21 08:14:59 UTC (rev 58464)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2013-07-21 08:16:37 UTC (rev 58465)
@@ -877,6 +877,7 @@
break;
case FFMPEG_MP3:
fmt->audio_codec = CODEC_ID_MP3;
+ /* fall-through */
case FFMPEG_WAV:
fmt->video_codec = CODEC_ID_NONE;
break;
Modified: trunk/blender/source/blender/blenlib/intern/math_color.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color.c 2013-07-21 08:14:59 UTC (rev 58464)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list