[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36565] branches/bmesh/blender: warning fixes

Campbell Barton ideasman42 at gmail.com
Mon May 9 10:20:39 CEST 2011


Revision: 36565
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36565
Author:   campbellbarton
Date:     2011-05-09 08:20:39 +0000 (Mon, 09 May 2011)
Log Message:
-----------
warning fixes

Modified Paths:
--------------
    branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
    branches/bmesh/blender/source/creator/creator.c

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp	2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp	2011-05-09 08:20:39 UTC (rev 36565)
@@ -249,7 +249,7 @@
 		wm = sys->getWindowManager();
 		windows = wm->getWindows();
 
-		while (str = fgets(buf, 256, m_playfile)) {
+		while ((str = fgets(buf, 256, m_playfile))) {
 			GHOST_IWindow *iwin = NULL;
 			GHOST_TEventType type;
 			double time;

Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c	2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c	2011-05-09 08:20:39 UTC (rev 36565)
@@ -3493,7 +3493,7 @@
 				memcpy(disp2, mdisps[i].disps, MEM_allocN_len(mdisps[i].disps));
 				
 				MEM_freeN(mdisps[i].disps);
-				mdisps[i].disps = disp2;
+				mdisps[i].disps = (float (*)[3])disp2;
 			}
 			
 			if( (fd->flags & FD_FLAGS_SWITCH_ENDIAN) && (mdisps[i].disps) ) {

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2011-05-09 08:20:39 UTC (rev 36565)
@@ -51,7 +51,7 @@
 if (bmesh_check_element(bm, el, ((BMHeader*)el)->type))\
 		printf("check_element failure, with code %i on line %i in file\n    \"%s\"\n\n", bmesh_check_element(bm, el, ((BMHeader*)el)->type), __LINE__, __FILE__);
 
-#define bm_get_edge_link(e, v) (Link*)((v) == ((BMEdge*)(e))->v1 ? &(((BMEdge*)(e))->dlink1) : &(((BMEdge*)(e))->dlink2))
+#define bm_get_edge_link(e, v) (((v) == ((BMEdge*)(e))->v1) ? (Link*)&(((BMEdge*)(e))->dlink1) : (Link*)&(((BMEdge*)(e))->dlink2))
 
 int bmesh_radial_length(struct BMLoop *l);
 int bmesh_disk_count(BMVert *v);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c	2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c	2011-05-09 08:20:39 UTC (rev 36565)
@@ -194,7 +194,7 @@
 	}
 
 	if (v->e == e)
-		v->e = e!=e1->next ? (BMEdge*)e1->next : NULL;
+		v->e = (e != (BMEdge *)e1->next) ? (BMEdge *)e1->next : NULL;
 
 	e1->next = e1->prev = NULL;
 }

Modified: branches/bmesh/blender/source/creator/creator.c
===================================================================
--- branches/bmesh/blender/source/creator/creator.c	2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/creator/creator.c	2011-05-09 08:20:39 UTC (rev 36565)
@@ -356,7 +356,7 @@
 	}
 }*/
 
-int segmentation_handler(int sig)
+void segmentation_handler(int sig)
 {
 	char fname[256];
 
@@ -372,8 +372,6 @@
 	/*induce a real crash*/
 	signal(SIGSEGV, SIG_DFL);
 	*(int*)NULL = 0;
-
-	return 0;
 }
 
 static int nocrashhandler(int argc, const char **argv, void *data)




More information about the Bf-blender-cvs mailing list