Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

[oweals/u-boot.git] / test / env / hashtable.c

diff --git a/test/env/hashtable.c b/test/env/hashtable.c
index 8c87e654579bef942a792cb6e5ee9d3201311564..5242c4cc3edb7fb4105ec5787065f90cdec940bc 100644 (file)
--- a/test/env/hashtable.c
+++ b/test/env/hashtable.c
@@ -18,8 +18,8 @@ static int htab_fill(struct unit_test_state *uts,
                     struct hsearch_data *htab, size_t size)
 {
        size_t i;
-       ENTRY item;
-       ENTRY *ritem;
+       struct env_entry item;
+       struct env_entry *ritem;
        char key[20];
 
        for (i = 0; i < size; i++) {
@@ -28,7 +28,7 @@ static int htab_fill(struct unit_test_state *uts,
                item.data = key;
                item.flags = 0;
                item.key = key;
-               ut_asserteq(1, hsearch_r(item, ENTER, &ritem, htab, 0));
+               ut_asserteq(1, hsearch_r(item, ENV_ENTER, &ritem, htab, 0));
        }
 
        return 0;
@@ -38,8 +38,8 @@ static int htab_check_fill(struct unit_test_state *uts,
                           struct hsearch_data *htab, size_t size)
 {
        size_t i;
-       ENTRY item;
-       ENTRY *ritem;
+       struct env_entry item;
+       struct env_entry *ritem;
        char key[20];
 
        for (i = 0; i < size; i++) {
@@ -48,7 +48,7 @@ static int htab_check_fill(struct unit_test_state *uts,
                item.flags = 0;
                item.data = key;
                item.key = key;
-               hsearch_r(item, FIND, &ritem, htab, 0);
+               hsearch_r(item, ENV_FIND, &ritem, htab, 0);
                ut_assert(ritem);
                ut_asserteq_str(key, ritem->key);
                ut_asserteq_str(key, ritem->data);
@@ -61,8 +61,8 @@ static int htab_create_delete(struct unit_test_state *uts,
                              struct hsearch_data *htab, size_t iterations)
 {
        size_t i;
-       ENTRY item;
-       ENTRY *ritem;
+       struct env_entry item;
+       struct env_entry *ritem;
        char key[20];
 
        for (i = 0; i < iterations; i++) {
@@ -71,10 +71,10 @@ static int htab_create_delete(struct unit_test_state *uts,
                item.flags = 0;
                item.data = key;
                item.key = key;
-               hsearch_r(item, ENTER, &ritem, htab, 0);
+               hsearch_r(item, ENV_ENTER, &ritem, htab, 0);
                ritem = NULL;
 
-               hsearch_r(item, FIND, &ritem, htab, 0);
+               hsearch_r(item, ENV_FIND, &ritem, htab, 0);
                ut_assert(ritem);
                ut_asserteq_str(key, ritem->key);
                ut_asserteq_str(key, ritem->data);