From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sun, 9 Jul 2017 14:52:55 -0600 Subject: [U-Boot] [PATCH 12/30] env: common: Make env_get_addr/get_char_memory() static In-Reply-To: <20170709205313.116174-1-sjg@chromium.org> References: <20170709205313.116174-1-sjg@chromium.org> Message-ID: <20170709205313.116174-13-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de These functions are not used outside this file. Make them static and order them to avoid forward declarations. Signed-off-by: Simon Glass --- env/common.c | 18 +++++++++--------- include/environment.h | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/env/common.c b/env/common.c index 6845f8d8d5..ff3f47e536 100644 --- a/env/common.c +++ b/env/common.c @@ -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) diff --git a/include/environment.h b/include/environment.h index 6f94986c6b..d6aa1f0fff 100644 --- a/include/environment.h +++ b/include/environment.h @@ -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); -- 2.13.2.725.g09c95d1e9-goog