From fed6b2bcb75a0d67d1b1266fd13d9a4b89dd1923 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Sep 2012 07:31:17 +0000 Subject: code cleanup: remove paranoid/invalid NULL checks and also reduce some unneeded size_t -> int conversions. --- source/blender/blenfont/intern/blf_font.c | 4 ++-- source/blender/blenfont/intern/blf_internal.h | 4 ++-- source/blender/blenfont/intern/blf_lang.c | 4 ++-- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/text.c | 1 - source/blender/editors/armature/meshlaplacian.c | 2 +- source/blender/editors/armature/poseobject.c | 2 +- source/blender/editors/interface/view2d.c | 2 +- source/blender/gpu/intern/gpu_draw.c | 2 +- source/blender/imbuf/intern/IMB_metadata.h | 2 +- source/blender/imbuf/intern/metadata.c | 2 +- source/blender/makesdna/DNA_meshdata_types.h | 3 ++- 12 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index ab43804db8e..cb05c89921e 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -159,7 +159,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font) } \ } (void)0 -void blf_font_draw(FontBLF *font, const char *str, unsigned int len) +void blf_font_draw(FontBLF *font, const char *str, size_t len) { unsigned int c; GlyphBLF *g, *g_prev = NULL; @@ -191,7 +191,7 @@ void blf_font_draw(FontBLF *font, const char *str, unsigned int len) } /* faster version of blf_font_draw, ascii only for view dimensions */ -void blf_font_draw_ascii(FontBLF *font, const char *str, unsigned int len) +void blf_font_draw_ascii(FontBLF *font, const char *str, size_t len) { unsigned char c; GlyphBLF *g, *g_prev = NULL; diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h index ba66fce8374..65a54783978 100644 --- a/source/blender/blenfont/intern/blf_internal.h +++ b/source/blender/blenfont/intern/blf_internal.h @@ -51,8 +51,8 @@ struct FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem void blf_font_attach_from_mem(struct FontBLF *font, const unsigned char *mem, int mem_size); void blf_font_size(struct FontBLF *font, int size, int dpi); -void blf_font_draw(struct FontBLF *font, const char *str, unsigned int len); -void blf_font_draw_ascii(struct FontBLF *font, const char *str, unsigned int len); +void blf_font_draw(struct FontBLF *font, const char *str, size_t len); +void blf_font_draw_ascii(struct FontBLF *font, const char *str, size_t len); void blf_font_buffer(struct FontBLF *font, const char *str); void blf_font_boundbox(struct FontBLF *font, const char *str, struct rctf *box); void blf_font_width_and_height(struct FontBLF *font, const char *str, float *width, float *height); diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 2b7e225d709..d0b77222114 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -129,7 +129,7 @@ void BLF_lang_init(void) } /* get LANG/LANGUAGE environment variable */ -static void get_language_variable(const char *varname, char *var, int maxlen) +static void get_language_variable(const char *varname, char *var, const size_t maxlen) { char *env = getenv(varname); @@ -149,7 +149,7 @@ static void get_language_variable(const char *varname, char *var, int maxlen) /* get language to be used based on locale(which might be empty when using default language) and * LANG environment variable */ -static void get_language(const char *locale, const char *lang, char *language, int maxlen) +static void get_language(const char *locale, const char *lang, char *language, const size_t maxlen) { if (locale[0]) { BLI_strncpy(language, locale, maxlen); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4fb235ac9f7..5ba56a85c72 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3288,7 +3288,7 @@ void BKE_object_groups_clear(Scene *scene, Base *base, Object *object) { Group *group = NULL; - BLI_assert(base->object == object); + BLI_assert((base == NULL) || (base->object == object)); if (scene && base == NULL) { base = BKE_scene_base_find(scene, object); diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index af5a8f5d59d..3c89fdba13a 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -3070,7 +3070,6 @@ int setcurr_tab_spaces(Text *text, int space) const char *comm = "#"; const char indent = (text->flags & TXT_TABSTOSPACES) ? ' ' : '\t'; static const char *back_words[] = {"return", "break", "continue", "pass", "yield", NULL}; - if (!text) return 0; if (!text->curl) return 0; while (text->curl->line[i] == indent) { diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 6b6d2a1505f..346ed0002bd 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -667,7 +667,7 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, *err_str = NULL; /* count triangles and create mask */ - if ((use_face_sel = (me->editflag & ME_EDIT_PAINT_MASK) != 0) || + if ((use_face_sel = ((me->editflag & ME_EDIT_PAINT_MASK) != 0)) || (use_vert_sel = ((me->editflag & ME_EDIT_VERT_SEL) != 0))) { mask = MEM_callocN(sizeof(int) * me->totvert, "heat_bone_weighting mask"); diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index b1a613bef5d..ac1766aff69 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -728,7 +728,7 @@ static int pose_select_grouped_exec(bContext *C, wmOperator *op) short changed = 0; /* sanity check */ - if (ELEM(NULL, ob, ob->pose)) + if (ob->pose == NULL) return OPERATOR_CANCELLED; /* selection types diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 0f1d1a24dcb..9c71746d045 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -851,7 +851,7 @@ void UI_view2d_totRect_set_resize(View2D *v2d, int width, int height, int resize if (scroll & V2D_SCROLL_VERTICAL) height -= V2D_SCROLL_HEIGHT; - if (ELEM3(0, v2d, width, height)) { + if (ELEM(0, width, height)) { if (G.debug & G_DEBUG) printf("Error: View2D totRect set exiting: v2d=%p width=%d height=%d\n", (void *)v2d, width, height); // XXX temp debug info return; diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 4314a784511..ab3ab0a133e 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1221,7 +1221,7 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O * - object transparency off: for glsl we draw both in a single pass, and * for solid we don't use transparency at all. */ GMS.use_alpha_pass = (do_alpha_after != NULL); - GMS.is_alpha_pass = (v3d && v3d->transp); + GMS.is_alpha_pass = (v3d->transp != FALSE); if (GMS.use_alpha_pass) *do_alpha_after = FALSE; diff --git a/source/blender/imbuf/intern/IMB_metadata.h b/source/blender/imbuf/intern/IMB_metadata.h index 4f512e04ef8..a68d7a7813e 100644 --- a/source/blender/imbuf/intern/IMB_metadata.h +++ b/source/blender/imbuf/intern/IMB_metadata.h @@ -62,7 +62,7 @@ void IMB_metadata_free(struct ImBuf *img); * \param len - length of value buffer allocated by user. * \return - 1 (true) if ImageInfo present and value for the key found, 0 (false) otherwise */ -int IMB_metadata_get_field(struct ImBuf *img, const char *key, char *value, int len); +int IMB_metadata_get_field(struct ImBuf *img, const char *key, char *value, const size_t len); /** set user data in the ImMetaData struct, which has to be allocated with IMB_metadata_create * before calling this function. diff --git a/source/blender/imbuf/intern/metadata.c b/source/blender/imbuf/intern/metadata.c index 1ce2053fde5..fed55c05eea 100644 --- a/source/blender/imbuf/intern/metadata.c +++ b/source/blender/imbuf/intern/metadata.c @@ -63,7 +63,7 @@ void IMB_metadata_free(struct ImBuf *img) } } -int IMB_metadata_get_field(struct ImBuf *img, const char *key, char *field, int len) +int IMB_metadata_get_field(struct ImBuf *img, const char *key, char *field, const size_t len) { ImMetaData *info; int retval = 0; diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 0b826070fe4..54e1e762f8b 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -119,7 +119,8 @@ typedef struct MLoopUV { #define MLOOPUV_PINNED 4 /* at the moment alpha is abused for vertex painting - * and not used for transparency, note that red and blue are swapped */ + * and not used for transparency, + * note that red and blue are _not_ swapped, as they are with #MCol */ typedef struct MLoopCol { char r, g, b, a; } MLoopCol; -- cgit v1.2.3