diff options
| author | Marek Behún <marek.behun@nic.cz> | 2021-10-17 18:36:30 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-10-21 21:50:48 +0300 |
| commit | 52f9ed34cb3768663ee9c2e5d980143e8ac783a9 (patch) | |
| tree | 3ed3975ae5952d9b2f503884e05ef63ffb29058c /cmd | |
| parent | 7b611ee90e1e4db531c4e3896efebfdc0743725d (diff) | |
| download | u-boot-52f9ed34cb3768663ee9c2e5d980143e8ac783a9.tar.xz | |
env: Inline env_get_char() into its only user
This function is a relic from the past when environment was read from
underlying device one character at a time.
It is used only in the case when getting an environemnt variable prior
relocation, and the function is simple enough to be inlined there.
Since env_get_char() is being changed to simple access to an array, we
can drop the failing cases and simplify the code (this could have been
done before, since env_get_char() did not fail even before).
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/nvedit.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 742e0924af..3952deda1b 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -706,16 +706,16 @@ char *from_env(const char *envvar) return ret; } -static int env_match(uchar *s1, int i2) +static int env_match(const char *env, const char *s1, int i2) { if (s1 == NULL) return -1; - while (*s1 == env_get_char(i2++)) + while (*s1 == env[i2++]) if (*s1++ == '=') return i2; - if (*s1 == '\0' && env_get_char(i2-1) == '=') + if (*s1 == '\0' && env[i2-1] == '=') return i2; return -1; @@ -726,28 +726,28 @@ static int env_match(uchar *s1, int i2) */ int env_get_f(const char *name, char *buf, unsigned len) { - int i, nxt, c; + const char *env; + int i, nxt; - for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) { + if (gd->env_valid == ENV_INVALID) + env = (const char *)default_environment; + else + env = (const char *)gd->env_addr; + + for (i = 0; env[i] != '\0'; i = nxt + 1) { int val, n; - for (nxt = i; (c = env_get_char(nxt)) != '\0'; ++nxt) { - if (c < 0) - return c; + for (nxt = i; env[nxt] != '\0'; ++nxt) if (nxt >= CONFIG_ENV_SIZE) return -1; - } - val = env_match((uchar *)name, i); + val = env_match(env, name, i); if (val < 0) continue; /* found; copy out */ for (n = 0; n < len; ++n, ++buf) { - c = env_get_char(val++); - if (c < 0) - return c; - *buf = c; + *buf = env[val++]; if (*buf == '\0') return n; } |