Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] sound: strlcpy is smart enough

Browse source 
strlcpy already accounts for the trailing zero in its length
computation, so there is no need to substract one to the buffer size.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Jean Delvare 2007-03-27 11:50:19 +02:00 committed by Jaroslav Kysela
parent 523f1dce37
commit 023ff3eee6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/aoa/codecs/snd-aoa-codec-onyx.c
View file

@ -1018,7 +1018,7 @@ static int onyx_create(struct i2c_adapter *adapter,
onyx->i2c.driver = &onyx_driver; onyx->i2c.driver = &onyx_driver;
onyx->i2c.adapter = adapter; onyx->i2c.adapter = adapter;
onyx->i2c.addr = addr & 0x7f; onyx->i2c.addr = addr & 0x7f;
strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE-1); strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE);
if (i2c_attach_client(&onyx->i2c)) { if (i2c_attach_client(&onyx->i2c)) {
printk(KERN_ERR PFX "failed to attach to i2c\n"); printk(KERN_ERR PFX "failed to attach to i2c\n");
@ -1033,7 +1033,7 @@ static int onyx_create(struct i2c_adapter *adapter,
goto fail; goto fail;
} }
strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN-1); strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);
onyx->codec.owner = THIS_MODULE; onyx->codec.owner = THIS_MODULE;
onyx->codec.init = onyx_init_codec; onyx->codec.init = onyx_init_codec;
onyx->codec.exit = onyx_exit_codec; onyx->codec.exit = onyx_exit_codec;

4
sound/aoa/codecs/snd-aoa-codec-tas.c
View file

@ -899,14 +899,14 @@ static int tas_create(struct i2c_adapter *adapter,
tas->i2c.addr = addr; tas->i2c.addr = addr;
/* seems that half is a saner default */ /* seems that half is a saner default */
tas->drc_range = TAS3004_DRC_MAX / 2; tas->drc_range = TAS3004_DRC_MAX / 2;
strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE-1); strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE);
if (i2c_attach_client(&tas->i2c)) { if (i2c_attach_client(&tas->i2c)) {
printk(KERN_ERR PFX "failed to attach to i2c\n"); printk(KERN_ERR PFX "failed to attach to i2c\n");
goto fail; goto fail;
} }
strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN-1); strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);
tas->codec.owner = THIS_MODULE; tas->codec.owner = THIS_MODULE;
tas->codec.init = tas_init_codec; tas->codec.init = tas_init_codec;
tas->codec.exit = tas_exit_codec; tas->codec.exit = tas_exit_codec;