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

hw/audio/soundhw: Clean up global variable shadowing 

Fix:

  hw/audio/soundhw.c:86:33: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  void select_soundhw(const char *optarg, const char *audiodev)
                                  ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/getopt.h:77:14: note: previous declaration is here
  extern char *optarg;                    /* getopt(3) external variables */
               ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004120019.93101-2-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@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-10-04 14:00:04 +02:00 committed by Markus Armbruster
parent 71efffbcfc
commit badf708d69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/audio/soundhw.c
View File

@ -83,7 +83,7 @@ void show_valid_soundhw(void)
static struct soundhw *selected = NULL; static struct soundhw *selected = NULL;
static const char *audiodev_id; static const char *audiodev_id;
void select_soundhw(const char *optarg, const char *audiodev) void select_soundhw(const char *name, const char *audiodev)
{ {
struct soundhw *c; struct soundhw *c;
@ -92,7 +92,7 @@ void select_soundhw(const char *optarg, const char *audiodev)
} }
for (c = soundhw; c->name; ++c) { for (c = soundhw; c->name; ++c) {
if (g_str_equal(c->name, optarg)) { if (g_str_equal(c->name, name)) {
selected = c; selected = c;
audiodev_id = audiodev; audiodev_id = audiodev;
break; break;
@ -100,7 +100,7 @@ void select_soundhw(const char *optarg, const char *audiodev)
} }
if (!c->name) { if (!c->name) {
error_report("Unknown sound card name `%s'", optarg); error_report("Unknown sound card name `%s'", name);
show_valid_soundhw(); show_valid_soundhw();
exit(1); exit(1);
} }

2
include/hw/audio/soundhw.h
View File

@ -8,6 +8,6 @@ void deprecated_register_soundhw(const char *name, const char *descr,
void soundhw_init(void); void soundhw_init(void);
void show_valid_soundhw(void); void show_valid_soundhw(void);
void select_soundhw(const char *optarg, const char *audiodev); void select_soundhw(const char *name, const char *audiodev);
#endif #endif