From c7b6685f1e383d043bd44964d176bf71fe9bbb73 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 19 Sep 2011 16:45:45 +0000 Subject: Remove unnecessary check. Use consistent types for index. git-svn-id: http://svn.drobilla.net/zix/trunk@27 df6676b4-ccc9-40e5-b5d6-7c4628a128e3 --- src/sorted_array.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/sorted_array.c') diff --git a/src/sorted_array.c b/src/sorted_array.c index 7d5358b..ae08946 100644 --- a/src/sorted_array.c +++ b/src/sorted_array.c @@ -147,17 +147,12 @@ zix_sorted_array_find(const ZixSortedArray* a, const void* e, ZixSortedArrayIter* ai) { - if (a->num_elems == 0) { - *ai = NULL; - return ZIX_STATUS_NOT_FOUND; - } - intptr_t lower = 0; intptr_t upper = a->num_elems - 1; while (upper >= lower) { - const size_t i = lower + ((upper - lower) / 2); - void* elem_i = zix_sorted_array_index_unchecked(a, i); - const int cmp = a->cmp(elem_i, e, a->cmp_data); + const intptr_t i = lower + ((upper - lower) / 2); + void* const elem_i = zix_sorted_array_index_unchecked(a, i); + const int cmp = a->cmp(elem_i, e, a->cmp_data); if (cmp == 0) { *ai = elem_i; -- cgit v1.2.1