From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Wed, 4 Oct 2023 12:00:14 +0000 (+0200)
Subject: util/cutils: Clean up global variable shadowing in get_relocated_path()
X-Git-Tag: v8.2.0-rc0~86^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bebe03f51991ad92ae1220111eda5c7a0e70289;p=thirdparty%2Fqemu.git

util/cutils: Clean up global variable shadowing in get_relocated_path()

Fix:

  util/cutils.c:1147:17: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
      const char *exec_dir = qemu_get_exec_dir();
                  ^
  util/cutils.c:1035:20: note: previous declaration is here
  static const char *exec_dir;
                     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004120019.93101-12-philmd@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/util/cutils.c b/util/cutils.c
index 25373198adc..b44718a6a23 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -1144,7 +1144,6 @@ char *get_relocated_path(const char *dir)
 {
     size_t prefix_len = strlen(CONFIG_PREFIX);
     const char *bindir = CONFIG_BINDIR;
-    const char *exec_dir = qemu_get_exec_dir();
     GString *result;
     int len_dir, len_bindir;