ALSA: mixer_oss: Remove deprecated strcpy() function calls
PATCH v2 1/1 ALSA: mixer_oss: Remove deprecated strcpy() function calls
Remove the deprecated strcpy() function calls and assign the strings directly to a 'char *' instead.
Use 'if/else if' instead of two separate if statements.
No functional changes intended.
---
Changes in v2:
- Assign the strings directly as suggested by Al and Takashi
- Use if/else if instead of if/if
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
--- sound/core/oss/mixer_oss.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/core/oss/mixer_oss.c +5 -5
@@ -991,7 +991,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,struct slot *pslot;struct snd_kcontrol *kctl;struct snd_mixer_oss_slot *rslot; -char str[64 ]; +const char *str;/* check if already assigned */ if (mixer->slots[ptr->oss_id].get_volume && ! replace_old)
@@ -1014,11 +1014,11 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,if (kctl->info (kctl, uinfo))return 0 ; -strcpy (str, ptr->name); + str = ptr->name;if (!strcmp (str,"Master" )) -strcpy (str,"Mix" ); -if (!strcmp (str,"Master Mono" )) -strcpy (str,"Mix Mono" ); + str ="Mix" ; +else if (!strcmp (str,"Master Mono" )) + str ="Mix Mono" ; slot.capture_item =0 ;if (!strcmp (uinfo->value.enumerated.name, str)) { slot.present |=SNDRV_MIXER_OSS_PRESENT_CAPTURE ;
Signature · 1 line
2.49.0
Quoted 8 lines · Thorsten Blum
Remove the deprecated
strcpy()function calls and assign the strings directly to a 'char *' instead.Use 'if/else if' instead of two separate if statements.
No functional changes intended.
Quoted 7 lines
Signed-off-by Thorsten Blum <[email protected]>---
Changes in v2:
- Assign the strings directly as suggested by Al and Takashi
- Use if/else if instead of if/if
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
Applied now. Thanks.
Takashi