[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59748] trunk/blender/source/blender: warning cleanup: correct some odd returns and quiet strict flag warnings on some systems.

[Campbell Barton]

Revision: 59748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59748
Author:   campbellbarton
Date:     2013-09-02 17:59:04 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
warning cleanup: correct some odd returns and quiet strict flag warnings on some systems.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/blenlib/BLI_edgehash.h
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
    trunk/blender/source/blender/blenlib/intern/BLI_mempool.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-09-02 17:55:22 UTC (rev 59747)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-09-02 17:59:04 UTC (rev 59748)
@@ -2417,7 +2417,6 @@
 	 * of currently operating tracks (if needed)
 	 */
 	for (a = 0; a < map->num_tracks; a++) {
-		int replace_sel = 0, replace_rot = 0;
 		MovieTrackingTrack *new_track, *old_track;
 
 		track = &map->tracks[a];

Modified: trunk/blender/source/blender/blenlib/BLI_edgehash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_edgehash.h	2013-09-02 17:55:22 UTC (rev 59747)
+++ trunk/blender/source/blender/blenlib/BLI_edgehash.h	2013-09-02 17:59:04 UTC (rev 59748)
@@ -89,7 +89,7 @@
 /* rely on inline api for now */
 BLI_INLINE EdgeSetIterator *BLI_edgesetIterator_new(EdgeSet *gs) { return (EdgeSetIterator *)BLI_edgehashIterator_new((EdgeHash *)gs); }
 BLI_INLINE void BLI_edgesetIterator_free(EdgeSetIterator *esi) { BLI_edgehashIterator_free((EdgeHashIterator *)esi); }
-BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *v0_r, unsigned int *v1_r) { return BLI_edgehashIterator_getKey((EdgeHashIterator *)esi, v0_r, v1_r); }
+BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *v0_r, unsigned int *v1_r) { BLI_edgehashIterator_getKey((EdgeHashIterator *)esi, v0_r, v1_r); }
 BLI_INLINE void BLI_edgesetIterator_step(EdgeSetIterator *esi) { BLI_edgehashIterator_step((EdgeHashIterator *)esi); }
 BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) { return BLI_edgehashIterator_isDone((EdgeHashIterator *)esi); }
 

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-09-02 17:55:22 UTC (rev 59747)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-09-02 17:59:04 UTC (rev 59748)
@@ -238,7 +238,7 @@
 BLI_INLINE void ghash_insert(GHash *gh, void *key, void *val)
 {
 	const unsigned int hash = ghash_keyhash(gh, key);
-	return ghash_insert_ex(gh, key, val, hash);
+	ghash_insert_ex(gh, key, val, hash);
 }
 
 /**

Modified: trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_mempool.c	2013-09-02 17:55:22 UTC (rev 59747)
+++ trunk/blender/source/blender/blenlib/intern/BLI_mempool.c	2013-09-02 17:59:04 UTC (rev 59748)
@@ -407,7 +407,7 @@
 	while ((elem = BLI_mempool_iterstep(&iter))) {
 		*p++ = elem;
 	}
-	BLI_assert((p - data) == pool->totused);
+	BLI_assert((unsigned int)(p - data) == pool->totused);
 }
 
 /**
@@ -433,7 +433,7 @@
 		memcpy(p, elem, (size_t)pool->esize);
 		p += pool->esize;
 	}
-	BLI_assert((p - (char *)data) == pool->totused * pool->esize);
+	BLI_assert((unsigned int)(p - (char *)data) == pool->totused * pool->esize);
 }
 
 /**
@@ -570,7 +570,7 @@
  */
 void BLI_mempool_clear(BLI_mempool *pool)
 {
-	return BLI_mempool_clear_ex(pool, -1);
+	BLI_mempool_clear_ex(pool, -1);
 }
 
 /**