tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: opti9x: Fix -Wformat-truncation warning

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.

Link: https://lore.kernel.org/r/20230915082802.28684-9-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai bc44e10a 1e97acf3

+12 -12
+4 -4
sound/isa/opti9xx/miro.c
··· 1344 1344 } 1345 1345 1346 1346 strcpy(card->driver, "miro"); 1347 - snprintf(card->longname, sizeof(card->longname), 1348 - "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d", 1349 - card->shortname, miro->name, codec->pcm->name, 1350 - miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2); 1347 + scnprintf(card->longname, sizeof(card->longname), 1348 + "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d", 1349 + card->shortname, miro->name, codec->pcm->name, 1350 + miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2); 1351 1351 1352 1352 if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT) 1353 1353 rmidi = NULL;
+8 -8
sound/isa/opti9xx/opti92x-ad1848.c
··· 859 859 strcpy(card->driver, chip->name); 860 860 sprintf(card->shortname, "OPTi %s", card->driver); 861 861 #if defined(CS4231) || defined(OPTi93X) 862 - snprintf(card->longname, sizeof(card->longname), 863 - "%s, %s at 0x%lx, irq %d, dma %d&%d", 864 - card->shortname, codec->pcm->name, 865 - chip->wss_base + 4, irq, dma1, xdma2); 862 + scnprintf(card->longname, sizeof(card->longname), 863 + "%s, %s at 0x%lx, irq %d, dma %d&%d", 864 + card->shortname, codec->pcm->name, 865 + chip->wss_base + 4, irq, dma1, xdma2); 866 866 #else 867 - snprintf(card->longname, sizeof(card->longname), 868 - "%s, %s at 0x%lx, irq %d, dma %d", 869 - card->shortname, codec->pcm->name, chip->wss_base + 4, irq, 870 - dma1); 867 + scnprintf(card->longname, sizeof(card->longname), 868 + "%s, %s at 0x%lx, irq %d, dma %d", 869 + card->shortname, codec->pcm->name, chip->wss_base + 4, irq, 870 + dma1); 871 871 #endif /* CS4231 || OPTi93X */ 872 872 873 873 if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)