env: Refactor apply into change_ok
Move the read of the old value to inside the check function. In some cases it can be avoided all together and at the least the code is only called from one place. Also name the function and the callback to more clearly describe what it does. Pass the ENTRY instead of just the name for direct access to the whole data structure. Pass an enum to the callback that specifies the operation being approved. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
committed by
Tom Rini
parent
3d3b52f258
commit
7afcf3a55b
@@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
#include <env_default.h>
|
||||
|
||||
struct hsearch_data env_htab = {
|
||||
.apply = env_check_apply,
|
||||
.change_ok = env_change_ok,
|
||||
};
|
||||
|
||||
static uchar __env_get_char_spec(int index)
|
||||
@@ -162,6 +162,7 @@ void env_relocate(void)
|
||||
{
|
||||
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
|
||||
env_reloc();
|
||||
env_htab.change_ok += gd->reloc_off;
|
||||
#endif
|
||||
if (gd->env_valid == 0) {
|
||||
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
|
||||
|
||||
Reference in New Issue
Block a user