Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 02:08:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

env: Rename getenv/_f() to env_get()

Browse source 
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>
This commit is contained in:
Simon Glass 2017-08-03 12:22:12 -06:00 • committed by Tom Rini
parent fd1e959e91
commit 00caae6d47
213 changed files with 531 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/cli_hush.c
View file

@ -560,7 +560,7 @@ static int builtin_cd(struct child_prog *child)
{
char *newdir;
if (child->argv[1] == NULL)
newdir = getenv("HOME");
newdir = env_get("HOME");
else
newdir = child->argv[1];
if (chdir(newdir)) {
@ -948,7 +948,7 @@ static inline void cmdedit_set_initial_prompt(void)
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
PS1 = NULL;
#else
PS1 = getenv("PS1");
PS1 = env_get("PS1");
if(PS1==0)
PS1 = "\\w \\$ ";
#endif
@ -987,9 +987,9 @@ static int uboot_cli_readline(struct in_str *i)
#ifdef CONFIG_CMDLINE_PS_SUPPORT
if (i->promptmode == 1)
ps_prompt = getenv("PS1");
ps_prompt = env_get("PS1");
else
ps_prompt = getenv("PS2");
ps_prompt = env_get("PS2");
if (ps_prompt)
prompt = ps_prompt;
#endif
@ -2172,7 +2172,7 @@ int set_local_var(const char *s, int flg_export)
name=strdup(s);
#ifdef __U_BOOT__
if (getenv(name) != NULL) {
if (env_get(name) != NULL) {
printf ("ERROR: "
"There is a global environment variable with the same name.\n");
free(name);
@ -2793,7 +2793,7 @@ static char *lookup_param(char *src)
}
}
p = getenv(src);
p = env_get(src);
if (!p)
p = get_local_var(src);
@ -3157,7 +3157,7 @@ static void mapset(const unsigned char *set, int code)
static void update_ifs_map(void)
{
/* char *ifs and char map[256] are both globals. */
ifs = (uchar *)getenv("IFS");
ifs = (uchar *)env_get("IFS");
if (ifs == NULL) ifs=(uchar *)" \t\n";
/* Precompute a list of 'flow through' behavior so it can be treated
* quickly up front. Computation is necessary because of IFS.