[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36300] trunk/blender: quiet some clang warnings & fix for bugs in exceptional cases.

[Campbell Barton]

Revision: 36300
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36300
Author:   campbellbarton
Date:     2011-04-23 12:57:03 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
quiet some clang warnings & fix for bugs in exceptional cases.
- ghost C api, BLI_get_folder_version() could assign garbage values.
- pointcache ptcache_find_frames_around() had a superfluous NULL check which would have crashed anyway if actually NULL.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/space_image/image_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c

Modified: trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_C-api.cpp	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/intern/ghost/intern/GHOST_C-api.cpp	2011-04-23 12:57:03 UTC (rev 36300)
@@ -403,7 +403,7 @@
 {
 	GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
 	GHOST_TSuccess result;
-	bool isdown;
+	bool isdown= false;
 	
 	result = system->getModifierKeyState(mask, isdown);
 	*isDown = (int) isdown;
@@ -419,7 +419,7 @@
 {
 	GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
 	GHOST_TSuccess result;
-	bool isdown;
+	bool isdown= false;
 	
 	result = system->getButtonState(mask, isdown);
 	*isDown = (int) isdown;

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -1373,11 +1373,13 @@
 		while(pm->next && pm->next->frame < frame)
 			pm= pm->next;
 
-		if(pm2 && pm2->frame < frame)
+		if(pm2->frame < frame) {
 			pm2 = NULL;
+		}
 		else {
-			while(pm2->prev && pm2->prev->frame > frame)
+			while(pm2->prev && pm2->prev->frame > frame) {
 				pm2= pm2->prev;
+			}
 		}
 
 		if(pm && !pm2) {

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -1144,6 +1144,8 @@
 		ok= get_path_system(path, NULL, NULL, NULL, ver);
 		break;
 	default:
+		path[0]= '\0'; /* incase do_check is false */
+		ok= FALSE;
 		BLI_assert(!"incorrect ID");
 	}
 

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -3224,7 +3224,7 @@
 {
 	bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
 	View2D *v2d= &ac->ar->v2d;
-	float y, ymid, ytext;
+	float y, ymid /*, ytext*/;
 	short offset;
 	
 	/* sanity checks - don't draw anything */
@@ -3243,7 +3243,7 @@
 	y= (ymaxc - yminc)/2 + yminc;
 	ymid= y - 7;
 	/* y-coordinates for text is only 4 down from middle */
-	ytext= y - 4;
+	/* ytext= y - 4; */
 	
 	/* no button backdrop behind icons */
 	uiBlockSetEmboss(block, UI_EMBOSSN);

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/editors/interface/interface.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -2093,6 +2093,8 @@
 					str= strcat(str, "Alt ");
 				if(but->modifier_key & KM_OSKEY)
 					str= strcat(str, "Cmd ");
+
+				(void)str; /* UNUSED */
 			}
 			else
 				strcat(but->drawstr, "Press a key  ");

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -2326,6 +2326,7 @@
 	
 	s= buf;
 	if (title) s+= sprintf(s, "%s%%t|%s", title, item);
+	(void)s;
 	
 	handle= ui_popup_menu_create(C, NULL, NULL, NULL, NULL, buf);
 

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -332,6 +332,8 @@
 		BLF_draw_ascii(blf_mono_font, str, sizeof(str));
 		dx += BLF_width(blf_mono_font, str);
 	}
+
+	(void)dx;
 }
 
 /* image drawing */

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2011-04-23 11:20:30 UTC (rev 36299)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2011-04-23 12:57:03 UTC (rev 36300)
@@ -313,7 +313,7 @@
 	if (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) || modifiers_findByType(ob, eModifierType_Softbody)) {
 		str += sprintf(str, formatstr, "Particle Mode", OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE);
 	}
-
+	(void)str;
 	return (string);
 }