From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 24 Nov 2001 11:32:10 +0000 (+0000)
Subject: Removed asserts from *name functions
X-Git-Tag: v1.0.3~579
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=86db3b4e30646a5c809d1b7b66a8a8f14d01b650;p=alsa-lib.git

Removed asserts from *name functions
---

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 0c52dac9..bc0e26e1 100644
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -1152,7 +1152,8 @@ const char *snd_pcm_stream_name(snd_pcm_stream_t stream)
  */
 const char *snd_pcm_access_name(snd_pcm_access_t acc)
 {
-	assert(acc <= SND_PCM_ACCESS_LAST);
+	if (acc > SND_PCM_ACCESS_LAST)
+		return NULL;
 	return snd_pcm_access_names[acc];
 }
 
@@ -1163,7 +1164,8 @@ const char *snd_pcm_access_name(snd_pcm_access_t acc)
  */
 const char *snd_pcm_format_name(snd_pcm_format_t format)
 {
-	assert(format <= SND_PCM_FORMAT_LAST);
+	if (format > SND_PCM_FORMAT_LAST)
+		return NULL;
 	return snd_pcm_format_names[format];
 }
 
@@ -1174,7 +1176,8 @@ const char *snd_pcm_format_name(snd_pcm_format_t format)
  */
 const char *snd_pcm_format_description(snd_pcm_format_t format)
 {
-	assert(format <= SND_PCM_FORMAT_LAST);
+	if (format > SND_PCM_FORMAT_LAST)
+		return NULL;
 	return snd_pcm_format_descriptions[format];
 }
 
@@ -1202,7 +1205,8 @@ snd_pcm_format_t snd_pcm_format_value(const char* name)
  */
 const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)
 {
-	assert(subformat <= SND_PCM_SUBFORMAT_LAST);
+	if (subformat > SND_PCM_SUBFORMAT_LAST)
+		return NULL;
 	return snd_pcm_subformat_names[subformat];
 }
 
@@ -1213,7 +1217,8 @@ const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)
  */
 const char *snd_pcm_subformat_description(snd_pcm_subformat_t subformat)
 {
-	assert(subformat <= SND_PCM_SUBFORMAT_LAST);
+	if (subformat > SND_PCM_SUBFORMAT_LAST)
+		return NULL;
 	return snd_pcm_subformat_descriptions[subformat];
 }
 
@@ -1254,7 +1259,8 @@ link_warning(snd_pcm_xrun_mode_name, "Warning: xrun_mode is deprecated, consider
  */
 const char *snd_pcm_tstamp_mode_name(snd_pcm_tstamp_t mode)
 {
-	assert(mode <= SND_PCM_TSTAMP_LAST);
+	if (mode > SND_PCM_TSTAMP_LAST)
+		return NULL;
 	return snd_pcm_tstamp_mode_names[mode];
 }
 
@@ -1265,7 +1271,8 @@ const char *snd_pcm_tstamp_mode_name(snd_pcm_tstamp_t mode)
  */
 const char *snd_pcm_state_name(snd_pcm_state_t state)
 {
-	assert(state <= SND_PCM_STATE_LAST);
+	if (state > SND_PCM_STATE_LAST)
+		return NULL;
 	return snd_pcm_state_names[state];
 }