From 80c3adaacec91eef3f93b21c95ad1cc5914a5320 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Sat, 23 Dec 2000 10:14:15 +0000 Subject: [PATCH] Little cleaning of interval code --- src/pcm/interval.c | 9 +++------ src/pcm/interval_inline.h | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) 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; -- 2.47.3