[Bf-blender-cvs] [1b68647] master: GHash/EdgeHash: avoid NULL check on iterator init

Campbell Barton noreply at git.blender.org
Thu Aug 7 03:21:40 CEST 2014


Commit: 1b6864752f3e2ea8e425303a91216f7bb64b5345
Author: Campbell Barton
Date:   Thu Aug 7 11:19:55 2014 +1000
Branches: master
https://developer.blender.org/rB1b6864752f3e2ea8e425303a91216f7bb64b5345

GHash/EdgeHash: avoid NULL check on iterator init

===================================================================

M	source/blender/blenlib/intern/BLI_ghash.c
M	source/blender/blenlib/intern/edgehash.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 6b818ed..b209e68 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -570,12 +570,12 @@ void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh)
 	ghi->curEntry = NULL;
 	ghi->curBucket = UINT_MAX;  /* wraps to zero */
 	if (gh->nentries) {
-		while (!ghi->curEntry) {
+		do {
 			ghi->curBucket++;
 			if (UNLIKELY(ghi->curBucket == ghi->gh->nbuckets))
 				break;
 			ghi->curEntry = ghi->gh->buckets[ghi->curBucket];
-		}
+		} while (!ghi->curEntry);
 	}
 }
 
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 27c5457..f6e4aec 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -463,14 +463,14 @@ void BLI_edgehashIterator_init(EdgeHashIterator *ehi, EdgeHash *eh)
 	ehi->curEntry = NULL;
 	ehi->curBucket = UINT_MAX;  /* wraps to zero */
 	if (eh->nentries) {
-		while (!ehi->curEntry) {
+		do {
 			ehi->curBucket++;
 			if (UNLIKELY(ehi->curBucket == ehi->eh->nbuckets)) {
 				break;
 			}
 
 			ehi->curEntry = ehi->eh->buckets[ehi->curBucket];
-		}
+		} while (!ehi->curEntry);
 	}
 }




More information about the Bf-blender-cvs mailing list