From eeed97e9381887c0f2dfc81947d383ef23e889b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= Date: Tue, 4 Feb 2014 01:45:02 +0100 Subject: [PATCH] cosmetic cleanup --- include/ucore/val_str.h | 4 ++-- src/val_str.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/ucore/val_str.h b/include/ucore/val_str.h index 834f7cb..eb7d056 100644 --- a/include/ucore/val_str.h +++ b/include/ucore/val_str.h @@ -30,8 +30,8 @@ const char *uc_vs_search(unsigned int val, const struct UCValStr *array); * @return the string associated with @val or NULL */ const char *uc_vs_bsearch(unsigned int val, - const struct UCValStr *array, - size_t array_len); + const struct UCValStr *array, + size_t array_len); #endif diff --git a/src/val_str.c b/src/val_str.c index 40e0cd7..94659ad 100644 --- a/src/val_str.c +++ b/src/val_str.c @@ -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 struct UCValStr *array, - size_t array_len) + const struct UCValStr *array, + size_t array_len) { size_t i = array_len; const struct UCValStr *start = array; while (i != 0) { const struct UCValStr *curr; - curr = start + i / 2; + curr = &start[i / 2]; //middle if (curr->val == val) { return curr->str; } if (curr->val < val) { - start = curr + 1; + start = curr + 1; //right half i--; } - i = i / 2; + i = i / 2; } return NULL;