starfive-tech/u-boot.git/cmd/nvedit.c, branch master

env: Move non-cli env functions to env/common.c

2021-10-21T18:50:48+00:00

Move the following functions from cmd/nvedit.c to env/common.c: env_set_ulong() env_set_hex() env_get_hex() eth_env_get_enetaddr() eth_env_set_enetaddr() env_get() from_env() env_get_f() env_get_ulong() since these functions are not specific for U-Boot's CLI. We leave env_set() in cmd/nvedit.c, since it calls _do_env_set(), which is a static function in that file. Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Simplify env_match() and inline into env_get_f()

2021-10-21T18:50:48+00:00

In the past the env_match() function was used to match envs with - name, i.e. string "name" - variable assignment, i.e. string "name=other_value" The latter is not the case anymore, since the env_match() function is now used only in env_get_f(), and so we can simplify the function into a simple strncmp() with an additional comparison to '='. Let's do this, and since the resulting function is quite simple, let's also inline its code into env_get_f(). Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Use memcpy() instead of ad-hoc code to copy variable value

2021-10-21T18:50:48+00:00

Copy the value of the found variable into given buffer with memcpy() instead of ad-hoc code. Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Make return value of env_get_f() behave like sprintf() on success

2021-10-21T18:50:48+00:00

Currently the env_get_f() function's return value behaves weirdly: it returns the number of bytes written into `buf`, but whether this is excluding the terminating NULL-byte or including it depends on whether there was enough space in `buf`. Change the function to always return the actual length of the value of the environment variable (excluding the terminating NULL-byte) on success. This makes it behave like sprintf(). All users of this function in U-Boot are compatible with this change. Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Early return from env_get_f() on NULL name

2021-10-21T18:50:48+00:00

Test non-NULL name immediately, not in env_match(). Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Don't match empty variable name in env_match()

2021-10-21T18:50:48+00:00

Do we really allow zero-length variable name? I guess not. Signed-off-by: Marek Behún Reviewed-by: Simon Glass

env: Use better name for variable in env_get_f()

2021-10-21T18:50:48+00:00

The `nxt` variable actually points to the terminating null-byte of the current env var, and the next env var is at `nxt + 1`, not `nxt`. So a better name for this variable is `end`. Signed-off-by: Marek Behún Reviewed-by: Simon Glass

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

2021-10-21T18:50:48+00:00

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 Reviewed-by: Simon Glass

env: Inline env_get_char() into its only user

2021-10-21T18:50:48+00:00

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 Reviewed-by: Simon Glass

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

2021-10-21T18:50:48+00:00

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 Reviewed-by: Simon Glass