ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/m68k: Clean up local variable shadowing 

Fix:

  hw/m68k/virt.c:263:13: error: declaration shadows a local variable [-Werror,-Wshadow]
            BOOTINFOSTR(param_ptr, BI_COMMAND_LINE,
            ^
  hw/m68k/bootinfo.h:47:13: note: expanded from macro 'BOOTINFOSTR'
        int i; \
            ^
  hw/m68k/virt.c:130:9: note: previous declaration is here
    int i;
        ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-13-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-09-04 18:12:24 +02:00 committed by Markus Armbruster
parent 2f6037a235
commit 5f87dddbc2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/m68k/bootinfo.h
View File

@ -44,15 +44,14 @@
#define BOOTINFOSTR(base, id, string) \
do { \
int i; \
stw_p(base, id); \
base += 2; \
stw_p(base, \
(sizeof(struct bi_record) + strlen(string) + \
1 /* null termination */ + 3 /* padding */) & ~3); \
base += 2; \
for (i = 0; string[i]; i++) { \
stb_p(base++, string[i]); \
for (unsigned i_ = 0; string[i_]; i_++) { \
stb_p(base++, string[i_]); \
} \
stb_p(base++, 0); \
base = QEMU_ALIGN_PTR_UP(base, 4); \
@ -60,7 +59,6 @@
#define BOOTINFODATA(base, id, data, len) \
do { \
int i; \
stw_p(base, id); \
base += 2; \
stw_p(base, \
@ -69,8 +67,8 @@
base += 2; \
stw_p(base, len); \
base += 2; \
for (i = 0; i < len; ++i) { \
stb_p(base++, data[i]); \
for (unsigned i_ = 0; i_ < len; ++i_) { \
stb_p(base++, data[i_]); \
} \
base = QEMU_ALIGN_PTR_UP(base, 4); \
} while (0)