From: Takashi Iwai Date: Fri, 21 Jan 2005 19:37:00 +0000 (+0000) Subject: Use snd_config_get_bool() X-Git-Tag: v1.0.9rc1~44 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=680a60a6882d882c69c8b8dcf5269be3d186c958;p=alsa-lib.git Use snd_config_get_bool() Cleanup using snd_config_get_bool() in possible places. --- diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 5375da70..45b17fde 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -1153,15 +1153,7 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "ipc_key_add_uid") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field ipc_key_add_uid must be a boolean type"); - return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); - if (err < 0) { + if ((err = snd_config_get_bool(n)) < 0) { SNDERR("The field ipc_key_add_uid must be a boolean type"); return err; } @@ -1177,18 +1169,9 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "slowptr") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field slowptr must be a boolean type"); + err = snd_config_get_bool(n); + if (err < 0) return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); - if (err < 0) { - SNDERR("The field slowptr must be a boolean type"); - return err; - } slowptr = err; continue; } diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 87fd245c..19e9351f 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -821,14 +821,7 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "ipc_key_add_uid") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field ipc_key_add_uid must be a boolean type"); - return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); + err = snd_config_get_bool(n); if (err < 0) { SNDERR("The field ipc_key_add_uid must be a boolean type"); return err; @@ -845,14 +838,7 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "slowptr") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field slowptr must be a boolean type"); - return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); + err = snd_config_get_bool(n); if (err < 0) { SNDERR("The field slowptr must be a boolean type"); return err; diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 17637359..d5934833 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -771,14 +771,7 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "ipc_key_add_uid") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field ipc_key_add_uid must be a boolean type"); - return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); + err = snd_config_get_bool(n); if (err < 0) { SNDERR("The field ipc_key_add_uid must be a boolean type"); return err; @@ -795,14 +788,7 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name, continue; } if (strcmp(id, "slowptr") == 0) { - char *tmp; - err = snd_config_get_ascii(n, &tmp); - if (err < 0) { - SNDERR("The field slowptr must be a boolean type"); - return err; - } - err = snd_config_get_bool_ascii(tmp); - free(tmp); + err = snd_config_get_bool(n); if (err < 0) { SNDERR("The field slowptr must be a boolean type"); return err;