From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>
Subject: [PULL 10/32] hw/audio/soundhw: Clean up global variable shadowing
Date: Fri, 6 Oct 2023 13:36:35 +0200 [thread overview]
Message-ID: <20231006113657.3803180-11-armbru@redhat.com> (raw)
In-Reply-To: <20231006113657.3803180-1-armbru@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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>
---
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
next prev parent reply other threads:[~2023-10-06 11:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 11:36 [PULL 00/32] -Wshadow=local patches patches for 2023-10-06 Markus Armbruster
2023-10-06 11:36 ` [PULL 01/32] hw/cxl: Fix local variable shadowing of cap_hdrs Markus Armbruster
2023-10-06 11:36 ` [PULL 02/32] target/loongarch: Clean up local variable shadowing Markus Armbruster
2023-10-06 11:36 ` [PULL 03/32] target/ppc: Rename variables to avoid local variable shadowing in VUPKPX Markus Armbruster
2023-10-06 11:36 ` [PULL 04/32] hw/i386: changes towards enabling -Wshadow=local for x86 machines Markus Armbruster
2023-10-06 11:36 ` [PULL 05/32] audio/ossaudio: Fix compiler warning with -Wshadow Markus Armbruster
2023-10-06 11:36 ` [PULL 06/32] hw/net/vhost_net: Silence compiler warning when compiling " Markus Armbruster
2023-10-06 11:36 ` [PULL 07/32] hw/virtio/virtio-pci: Avoid compiler warning " Markus Armbruster
2023-10-06 11:36 ` [PULL 08/32] hw/virtio/vhost: Silence compiler warnings in vhost code when using -Wshadow Markus Armbruster
2023-10-06 11:36 ` [PULL 09/32] dump: Silence compiler warning in dump code when compiling with -Wshadow Markus Armbruster
2023-10-06 11:36 ` Markus Armbruster [this message]
2023-10-06 11:36 ` [PULL 11/32] hw/ide/ahci: Clean up local variable shadowing Markus Armbruster
2023-10-06 11:36 ` [PULL 12/32] net/net: Clean up global " Markus Armbruster
2023-10-06 11:36 ` [PULL 13/32] os-posix: " Markus Armbruster
2023-10-06 11:36 ` [PULL 14/32] plugins/loader: " Markus Armbruster
2023-10-06 11:36 ` [PULL 15/32] qemu-img: " Markus Armbruster
2023-10-06 11:36 ` [PULL 16/32] qemu-io: " Markus Armbruster
2023-10-06 11:36 ` [PULL 17/32] qom/object_interfaces: " Markus Armbruster
2023-10-06 11:36 ` [PULL 18/32] semihosting: " Markus Armbruster
2023-10-06 11:36 ` [PULL 19/32] ui/cocoa: " Markus Armbruster
2023-10-06 11:36 ` [PULL 20/32] util/cutils: Clean up global variable shadowing in get_relocated_path() Markus Armbruster
2023-10-06 11:36 ` [PULL 21/32] util/guest-random: Clean up global variable shadowing Markus Armbruster
2023-10-06 11:36 ` [PULL 22/32] semihosting/arm-compat: Clean up local " Markus Armbruster
2023-10-06 11:36 ` [PULL 23/32] softmmu/vl: Clean up global " Markus Armbruster
2023-10-06 11:36 ` [PULL 24/32] sysemu/tpm: " Markus Armbruster
2023-10-06 11:36 ` [PULL 25/32] trace/control: " Markus Armbruster
2023-10-06 11:36 ` [PULL 26/32] target/ppc: Clean up local variable shadowing in kvm_arch_*_registers() Markus Armbruster
2023-10-06 11:36 ` [PULL 27/32] hw/usb: Silence compiler warnings in USB code when compiling with -Wshadow Markus Armbruster
2023-10-06 11:36 ` [PULL 28/32] linux-user/flatload: clean up local variable shadowing Markus Armbruster
2023-10-06 11:36 ` [PULL 29/32] linux-user/mmap.c: " Markus Armbruster
2023-10-06 11:36 ` [PULL 30/32] linux-user/syscall.c: clean up local variable shadowing in do_ioctl_dm() Markus Armbruster
2023-10-06 11:36 ` [PULL 31/32] linux-user/syscall.c: clean up local variable shadowing in TARGET_NR_getcpu Markus Armbruster
2023-10-06 11:36 ` [PULL 32/32] linux-user/syscall.c: clean up local variable shadowing in xattr syscalls Markus Armbruster
2023-10-10 1:28 ` [PULL 00/32] -Wshadow=local patches patches for 2023-10-06 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231006113657.3803180-11-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).