env: add check/apply logic to himport_r()

[u-boot] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index 8f142ed9bf1103d54a04e010a2dc2199aa9554e0..c6e7c4ca626e8cd564cac39a4dc7b7386ed7d561 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -133,7 +133,9 @@ const uchar default_environment[] = {
        "\0"
 };
 
-struct hsearch_data env_htab;
+struct hsearch_data env_htab = {
+       .apply = env_check_apply,
+};
 
 static uchar __env_get_char_spec(int index)
 {
@@ -194,7 +196,7 @@ void set_default_env(const char *s)
 
        if (himport_r(&env_htab, (char *)default_environment,
                        sizeof(default_environment), '\0', 0,
-                       0, NULL) == 0)
+                       0, NULL, 0 /* do_apply */) == 0)
                error("Environment import failed: errno = %d\n", errno);
 
        gd->flags |= GD_FLG_ENV_READY;
@@ -220,7 +222,7 @@ int env_import(const char *buf, int check)
        }
 
        if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
-                       0, NULL)) {
+                       0, NULL, 0 /* do_apply */)) {
                gd->flags |= GD_FLG_ENV_READY;
                return 1;
        }