From a4d9c8f579a4ba2b66f2f5b8b7bbd6be9c1d4cda Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 26 Jun 2014 15:46:42 +1000 Subject: Code cleanup: casts, dead assignment & arg order. --- source/blender/blenlib/intern/fileops.c | 2 +- source/blender/editors/curve/editcurve.c | 2 +- source/blender/editors/interface/interface.c | 2 +- source/blender/editors/interface/interface_style.c | 2 +- source/blender/editors/mesh/editmesh_rip.c | 2 -- source/blender/editors/object/object_select.c | 4 ++-- source/creator/creator.c | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 6f65847d7ad..0893c3e380f 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -312,7 +312,7 @@ static bool delete_recursive(const char *dir) i = nbr = BLI_dir_contents(dir, &filelist); fl = filelist; - while(i--) { + while (i--) { char file[8]; BLI_split_file_part(fl->path, file, sizeof(file)); if (STREQ(file, ".") || STREQ(file, "..")) { diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 6c3e477b398..7b78b255a55 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1042,7 +1042,7 @@ static void curve_rename_fcurves(Curve *cu, ListBase *orig_curves) { int nu_index = 0, a, pt_index; EditNurb *editnurb = cu->editnurb; - Nurb *nu = editnurb->nurbs.first; + Nurb *nu; CVKeyIndex *keyIndex; char rna_path[64], orig_rna_path[64]; AnimData *adt = BKE_animdata_from_id(&cu->id); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 98e4fa2505f..c857150782e 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1991,7 +1991,7 @@ void ui_get_but_string_ex(uiBut *but, char *str, const size_t maxlen, const int } else if (buf && buf != str) { /* string was too long, we have to truncate */ - memcpy(str, buf, MIN2(maxlen, (size_t)buf_len + 1)); + memcpy(str, buf, MIN2(maxlen, (size_t)(buf_len + 1))); MEM_freeN((void *)buf); } } diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index e04f13bd458..c27789c0fc9 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -330,7 +330,7 @@ void UI_DrawString(float x, float y, const char *str) /* reading without uifont will create one */ void uiStyleInit(void) { - uiFont *font = U.uifonts.first; + uiFont *font; uiStyle *style = U.uistyles.first; int monofont_size = datatoc_bmonofont_ttf_size; unsigned char *monofont_ttf = (unsigned char *)datatoc_bmonofont_ttf; diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 58701e776b7..3d3e41d31cc 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -795,8 +795,6 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve BM_mesh_edgesplit(em->bm, true, true, true); } - dist_sq = FLT_MAX; - { /* --- select which vert --- */ BMVert *v_best = NULL; diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index d9166ab34e2..2e1e8a94871 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -776,7 +776,7 @@ static bool select_grouped_gameprops(bContext *C, Object *ob) return changed; } -static bool select_grouped_keyingset(bContext *C, ReportList *reports, Object *UNUSED(ob)) +static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList *reports) { KeyingSet *ks = ANIM_scene_get_active_keyingset(CTX_data_scene(C)); bool changed = false; @@ -867,7 +867,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op) else if (nr == 9) changed |= select_grouped_index_object(C, ob); else if (nr == 10) changed |= select_grouped_color(C, ob); else if (nr == 11) changed |= select_grouped_gameprops(C, ob); - else if (nr == 12) changed |= select_grouped_keyingset(C, op->reports, ob); + else if (nr == 12) changed |= select_grouped_keyingset(C, ob, op->reports); else if (nr == 13) changed |= select_similar_lamps(C, ob); else if (nr == 14) changed |= select_similar_pass_index(C, ob); diff --git a/source/creator/creator.c b/source/creator/creator.c index b42c5333d11..70e6aba8274 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -535,7 +535,7 @@ static void blender_crash_handler_backtrace(FILE *fp) SymInitialize(process, NULL, true); nframes = CaptureStackBackTrace(0, SIZE, stack, NULL); - symbolinfo = MEM_callocN(sizeof(SYMBOL_INFO) + MAXSYMBOL * sizeof( char ), "crash Symbol table"); + symbolinfo = MEM_callocN(sizeof(SYMBOL_INFO) + MAXSYMBOL * sizeof(char), "crash Symbol table"); symbolinfo->MaxNameLen = MAXSYMBOL - 1; symbolinfo->SizeOfStruct = sizeof(SYMBOL_INFO); -- cgit v1.2.3