Replace unsafe characters with _ in card name
PATCH v2 1/1 Replace unsafe characters with _ in card name
Otherwise, they get misinterpreted as argument separators in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries from working.
While at it, add my Logitec C910 webcam to the SPDIF blacklist.
Signed-off-by Alexander E. Patrakov <[email protected]>
---
v2: Fixed misplaced NULL check for tmp->u.string
include/conf.h | 1 + src/conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/cards/USB-Audio.conf | 3 ++- src/confmisc.c | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-)
include/conf.h +1 -0
@@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const longint snd_config_imake_integer64 (snd_config_t **config,const char *key,const long long value);int snd_config_imake_real (snd_config_t **config,const char *key,const double value);int snd_config_imake_string (snd_config_t **config,const char *key,const char *ascii); +int snd_config_imake_safe_string (snd_config_t **config,const char *key,const char *ascii);int snd_config_imake_pointer (snd_config_t **config,const char *key,const void *ptr);snd_config_type_t snd_config_get_type (const snd_config_t *config);
src/conf.c +32 -0
@@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *vreturn 0 ; } +int snd_config_imake_safe_string (snd_config_t **config,const char *id,const char *value) +{ +int err; +snd_config_t *tmp; +char *c; + + err =snd_config_make (&tmp, id,SND_CONFIG_TYPE_STRING ); +if (err <0 ) +return err; +if (value) { + tmp->u.string =strdup (value); +if (!tmp->u.string) { +snd_config_delete (tmp); +return -ENOMEM ; + } + +for (c = tmp->u.string; *c; c++) { +if (*c ==' ' || *c =='-' || *c =='_' || + (*c >='0' && *c <='9' ) || + (*c >='a' && *c <='z' ) || + (*c >='A' && *c <='Z' )) +continue ; + *c ='_' ; + } + }else { + tmp->u.string =NULL ; + } + *config = tmp; +return 0 ; +} + +/** * \brief Creates a pointer configuration node with the given initial value. * \param[out] config The function puts the handle to the new node at
src/conf/cards/USB-Audio.conf +2 -1
@@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device { "Scarlett 2i4 USB" 999 "Sennheiser USB headset" 999 "SWTOR Gaming Headset by Razer" 999 - "USB Device 0x46d:0x992" 999 + "USB Device 0x46d_0x821" 999 + "USB Device 0x46d_0x992" 999 } # Second iec958 device number, if any.
src/confmisc.c +1 -1
@@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root, } err =snd_config_get_id (src, &id);if (err >=0 ) - err =snd_config_imake_string (dst, id, + err =snd_config_imake_safe_string (dst, id,snd_ctl_card_info_get_name (info)); __error:if (ctl)
Signature · 1 line
2.4.4
Takashi Iwai
AppliedAt Mon, 29 Jun 2015 22:53:53 +0500,
Quoted 10 lines · Alexander E. Patrakov
Otherwise, they get misinterpreted as argument separators in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries from working.
While at it, add my Logitec C910 webcam to the SPDIF blacklist.
Signed-off-by Alexander E. Patrakov <[email protected]>---
v2: Fixed misplaced NULL check fortmp->u.string
Applied, thanks.
Takashi
Quoted 92 lines
include/conf.h | 1 + src/conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/cards/USB-Audio.conf | 3 ++- src/confmisc.c | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-)include/conf.h +1
-0@@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const longint snd_config_imake_integer64 (snd_config_t **config,const char *key,const long long value);int snd_config_imake_real (snd_config_t **config,const char *key,const double value);int snd_config_imake_string (snd_config_t **config,const char *key,const char *ascii); +int snd_config_imake_safe_string (snd_config_t **config,const char *key,const char *ascii);int snd_config_imake_pointer (snd_config_t **config,const char *key,const void *ptr);snd_config_type_t snd_config_get_type (const snd_config_t *config);src/conf.c +32
-0@@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *vreturn 0 ; } +int snd_config_imake_safe_string (snd_config_t **config,const char *id,const char *value) +{ +int err; +snd_config_t *tmp; +char *c; + + err =snd_config_make (&tmp, id,SND_CONFIG_TYPE_STRING ); +if (err <0 ) +return err; +if (value) { + tmp->u.string =strdup (value); +if (!tmp->u.string) { +snd_config_delete (tmp); +return -ENOMEM ; + } + +for (c = tmp->u.string; *c; c++) { +if (*c ==' ' || *c =='-' || *c =='_' || + (*c >='0' && *c <='9' ) || + (*c >='a' && *c <='z' ) || + (*c >='A' && *c <='Z' )) +continue ; + *c ='_' ; + } + }else { + tmp->u.string =NULL ; + } + *config = tmp; +return 0 ; +} + +/** * \brief Creates a pointer configuration node with the given initial value. * \param[out] config The function puts the handle to the new node at src/conf/cards/USB-Audio.conf +2
-1@@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device { "Scarlett 2i4 USB" 999 "Sennheiser USB headset" 999 "SWTOR Gaming Headset by Razer" 999 - "USB Device 0x46d:0x992" 999 + "USB Device 0x46d_0x821" 999 + "USB Device 0x46d_0x992" 999 } # Second iec958 device number, if any.src/confmisc.c +1
-1@@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root, } err =snd_config_get_id (src, &id);if (err >=0 ) - err =snd_config_imake_string (dst, id, + err =snd_config_imake_safe_string (dst, id,snd_ctl_card_info_get_name (info)); __error:if (ctl)Signature · 1 line
2.4.4