[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50622] trunk/blender/source/blender: code cleanup: remove paranoid/ invalid NULL checks and also reduce some unneeded size_t -> int conversions .
Campbell Barton
ideasman42 at gmail.com
Sat Sep 15 09:31:17 CEST 2012
Revision: 50622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50622
Author: campbellbarton
Date: 2012-09-15 07:31:17 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
code cleanup: remove paranoid/invalid NULL checks and also reduce some unneeded size_t -> int conversions.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/blenfont/intern/blf_internal.h
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/imbuf/intern/IMB_metadata.h
trunk/blender/source/blender/imbuf/intern/metadata.c
trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -159,7 +159,7 @@
} \
} (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 @@
}
/* 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;
Modified: trunk/blender/source/blender/blenfont/intern/blf_internal.h
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_internal.h 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/blenfont/intern/blf_internal.h 2012-09-15 07:31:17 UTC (rev 50622)
@@ -51,8 +51,8 @@
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);
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -129,7 +129,7 @@
}
/* 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 @@
/* 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);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -3288,7 +3288,7 @@
{
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);
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -3070,7 +3070,6 @@
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) {
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -667,7 +667,7 @@
*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");
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -728,7 +728,7 @@
short changed = 0;
/* sanity check */
- if (ELEM(NULL, ob, ob->pose))
+ if (ob->pose == NULL)
return OPERATOR_CANCELLED;
/* selection types
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -851,7 +851,7 @@
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;
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -1221,7 +1221,7 @@
* - 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;
Modified: trunk/blender/source/blender/imbuf/intern/IMB_metadata.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_metadata.h 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/imbuf/intern/IMB_metadata.h 2012-09-15 07:31:17 UTC (rev 50622)
@@ -62,7 +62,7 @@
* \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.
Modified: trunk/blender/source/blender/imbuf/intern/metadata.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/metadata.c 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/imbuf/intern/metadata.c 2012-09-15 07:31:17 UTC (rev 50622)
@@ -63,7 +63,7 @@
}
}
-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;
Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2012-09-15 07:30:11 UTC (rev 50621)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2012-09-15 07:31:17 UTC (rev 50622)
@@ -119,7 +119,8 @@
#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;
More information about the Bf-blender-cvs
mailing list