diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 08:30:24 -0400 |
| commit | 00caae6d47645e68d6e5277aceb69592b49381a6 (patch) | |
| tree | c361aa0cea3093b93c1118266fe9e2b44ac6e453 /env | |
| parent | fd1e959e91d2b0b2e853d09dd9167dfff18a616c (diff) | |
| download | u-boot-00caae6d47645e68d6e5277aceb69592b49381a6.tar.gz | |
env: Rename getenv/_f() to env_get()
We are now using an env_ prefix for environment functions. Rename these
two functions for consistency. Also add function comments in common.h.
Quite a few places use getenv() in a condition context, provoking a
warning from checkpatch. These are fixed up in this patch also.
Suggested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env')
| -rw-r--r-- | env/callback.c | 2 | ||||
| -rw-r--r-- | env/common.c | 4 | ||||
| -rw-r--r-- | env/flags.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/env/callback.c b/env/callback.c index 1957cc1996..be70980f04 100644 --- a/env/callback.c +++ b/env/callback.c @@ -51,7 +51,7 @@ void env_callback_init(ENTRY *var_entry) int ret = 1; if (first_call) { - callback_list = getenv(ENV_CALLBACK_VAR); + callback_list = env_get(ENV_CALLBACK_VAR); first_call = 0; } diff --git a/env/common.c b/env/common.c index 0cc8829d0d..110323ecea 100644 --- a/env/common.c +++ b/env/common.c @@ -33,7 +33,7 @@ struct hsearch_data env_htab = { */ int getenv_yesno(const char *var) { - char *s = getenv(var); + char *s = env_get(var); if (s == NULL) return -1; @@ -53,7 +53,7 @@ char *getenv_default(const char *name) /* Pretend that the image is bad. */ gd->flags &= ~GD_FLG_ENV_READY; gd->env_valid = 0; - ret_val = getenv(name); + ret_val = env_get(name); gd->env_valid = really_valid; gd->flags = real_gd_flags; return ret_val; diff --git a/env/flags.c b/env/flags.c index 3c50620cb3..85a344fa51 100644 --- a/env/flags.c +++ b/env/flags.c @@ -15,7 +15,7 @@ #include "fw_env.h" #include <env_attr.h> #include <env_flags.h> -#define getenv fw_getenv +#define env_get fw_getenv #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #else #include <common.h> @@ -308,7 +308,7 @@ static inline int env_flags_lookup(const char *flags_list, const char *name, */ enum env_flags_vartype env_flags_get_type(const char *name) { - const char *flags_list = getenv(ENV_FLAGS_VAR); + const char *flags_list = env_get(ENV_FLAGS_VAR); char flags[ENV_FLAGS_ATTR_MAX_LEN + 1]; if (env_flags_lookup(flags_list, name, flags)) @@ -325,7 +325,7 @@ enum env_flags_vartype env_flags_get_type(const char *name) */ enum env_flags_varaccess env_flags_get_varaccess(const char *name) { - const char *flags_list = getenv(ENV_FLAGS_VAR); + const char *flags_list = env_get(ENV_FLAGS_VAR); char flags[ENV_FLAGS_ATTR_MAX_LEN + 1]; if (env_flags_lookup(flags_list, name, flags)) @@ -426,7 +426,7 @@ void env_flags_init(ENTRY *var_entry) int ret = 1; if (first_call) { - flags_list = getenv(ENV_FLAGS_VAR); + flags_list = env_get(ENV_FLAGS_VAR); first_call = 0; } /* look in the ".flags" and static for a reference to this variable */ |