[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/16] hw/audio/soundhw: Clean up global variable shadowing
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 01/16] hw/audio/soundhw: Clean up global variable shadowing |
Date: |
Wed, 4 Oct 2023 14:00:04 +0200 |
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>
---
include/hw/audio/soundhw.h | 2 +-
hw/audio/soundhw.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/audio/soundhw.h b/include/hw/audio/soundhw.h
index 270717a06a..474c5ff94e 100644
--- a/include/hw/audio/soundhw.h
+++ b/include/hw/audio/soundhw.h
@@ -8,6 +8,6 @@ void deprecated_register_soundhw(const char *name, const char
*descr,
void soundhw_init(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
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 94d9463e42..b387b0ef7d 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -83,7 +83,7 @@ void show_valid_soundhw(void)
static struct soundhw *selected = NULL;
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;
@@ -92,7 +92,7 @@ void select_soundhw(const char *optarg, const char *audiodev)
}
for (c = soundhw; c->name; ++c) {
- if (g_str_equal(c->name, optarg)) {
+ if (g_str_equal(c->name, name)) {
selected = c;
audiodev_id = audiodev;
break;
@@ -100,7 +100,7 @@ void select_soundhw(const char *optarg, const char
*audiodev)
}
if (!c->name) {
- error_report("Unknown sound card name `%s'", optarg);
+ error_report("Unknown sound card name `%s'", name);
show_valid_soundhw();
exit(1);
}
--
2.41.0
- [PATCH v3 00/16] (few more) Steps towards enabling -Wshadow, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH v3 01/16] hw/audio/soundhw: Clean up global variable shadowing,
Philippe Mathieu-Daudé <=
- [PATCH v3 02/16] hw/ide/ahci: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH v3 05/16] plugins/loader: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH v3 04/16] os-posix: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH v3 08/16] qom/object_interfaces: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH v3 09/16] semihosting: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/04