[PATCH] ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning

[PATCH] ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning

[Peter Ujfalusi]

The recent enablement of -Wformat-truncation leads to a false-positive
warning for mixer_scarlett_gen2.c.

For suppressing the warning, replace snprintf() with scnprintf().
As stated in the above, truncation doesn't matter.

Fixes: 78bd8f5126f8 ("ALSA: usb-audio: scarlett_gen2: Fix -Wformat-truncation warning")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 sound/usb/mixer_scarlett_gen2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index e0242b38b3f7..23aab1947958 100644
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -3195,8 +3195,8 @@ static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer)
 	/* Add input phantom controls */
 	if (info->inputs_per_phantom == 1) {
 		for (i = 0; i < info->phantom_count; i++) {
-			snprintf(s, sizeof(s), fmt, i + 1,
-				 "Phantom Power", "Switch");
+			scnprintf(s, sizeof(s), fmt, i + 1,
+				  "Phantom Power", "Switch");
 			err = scarlett2_add_new_ctl(
 				mixer, &scarlett2_phantom_ctl,
 				i, 1, s, &private->phantom_ctls[i]);
-- 
2.42.0

Re: [PATCH] ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning

[Takashi Iwai]

On Tue, 19 Sep 2023 09:12:05 +0200,
Peter Ujfalusi wrote:
> 
> The recent enablement of -Wformat-truncation leads to a false-positive
> warning for mixer_scarlett_gen2.c.
> 
> For suppressing the warning, replace snprintf() with scnprintf().
> As stated in the above, truncation doesn't matter.
> 
> Fixes: 78bd8f5126f8 ("ALSA: usb-audio: scarlett_gen2: Fix -Wformat-truncation warning")
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

While I applied it now, I wonder why this didn't show up with my local
test.  Which compiler are you using?


thanks,

Takashi

Re: [PATCH] ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning

[Péter Ujfalusi]

On 19/09/2023 10:19, Takashi Iwai wrote:
> On Tue, 19 Sep 2023 09:12:05 +0200,
> Peter Ujfalusi wrote:
>>
>> The recent enablement of -Wformat-truncation leads to a false-positive
>> warning for mixer_scarlett_gen2.c.
>>
>> For suppressing the warning, replace snprintf() with scnprintf().
>> As stated in the above, truncation doesn't matter.
>>
>> Fixes: 78bd8f5126f8 ("ALSA: usb-audio: scarlett_gen2: Fix -Wformat-truncation warning")
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
> 
> While I applied it now, I wonder why this didn't show up with my local
> test.

I wondered about the same thing...

> Which compiler are you using?

$ gcc --version
gcc (GCC) 13.2.1 20230801

-- 
Péter

Re: [PATCH] ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning

[Takashi Iwai]

On Tue, 19 Sep 2023 09:22:58 +0200,
Péter Ujfalusi wrote:
> 
> 
> 
> On 19/09/2023 10:19, Takashi Iwai wrote:
> > On Tue, 19 Sep 2023 09:12:05 +0200,
> > Peter Ujfalusi wrote:
> >>
> >> The recent enablement of -Wformat-truncation leads to a false-positive
> >> warning for mixer_scarlett_gen2.c.
> >>
> >> For suppressing the warning, replace snprintf() with scnprintf().
> >> As stated in the above, truncation doesn't matter.
> >>
> >> Fixes: 78bd8f5126f8 ("ALSA: usb-audio: scarlett_gen2: Fix -Wformat-truncation warning")
> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
> > 
> > While I applied it now, I wonder why this didn't show up with my local
> > test.
> 
> I wondered about the same thing...
> 
> > Which compiler are you using?
> 
> $ gcc --version
> gcc (GCC) 13.2.1 20230801

Ah mine is still gcc12, and this might be.


Takashi