audio/mixeng: Do not declare unused variables

[PATCH] audio/mixeng: Do not declare unused variables

Posted by Akihiko Odaki 2 years, 1 month ago

The unused variables when FLOAT_MIXENG is defined caused warnings on
Apple clang version 13.1.6 (clang-1316.0.21.2).

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
 audio/mixeng.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/mixeng.c b/audio/mixeng.c
index f27deb165b6..100a306d6fe 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -342,13 +342,13 @@ f_sample *mixeng_clip_float[2] = {
 void audio_sample_to_uint64(const void *samples, int pos,
                             uint64_t *left, uint64_t *right)
 {
-    const struct st_sample *sample = samples;
-    sample += pos;
 #ifdef FLOAT_MIXENG
     error_report(
         "Coreaudio and floating point samples are not supported by replay yet");
     abort();
 #else
+    const struct st_sample *sample = samples;
+    sample += pos;
     *left = sample->l;
     *right = sample->r;
 #endif
@@ -357,13 +357,13 @@ void audio_sample_to_uint64(const void *samples, int pos,
 void audio_sample_from_uint64(void *samples, int pos,
                             uint64_t left, uint64_t right)
 {
-    struct st_sample *sample = samples;
-    sample += pos;
 #ifdef FLOAT_MIXENG
     error_report(
         "Coreaudio and floating point samples are not supported by replay yet");
     abort();
 #else
+    struct st_sample *sample = samples;
+    sample += pos;
     sample->l = left;
     sample->r = right;
 #endif
-- 
2.32.0 (Apple Git-132)

Re: [PATCH] audio/mixeng: Do not declare unused variables

Posted by Philippe Mathieu-Daudé 2 years, 1 month ago

On 16/3/22 07:10, Akihiko Odaki wrote:
> The unused variables when FLOAT_MIXENG is defined caused warnings on
> Apple clang version 13.1.6 (clang-1316.0.21.2).
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>   audio/mixeng.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH] audio/mixeng: Do not declare unused variables

Posted by Philippe Mathieu-Daudé 2 years, 1 month ago

On 16/3/22 07:10, Akihiko Odaki wrote:
> The unused variables when FLOAT_MIXENG is defined caused warnings on
> Apple clang version 13.1.6 (clang-1316.0.21.2).
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>   audio/mixeng.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)

FWIW this patch is already in the tree as commit 832061a2fa.