Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv22763
Modified Files:
interval.c mask_inline.h pcm_params.c
Log Message:
Removed more asserts
Index: interval.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/interval.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- interval.c 30 Dec 2001 09:22:55 -0000 1.13
+++ interval.c 28 May 2003 18:49:15 -0000 1.14
@@ -105,7 +105,8 @@
int snd_interval_refine_min(snd_interval_t *i, unsigned int min, int openmin)
{
int changed = 0;
- assert(!snd_interval_empty(i));
+ if (snd_interval_empty(i))
+ return -ENOENT;
if (i->min < min) {
i->min = min;
i->openmin = openmin;
@@ -130,7 +131,8 @@
int snd_interval_refine_max(snd_interval_t *i, unsigned int max, int openmax)
{
int changed = 0;
- assert(!snd_interval_empty(i));
+ if (snd_interval_empty(i))
+ return -ENOENT;
if (i->max > max) {
i->max = max;
i->openmax = openmax;
@@ -156,7 +158,8 @@
int snd_interval_refine(snd_interval_t *i, const snd_interval_t *v)
{
int changed = 0;
- assert(!snd_interval_empty(i));
+ if (snd_interval_empty(i))
+ return -ENOENT;
if (i->min < v->min) {
i->min = v->min;
i->openmin = v->openmin;
@@ -197,7 +200,8 @@
int snd_interval_refine_first(snd_interval_t *i)
{
- assert(!snd_interval_empty(i));
+ if (snd_interval_empty(i))
+ return -ENOENT;
if (snd_interval_single(i))
return 0;
i->max = i->min;
@@ -209,7 +213,8 @@
int snd_interval_refine_last(snd_interval_t *i)
{
- assert(!snd_interval_empty(i));
+ if (snd_interval_empty(i))
+ return -ENOENT;
if (snd_interval_single(i))
return 0;
i->min = i->max;
Index: mask_inline.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/mask_inline.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mask_inline.h 26 Jun 2002 18:05:10 -0000 1.11
+++ mask_inline.h 28 May 2003 18:49:15 -0000 1.12
@@ -212,7 +212,8 @@
MASK_INLINE int snd_mask_refine(snd_mask_t *mask, const snd_mask_t *v)
{
snd_mask_t old;
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
snd_mask_copy(&old, mask);
snd_mask_intersect(mask, v);
if (snd_mask_empty(mask))
@@ -222,7 +223,8 @@
MASK_INLINE int snd_mask_refine_first(snd_mask_t *mask)
{
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
if (snd_mask_single(mask))
return 0;
snd_mask_leave(mask, snd_mask_min(mask));
@@ -231,7 +233,8 @@
MASK_INLINE int snd_mask_refine_last(snd_mask_t *mask)
{
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
if (snd_mask_single(mask))
return 0;
snd_mask_leave(mask, snd_mask_max(mask));
@@ -240,7 +243,8 @@
MASK_INLINE int snd_mask_refine_min(snd_mask_t *mask, unsigned int val)
{
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
if (snd_mask_min(mask) >= val)
return 0;
snd_mask_reset_range(mask, 0, val - 1);
@@ -251,7 +255,8 @@
MASK_INLINE int snd_mask_refine_max(snd_mask_t *mask, unsigned int val)
{
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
if (snd_mask_max(mask) <= val)
return 0;
snd_mask_reset_range(mask, val + 1, SND_MASK_MAX);
@@ -263,7 +268,8 @@
MASK_INLINE int snd_mask_refine_set(snd_mask_t *mask, unsigned int val)
{
int changed;
- assert(!snd_mask_empty(mask));
+ if (snd_mask_empty(mask))
+ return -ENOENT;
changed = !snd_mask_single(mask);
snd_mask_leave(mask, val);
if (snd_mask_empty(mask))
Index: pcm_params.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_params.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pcm_params.c 12 Feb 2003 12:51:34 -0000 1.52
+++ pcm_params.c 28 May 2003 18:49:15 -0000 1.53
@@ -296,7 +296,7 @@
assert(0);
return -EINVAL;
}
- if (changed) {
+ if (changed > 0) {
params->cmask |= 1 << var;
params->rmask |= 1 << var;
}
@@ -338,7 +338,7 @@
assert(0);
return -EINVAL;
}
- if (changed) {
+ if (changed > 0) {
params->cmask |= 1 << var;
params->rmask |= 1 << var;
}
@@ -1936,7 +1936,9 @@
},
};
-#undef RULES_DEBUG
+#if 0
+#define RULES_DEBUG
+#endif
int snd_pcm_hw_refine_soft(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_params_t
*params)
{
-------------------------------------------------------
This SF.net email is sponsored by: ObjectStore.
If flattening out C++ or Java code to make your application fit in a
relational database is painful, don't do it! Check out ObjectStore.
Now part of Progress Software. http://www.objectstore.net/sourceforge
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
