Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Move envmatch() to env.h

Browse source 
Move envmatch() over to the new header file. Also rename it to env_match()
to better line up with other functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Simon Glass 2019-08-01 09:46:45 -06:00 committed by Tom Rini
parent 3f989e7b0e
commit b9ca02c2d5
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/nvedit.c
View file

@ -709,7 +709,7 @@ int env_get_f(const char *name, char *buf, unsigned len)
return -1; return -1;
} }
val = envmatch((uchar *)name, i); val = env_match((uchar *)name, i);
if (val < 0) if (val < 0)
continue; continue;
@ -785,15 +785,7 @@ U_BOOT_CMD(
#endif #endif
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
int env_match(uchar *s1, int i2)
/*
* Match a name / name=value pair
*
* s1 is either a simple 'name', or a 'name=value' pair.
* i2 is the environment index for a 'name2=value2' pair.
* If the names match, return the index for the value2, else -1.
*/
int envmatch(uchar *s1, int i2)
{ {
if (s1 == NULL) if (s1 == NULL)
return -1; return -1;

3
examples/api/glue.c
View file

@ -4,6 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <env.h>
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
@ -365,7 +366,7 @@ const char * ub_env_enum(const char *last)
/* /*
* It's OK to pass only the name piece as last (and not the whole * It's OK to pass only the name piece as last (and not the whole
* 'name=val' string), since the API_ENUM_ENV call uses envmatch() * 'name=val' string), since the API_ENUM_ENV call uses env_match()
* internally, which handles such case * internally, which handles such case
*/ */
if (!syscall(API_ENV_ENUM, NULL, last, &env)) if (!syscall(API_ENV_ENUM, NULL, last, &env))

3
include/common.h
View file

@ -145,9 +145,6 @@ int do_fat_fsload(cmd_tbl_t *, int, int, char * const []);
/* common/cmd_ext2.c */ /* common/cmd_ext2.c */
int do_ext2load(cmd_tbl_t *, int, int, char * const []); int do_ext2load(cmd_tbl_t *, int, int, char * const []);
/* common/cmd_nvedit.c */
int envmatch (uchar *, int);
/** /**
* env_get() - Look up the value of an environment variable * env_get() - Look up the value of an environment variable
* *

11
include/env.h
View file

@ -39,6 +39,17 @@ 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_f() - Look up the value of an environment variable (early) * env_get_f() - Look up the value of an environment variable (early)
* *