diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:12:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:12:49 +0400 |
commit | 78d69a1e1598f9967738c6d2f3195e2540d274d0 (patch) | |
tree | 0e5e84792b1d00293054920683135ad4da07deef /source/blender | |
parent | 41721e11fbf73812297b6945d0d6683eda400ba0 (diff) |
code cleanup: replace strcpy with BLI_strncpy for fixed size strings, and correct some harmless but incorrect sizeof() use
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sketch.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_wireframe.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index b8d851d082a..ef1235c2b64 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2080,6 +2080,8 @@ static void actcon_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstraintT axis = data->type - 20; } + BLI_assert((unsigned int)axis < 3); + /* Target defines the animation */ s = (vec[axis] - data->min) / (data->max - data->min); CLAMP(s, 0, 1); diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c index 707d97a1cf1..bbd637a0a77 100644 --- a/source/blender/blenkernel/intern/sketch.c +++ b/source/blender/blenkernel/intern/sketch.c @@ -487,7 +487,7 @@ void sk_endContinuousStroke(SK_Stroke *stk) void sk_updateNextPoint(SK_Sketch *sketch, SK_Stroke *stk) { if (stk) { - memcpy(&sketch->next_point, stk->points[stk->nb_points - 1].p, sizeof(SK_Point)); + memcpy(&(sketch->next_point), &(stk->points[stk->nb_points - 1]), sizeof(SK_Point)); } } diff --git a/source/blender/bmesh/operators/bmo_wireframe.c b/source/blender/bmesh/operators/bmo_wireframe.c index cb2dc4b89f6..c07e2c3bbf2 100644 --- a/source/blender/bmesh/operators/bmo_wireframe.c +++ b/source/blender/bmesh/operators/bmo_wireframe.c @@ -177,7 +177,7 @@ void bmo_wireframe_exec(BMesh *bm, BMOperator *op) /* will over-alloc, but makes for easy lookups by index to keep aligned */ BMVert **verts_boundary = use_boundary ? - MEM_mallocN(sizeof(BMVert **) * totvert_orig, __func__) : NULL; + MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__) : NULL; float *verts_relfac = use_relative_offset ? MEM_mallocN(sizeof(float) * totvert_orig, __func__) : NULL; diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index dc780d6a4f1..1ef4d43c9f3 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1953,7 +1953,7 @@ void init_userdef_do_versions(void) if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 4)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { - if (btheme->tseq.movieclip[0] == 0) { + if (btheme->tseq.movieclip[3] == 0) { rgba_char_args_set(btheme->tseq.movieclip, 32, 32, 143, 255); } } @@ -2002,7 +2002,7 @@ void init_userdef_do_versions(void) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 11)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { - if (btheme->tseq.movieclip[0] == 0) { + if (btheme->tseq.mask[3] == 0) { rgba_char_args_set(btheme->tseq.mask, 152, 78, 62, 255); } } diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 238e68b141c..0167eaccef0 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -2787,9 +2787,9 @@ static void update_glsl_display_processor(const ColorManagedViewSettings *view_s check_glsl_display_processor_changed(view_settings, display_settings, from_colorspace)) { /* Store settings of processor for further comparison. */ - strcpy(global_glsl_state.view, view_settings->view_transform); - strcpy(global_glsl_state.display, display_settings->display_device); - strcpy(global_glsl_state.input, from_colorspace); + BLI_strncpy(global_glsl_state.view, view_settings->view_transform, MAX_COLORSPACE_NAME); + BLI_strncpy(global_glsl_state.display, display_settings->display_device, MAX_COLORSPACE_NAME); + BLI_strncpy(global_glsl_state.input, from_colorspace, MAX_COLORSPACE_NAME); global_glsl_state.exposure = view_settings->exposure; global_glsl_state.gamma = view_settings->gamma; diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index df0a0266154..56571f69e09 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -411,7 +411,7 @@ static Frame **collect_hull_frames(int v, SkinNode *frames, int nbr, i; (*tothullframe) = emap[v].count; - hull_frames = MEM_callocN(sizeof(Frame * *) * (*tothullframe), + hull_frames = MEM_callocN(sizeof(Frame *) * (*tothullframe), "hull_from_frames.hull_frames"); i = 0; for (nbr = 0; nbr < emap[v].count; nbr++) { |