Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 12:27:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Use string pointer instead of indexes in env_get_f()

Browse source 
Since we no longer use env_get_char() to access n-th character of
linearized environment data, but rather access the arrays themselves, we
can convert the iteration to use string pointers instead of position
indexes.

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:31 +02:00 • committed by Simon Glass
parent 52f9ed34cb
commit eff73b2eed
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cmd/nvedit.c
View file

@ -706,19 +706,19 @@ char *from_env(const char *envvar)
return ret; return ret;
} }
static int env_match(const char *env, const char *s1, int i2) static const char *env_match(const char *p, const char *s1)
{ {
if (s1 == NULL) if (s1 == NULL)
return -1; return NULL;
while (*s1 == env[i2++]) while (*s1 == *p++)
if (*s1++ == '=') if (*s1++ == '=')
return i2; return p;
if (*s1 == '\0' && env[i2-1] == '=') if (*s1 == '\0' && p[-1] == '=')
return i2; return p;
return -1; return NULL;
} }
/* /*
@ -726,28 +726,28 @@ static int env_match(const char *env, const char *s1, int i2)
*/ */
int env_get_f(const char *name, char *buf, unsigned len) int env_get_f(const char *name, char *buf, unsigned len)
{ {
const char *env; const char *env, *p, *nxt;
int i, nxt;
if (gd->env_valid == ENV_INVALID) if (gd->env_valid == ENV_INVALID)
env = (const char *)default_environment; env = (const char *)default_environment;
else else
env = (const char *)gd->env_addr; env = (const char *)gd->env_addr;
for (i = 0; env[i] != '\0'; i = nxt + 1) { for (p = env; *p != '\0'; p = nxt + 1) {
int val, n; const char *value;
int n;
for (nxt = i; env[nxt] != '\0'; ++nxt) for (nxt = p; *nxt != '\0'; ++nxt)
if (nxt >= CONFIG_ENV_SIZE) if (nxt - env >= CONFIG_ENV_SIZE)
return -1; return -1;
val = env_match(env, name, i); value = env_match(p, name);
if (val < 0) if (value == NULL)
continue; continue;
/* found; copy out */ /* found; copy out */
for (n = 0; n < len; ++n, ++buf) { for (n = 0; n < len; ++n, ++buf) {
*buf = env[val++]; *buf = *value++;
if (*buf == '\0') if (*buf == '\0')
return n; return n;
} }