ALSA: jack: Improve string handling in jack_kctl_name_gen
PATCH 1/1 ALSA: jack: Improve string handling in jack_kctl_name_gen
If appending " Jack" is not necessary, replace snprintf("%s", ...) with the faster strscpy().
Additionally, rename 'need_cat' to the clearer 'append_suf', use local variables for the suffix and its length, remove the confusing comment, compare strncmp() to 0, and use 'size_t' for the 'size' function parameter.
Signed-off-by Thorsten Blum <[email protected]>
--- sound/core/ctljack.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
sound/core/ctljack.c +11 -7
@@ -7,6 +7,7 @@#include <linux/kernel.h> #include <linux/export.h> +#include <linux/string.h> #include <sound/core.h> #include <sound/control.h>
@@ -46,17 +47,20 @@ static int get_available_index(struct snd_card *card, const char *name)return sid.index; } -static void jack_kctl_name_gen (char *name,const char *src_name,int size) +static void jack_kctl_name_gen (char *name,const char *src_name,size_t size) {size_t count =strlen (src_name); -bool need_cat = true; +const char *suf =" Jack" ; +size_t suf_len =strlen (suf); +bool append_suf = true; -/* remove redundant " Jack" from src_name */ -if (count >=5 ) - need_cat =strncmp (&src_name[count -5 ]," Jack" ,5 ) ? true : false; - -snprintf (name, size, need_cat ?"%s Jack" :"%s" , src_name); +if (count >= suf_len) + append_suf =strncmp (&src_name[count - suf_len], suf, suf_len) !=0 ; +if (append_suf) +snprintf (name, size,"%s%s" , src_name, suf); +else +strscpy (name, src_name, size); } struct snd_kcontrol *
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
Takashi Iwai
AppliedQuoted 10 lines · Thorsten Blum
If appending " Jack" is not necessary, replace
snprintf("%s", ...)with the fasterstrscpy().Additionally, rename '
need_cat' to the clearer 'append_suf', use local variables for the suffix and its length, remove the confusing comment, comparestrncmp()to 0, and use 'size_t' for the 'size' function parameter.Signed-off-by Thorsten Blum <[email protected]>
Thanks, applied to for-next branch.
Takashi