Re: [PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image()

[John Snow]

On Mon, Oct 9, 2023 at 6:03 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> Rename the variable to fix:
>
>   tests/qtest/cdrom-test.c:40:50: error: declaration shadows a variable in 
> the global scope [-Werror,-Wshadow]
>   static int prepare_image(const char *arch, char *isoimage)
>                                                    ^
>   tests/qtest/cdrom-test.c:18:13: note: previous declaration is here
>   static char isoimage[] = "cdrom-boot-iso-XXXXXX";
>               ^
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>  tests/qtest/cdrom-test.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
> index f2a8d91929..0945383789 100644
> --- a/tests/qtest/cdrom-test.c
> +++ b/tests/qtest/cdrom-test.c
> @@ -37,17 +37,17 @@ static int exec_xorrisofs(const char **args)
>      return exit_status;
>  }
>
> -static int prepare_image(const char *arch, char *isoimage)
> +static int prepare_image(const char *arch, char *isoimagepath)
>  {
>      char srcdir[] = "cdrom-test-dir-XXXXXX";
>      char *codefile = NULL;
>      int ifh, ret = -1;
>      const char *args[] = {
>          "xorrisofs", "-quiet", "-l", "-no-emul-boot",
> -        "-b", NULL, "-o", isoimage, srcdir, NULL
> +        "-b", NULL, "-o", isoimagepath, srcdir, NULL
>      };
>
> -    ifh = mkstemp(isoimage);
> +    ifh = mkstemp(isoimagepath);
>      if (ifh < 0) {
>          perror("Error creating temporary iso image file");
>          return -1;
> --
> 2.41.0
>