Little cleaning of interval code

diff --git a/src/pcm/interval.c b/src/pcm/interval.c
index bd3982c8bb735038f77bf986aeafcf2312c649d4..7e77fc18071ad4f45b7e7210e5dae9807db96e6b 100644 (file)
--- 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 845fec8ac3580c1f3f4d13d73d63de11eb199f3c..ceb11206b9685cf84a342563f4ed435c64b1ff27 100644 (file)
--- 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;