Re: [PATCH 10/13] ALSA: firewire: Fix -Wformat-truncation warning for longname string

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Fri, Sep 15, 2023 at 10:27:59AM +0200, Takashi Iwai wrote:
> The filling of card->longname can be gracefully truncated, as it's
> only informative.  Use scnprintf() and suppress the superfluous
> compile warning with -Wformat-truncation.
> 
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> ---
>  sound/firewire/fireworks/fireworks.c | 10 +++++-----
>  sound/firewire/oxfw/oxfw.c           | 10 +++++-----
>  2 files changed, 10 insertions(+), 10 deletions(-)

Reviewed-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
Tested-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>

> diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
> index dd4298876ac0..e3ed4e094ccd 100644
> --- a/sound/firewire/fireworks/fireworks.c
> +++ b/sound/firewire/fireworks/fireworks.c
> @@ -93,11 +93,11 @@ get_hardware_info(struct snd_efw *efw)
>  	strcpy(efw->card->driver, "Fireworks");
>  	strcpy(efw->card->shortname, hwinfo->model_name);
>  	strcpy(efw->card->mixername, hwinfo->model_name);
> -	snprintf(efw->card->longname, sizeof(efw->card->longname),
> -		 "%s %s v%s, GUID %08x%08x at %s, S%d",
> -		 hwinfo->vendor_name, hwinfo->model_name, version,
> -		 hwinfo->guid_hi, hwinfo->guid_lo,
> -		 dev_name(&efw->unit->device), 100 << fw_dev->max_speed);
> +	scnprintf(efw->card->longname, sizeof(efw->card->longname),
> +		  "%s %s v%s, GUID %08x%08x at %s, S%d",
> +		  hwinfo->vendor_name, hwinfo->model_name, version,
> +		  hwinfo->guid_hi, hwinfo->guid_lo,
> +		  dev_name(&efw->unit->device), 100 << fw_dev->max_speed);
>  
>  	if (hwinfo->flags & BIT(FLAG_RESP_ADDR_CHANGABLE))
>  		efw->resp_addr_changable = true;
> diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
> index 63d40f1a914f..241a697ce26b 100644
> --- a/sound/firewire/oxfw/oxfw.c
> +++ b/sound/firewire/oxfw/oxfw.c
> @@ -108,11 +108,11 @@ static int name_card(struct snd_oxfw *oxfw, const struct ieee1394_device_id *ent
>  	strcpy(oxfw->card->mixername, m);
>  	strcpy(oxfw->card->shortname, m);
>  
> -	snprintf(oxfw->card->longname, sizeof(oxfw->card->longname),
> -		 "%s %s (OXFW%x %04x), GUID %08x%08x at %s, S%d",
> -		 v, m, firmware >> 20, firmware & 0xffff,
> -		 fw_dev->config_rom[3], fw_dev->config_rom[4],
> -		 dev_name(&oxfw->unit->device), 100 << fw_dev->max_speed);
> +	scnprintf(oxfw->card->longname, sizeof(oxfw->card->longname),
> +		  "%s %s (OXFW%x %04x), GUID %08x%08x at %s, S%d",
> +		  v, m, firmware >> 20, firmware & 0xffff,
> +		  fw_dev->config_rom[3], fw_dev->config_rom[4],
> +		  dev_name(&oxfw->unit->device), 100 << fw_dev->max_speed);
>  end:
>  	return err;
>  }
> -- 
> 2.35.3

Thanks

Takashi Sakamoto



[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux