noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the value string functions to be a bit mroe sensible

Browse Source
This commit is contained in:
Nils O. Selåsdal
2014-02-04 15:15:17 +01:00
parent eeed97e938
commit 39290eefb7
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ucore/val_str.h
+3 -2
View File
@@ -8,6 +8,7 @@ struct UCValStr {
const char *str; const char *str;
}; };
/** Helper macro to define an entry in a UCValStr array */
#define UC_VS_ENTRY(constant) {constant, #constant} #define UC_VS_ENTRY(constant) {constant, #constant}
#define UC_VS_TERMINATOR {-1, NULL} #define UC_VS_TERMINATOR {-1, NULL}
@@ -19,7 +20,7 @@ struct UCValStr {
* @param array array to search * @param array array to search
* @return the string associated with @val or NULL * @return the string associated with @val or NULL
*/ */
const char *uc_vs_search(unsigned int val, const struct UCValStr *array); const char *uc_val_2_str(unsigned int val, const struct UCValStr *array);
/** Find @val in @array. /** Find @val in @array.
* @array must be sorted on val and must not be empty * @array must be sorted on val and must not be empty
@@ -29,7 +30,7 @@ const char *uc_vs_search(unsigned int val, const struct UCValStr *array);
* @param array array to search * @param array array to search
* @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_val_2_str_bs(unsigned int val,
const struct UCValStr *array, const struct UCValStr *array,
size_t array_len); size_t array_len);
src/val_str.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "ucore/saturating_math.h" #include "ucore/saturating_math.h"
const char *uc_vs_search(unsigned int val, const struct UCValStr *array) const char *uc_val_2_str(unsigned int val, const struct UCValStr *array)
{ {
const char *found = NULL; const char *found = NULL;
@@ -19,7 +19,7 @@ const char *uc_vs_search(unsigned int val, const struct UCValStr *array)
return found; return found;
} }
const char *uc_vs_bsearch(unsigned int val, const char *uc_val_2_str_bs(unsigned int val,
const struct UCValStr *array, const struct UCValStr *array,
size_t array_len) size_t array_len)
{ {
test/test_val_str.c
+19 -19
View File
@@ -9,11 +9,11 @@ START_TEST (test_val_str_search)
UC_VS_ENTRY(0), UC_VS_ENTRY(0),
UC_VS_TERMINATOR UC_VS_TERMINATOR
}; };
ck_assert_str_eq(uc_vs_search(0 , vals) , "0"); ck_assert_str_eq(uc_val_2_str(0 , vals) , "0");
ck_assert_str_eq(uc_vs_search(1 , vals) , "1"); ck_assert_str_eq(uc_val_2_str(1 , vals) , "1");
ck_assert_str_eq(uc_vs_search(5 , vals) , "5"); ck_assert_str_eq(uc_val_2_str(5 , vals) , "5");
fail_if(uc_vs_search(10, vals) != NULL); fail_if(uc_val_2_str(10, vals) != NULL);
END_TEST END_TEST
START_TEST (test_val_str_bsearch_odd) START_TEST (test_val_str_bsearch_odd)
@@ -26,15 +26,15 @@ START_TEST (test_val_str_bsearch_odd)
}; };
const size_t len = sizeof vals/sizeof vals[0]; const size_t len = sizeof vals/sizeof vals[0];
ck_assert_str_eq(uc_vs_bsearch(1 , vals , len) , "1"); ck_assert_str_eq(uc_val_2_str_bs(1 , vals , len) , "1");
ck_assert_str_eq(uc_vs_bsearch(2 , vals , len) , "2"); ck_assert_str_eq(uc_val_2_str_bs(2 , vals , len) , "2");
ck_assert_str_eq(uc_vs_bsearch(10 , vals , len) , "10"); ck_assert_str_eq(uc_val_2_str_bs(10 , vals , len) , "10");
ck_assert_str_eq(uc_vs_bsearch(100 , vals , len) , "100"); ck_assert_str_eq(uc_val_2_str_bs(100 , vals , len) , "100");
ck_assert_str_eq(uc_vs_bsearch(101 , vals , len) , "101"); ck_assert_str_eq(uc_val_2_str_bs(101 , vals , len) , "101");
fail_if(uc_vs_bsearch(0 , vals , len) != NULL); fail_if(uc_val_2_str_bs(0 , vals , len) != NULL);
fail_if(uc_vs_bsearch(55 , vals , len) != NULL); fail_if(uc_val_2_str_bs(55 , vals , len) != NULL);
fail_if(uc_vs_bsearch(999 , vals , len) != NULL); fail_if(uc_val_2_str_bs(999 , vals , len) != NULL);
END_TEST END_TEST
START_TEST (test_val_str_bsearch_even) START_TEST (test_val_str_bsearch_even)
@@ -46,14 +46,14 @@ START_TEST (test_val_str_bsearch_even)
}; };
const size_t len = sizeof vals/sizeof vals[0]; const size_t len = sizeof vals/sizeof vals[0];
ck_assert_str_eq(uc_vs_bsearch(1 , vals , len) , "1"); ck_assert_str_eq(uc_val_2_str_bs(1 , vals , len) , "1");
ck_assert_str_eq(uc_vs_bsearch(2 , vals , len) , "2"); ck_assert_str_eq(uc_val_2_str_bs(2 , vals , len) , "2");
ck_assert_str_eq(uc_vs_bsearch(10 , vals , len) , "10"); ck_assert_str_eq(uc_val_2_str_bs(10 , vals , len) , "10");
ck_assert_str_eq(uc_vs_bsearch(101 , vals , len) , "101"); ck_assert_str_eq(uc_val_2_str_bs(101 , vals , len) , "101");
fail_if(uc_vs_bsearch(0 , vals , len) != NULL); fail_if(uc_val_2_str_bs(0 , vals , len) != NULL);
fail_if(uc_vs_bsearch(55 , vals , len) != NULL); fail_if(uc_val_2_str_bs(55 , vals , len) != NULL);
fail_if(uc_vs_bsearch(999 , vals , len) != NULL); fail_if(uc_val_2_str_bs(999 , vals , len) != NULL);
END_TEST END_TEST