From: Abramo Bagnara <abramo@alsa-project.org>
Date: Sat, 23 Dec 2000 10:14:15 +0000 (+0000)
Subject: Little cleaning of interval code
X-Git-Tag: v1.0.3~1046
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=80c3adaacec91eef3f93b21c95ad1cc5914a5320;p=alsa-lib.git

Little cleaning of interval code
---

diff --git a/src/pcm/interval.c b/src/pcm/interval.c
index bd3982c8..7e77fc18 100644
--- a/src/pcm/interval.c
+++ b/src/pcm/interval.c
@@ -107,8 +107,7 @@ int interval_refine_min(interval_t *i, unsigned int min)
 			i->openmin = 0;
 		}
 	}
-	if (i->min > i->max ||
-	    (i->min == i->max && (i->openmin || i->openmax))) {
+	if (interval_checkempty(i)) {
 		i->empty = 1;
 		return -EINVAL;
 	}
@@ -135,8 +134,7 @@ int interval_refine_max(interval_t *i, unsigned int max)
 			i->openmax = 0;
 		}
 	}
-	if (i->min > i->max ||
-	    (i->min == i->max && (i->openmin || i->openmax))) {
+	if (interval_checkempty(i)) {
 		i->empty = 1;
 		return -EINVAL;
 	}
@@ -174,8 +172,7 @@ int interval_refine(interval_t *i, const interval_t *v)
 			i->openmax = 0;
 		}
 	}
-	if (i->min > i->max ||
-	    (i->min == i->max && (i->openmin || i->openmax))) {
+	if (interval_checkempty(i)) {
 		i->empty = 1;
 		return -EINVAL;
 	}
diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h
index 845fec8a..ceb11206 100644
--- a/src/pcm/interval_inline.h
+++ b/src/pcm/interval_inline.h
@@ -31,6 +31,12 @@ INLINE void interval_all(interval_t *i)
 	i->max = UINT_MAX;
 }
 
+INLINE int interval_checkempty(const interval_t *i)
+{
+	return (i->min > i->max ||
+		(i->min == i->max && (i->openmin || i->openmax)));
+}
+
 INLINE int interval_empty(const interval_t *i)
 {
 	return i->empty;