cosmetic cleanup

This commit is contained in:
Nils O. Selåsdal
2014-02-04 01:45:02 +01:00
parent c2af5db86e
commit a1da276cf5
2 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -30,8 +30,8 @@ const char *uc_vs_search(unsigned int val, const struct UCValStr *array);
* @return the string associated with @val or NULL * @return the string associated with @val or NULL
*/ */
const char *uc_vs_bsearch(unsigned int val, const char *uc_vs_bsearch(unsigned int val,
const struct UCValStr *array, const struct UCValStr *array,
size_t array_len); size_t array_len);
#endif #endif
+5 -5
View File
@@ -20,26 +20,26 @@ const char *uc_vs_search(unsigned int val, const struct UCValStr *array)
} }
const char *uc_vs_bsearch(unsigned int val, const char *uc_vs_bsearch(unsigned int val,
const struct UCValStr *array, const struct UCValStr *array,
size_t array_len) size_t array_len)
{ {
size_t i = array_len; size_t i = array_len;
const struct UCValStr *start = array; const struct UCValStr *start = array;
while (i != 0) { while (i != 0) {
const struct UCValStr *curr; const struct UCValStr *curr;
curr = start + i / 2; curr = &start[i / 2]; //middle
if (curr->val == val) { if (curr->val == val) {
return curr->str; return curr->str;
} }
if (curr->val < val) { if (curr->val < val) {
start = curr + 1; start = curr + 1; //right half
i--; i--;
} }
i = i / 2; i = i / 2;
} }
return NULL; return NULL;