diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-07 05:19:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-07 05:19:55 +0400 |
commit | 1b6864752f3e2ea8e425303a91216f7bb64b5345 (patch) | |
tree | 3b81f33019c728aab57c5db2f72bb048a30d6794 | |
parent | ea30641d90119ff556599151f0a4bf3000574470 (diff) |
GHash/EdgeHash: avoid NULL check on iterator init
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/edgehash.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 6b818ed36cb..b209e6803f8 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 27c5457370b..f6e4aec9624 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); } } |