Re: [PATCH v2 04/13] env: Change env_match() to static and remove from header

Simon Glass
2021-10-14T15:15:05Z

Hi Marek,

On Wed, 13 Oct 2021 at 09:46, Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> 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>
> ---
> cmd/nvedit.c | 30 +++++++++++++++---------------
> include/env.h | 11 -----------
> 2 files changed, 15 insertions(+), 26 deletions(-)
>
> diff --git a/cmd/nvedit.c b/cmd/nvedit.c
> index ddc715b4f9..742e0924af 100644
> --- a/cmd/nvedit.c
> +++ b/cmd/nvedit.c
> @@ -706,6 +706,21 @@ char *from_env(const char *envvar)
> return ret;
> }
>

Please can you add the function comment here? We don't want to lose it.

> +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.
> */
> @@ -816,21 +831,6 @@ static int do_env_select(struct cmd_tbl *cmdtp, int flag, int argc,
>
> #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
> static int do_env_default(struct cmd_tbl *cmdtp, int flag,
> int argc, char *const argv[])
> diff --git a/include/env.h b/include/env.h
> index b1a4003681..a9b2a4c8b2 100644
> --- a/include/env.h
> +++ b/include/env.h
> @@ -90,17 +90,6 @@ int env_init(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
> *
> --
> 2.32.0
>

Regards,
Simon