env: common: Make env_get_addr/get_char_memory() static

These functions are not used outside this file. Make them static and order
them to avoid forward declarations.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2017-08-03 12:21:51 -06:00 committed by Tom Rini
parent 91d3aa05d0
commit bcdfb8d5a5
2 changed files with 9 additions and 13 deletions

18
env/common.c vendored
View File

@ -41,7 +41,15 @@ static uchar env_get_char_init(int index)
return default_environment[index];
}
uchar env_get_char_memory(int index)
static const uchar *env_get_addr(int index)
{
if (gd->env_valid)
return (uchar *)(gd->env_addr + index);
else
return &default_environment[index];
}
static uchar env_get_char_memory(int index)
{
return *env_get_addr(index);
}
@ -55,14 +63,6 @@ uchar env_get_char(int index)
return env_get_char_init(index);
}
const uchar *env_get_addr(int index)
{
if (gd->env_valid)
return (uchar *)(gd->env_addr + index);
else
return &default_environment[index];
}
/*
* Read an environment variable as a boolean
* Return -1 if variable does not exist (default to true)

View File

@ -202,10 +202,6 @@ extern struct hsearch_data env_htab;
/* Function that returns a character from the environment */
unsigned char env_get_char(int);
/* Function that returns a pointer to a value from the environment */
const unsigned char *env_get_addr(int);
unsigned char env_get_char_memory(int index);
/* Function that updates CRC of the enironment */
void env_crc_update(void);