From 6cc6cd9289d9bfc4eb947e68b060d6bb9d284f63 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 16 Sep 2022 10:51:36 +0900 Subject: [PATCH] uid-range: make uid_range_intersect() take two UidRange objects No functional changes, just refactoring. --- src/basic/uid-range.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/basic/uid-range.c b/src/basic/uid-range.c index 8e68e0464c5..fbc764673c4 100644 --- a/src/basic/uid-range.c +++ b/src/basic/uid-range.c @@ -15,11 +15,11 @@ #include "uid-range.h" #include "user-util.h" -static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { - assert(range); +static bool uid_range_intersect(const UidRange *a, const UidRange *b) { + assert(a); + assert(b); - return range->start <= start + nr && - range->start + range->nr >= start; + return a->start <= b->start + b->nr && a->start + a->nr >= b->start; } static int uid_range_compare(const UidRange *a, const UidRange *b) { @@ -51,7 +51,7 @@ static void uid_range_coalesce(UidRange **p, size_t *n) { UidRange *y = (*p)+j; uid_t begin, end; - if (!uid_range_intersect(x, y->start, y->nr)) + if (!uid_range_intersect(x, y)) break; begin = MIN(x->start, y->start); -- 2.47.3