audio/ossaudio: Fix compiler warning with -Wshadow

[PATCH] audio/ossaudio: Fix compiler warning with -Wshadow

Posted by Thomas Huth 7 months ago

The "err" variable is only used twice in this code, in a very
local fashion of first assigning it and then checking it in the
next line. So there is no need to declare this variable a second
time in the innermost block, we can re-use the variable that is
declared at the beginning of the function. This fixes the compiler
warning that occurs with "-Wshadow".

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 audio/ossaudio.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 3f31852371..c5858284a1 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -549,7 +549,6 @@ static int oss_init_out(HWVoiceOut *hw, struct audsettings *as,
                        hw->size_emul);
             hw->buf_emul = NULL;
         } else {
-            int err;
             int trig = 0;
             if (ioctl (fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) {
                 oss_logerr (errno, "SNDCTL_DSP_SETTRIGGER 0 failed\n");
-- 
2.41.0

Re: [PATCH] audio/ossaudio: Fix compiler warning with -Wshadow

Posted by Markus Armbruster 7 months ago

Thomas Huth <thuth@redhat.com> writes:

> The "err" variable is only used twice in this code, in a very
> local fashion of first assigning it and then checking it in the
> next line. So there is no need to declare this variable a second
> time in the innermost block, we can re-use the variable that is
> declared at the beginning of the function. This fixes the compiler
> warning that occurs with "-Wshadow".
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued.  Thanks!

Re: [PATCH] audio/ossaudio: Fix compiler warning with -Wshadow

Posted by Philippe Mathieu-Daudé 7 months ago

On 4/10/23 10:39, Thomas Huth wrote:
> The "err" variable is only used twice in this code, in a very
> local fashion of first assigning it and then checking it in the
> next line. So there is no need to declare this variable a second
> time in the innermost block, we can re-use the variable that is
> declared at the beginning of the function. This fixes the compiler
> warning that occurs with "-Wshadow".
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   audio/ossaudio.c | 1 -
>   1 file changed, 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>