random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

env: Change env_match() to static and remove from header

Browse Source 
This function was used by other parts of U-Boot in the past when
environment was read from underlying device one character at a time.

This is not the case anymore.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Behún 2021-10-17 17:36:29 +02:00 committed by Simon Glass
parent 6aa652d008
commit 7b611ee90e
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/nvedit.c
View File

@ -706,6 +706,21 @@ char *from_env(const char *envvar)
return ret; return ret;
} }
static int env_match(uchar *s1, int i2)
{
if (s1 == NULL)
return -1;
while (*s1 == env_get_char(i2++))
if (*s1++ == '=')
return i2;
if (*s1 == '\0' && env_get_char(i2-1) == '=')
return i2;
return -1;
}
/* /*
* Look up variable from environment for restricted C runtime env. * Look up variable from environment for restricted C runtime env.
*/ */
@ -816,21 +831,6 @@ static int do_env_select(struct cmd_tbl *cmdtp, int flag, int argc,
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
int env_match(uchar *s1, int i2)
{
if (s1 == NULL)
return -1;
while (*s1 == env_get_char(i2++))
if (*s1++ == '=')
return i2;
if (*s1 == '\0' && env_get_char(i2-1) == '=')
return i2;
return -1;
}
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
static int do_env_default(struct cmd_tbl *cmdtp, int flag, static int do_env_default(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[]) int argc, char *const argv[])

11
include/env.h
View File

@ -90,17 +90,6 @@ int env_init(void);
*/ */
void env_relocate(void); void env_relocate(void);
/**
* env_match() - Match a name / name=value pair
*
* This is used prior to relocation for finding envrionment variables
*
* @name: A simple 'name', or a 'name=value' pair.
* @index: The environment index for a 'name2=value2' pair.
* @return index for the value if the names match, else -1.
*/
int env_match(unsigned char *name, int index);
/** /**
* env_get() - Look up the value of an environment variable * env_get() - Look up the value of an environment variable
* *