From 3253af62730e821bef3426ca868927ed7eb3cce8 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Tue, 18 Sep 2018 13:39:50 +0100 Subject: [PATCH] When removing a range, pass next range to calling function, which makes coverity happy (Coverity ID: 310898) Signed-off-by: Jonathan Dieter --- src/lib/dl/range.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c index 5875620..2e82824 100644 --- a/src/lib/dl/range.c +++ b/src/lib/dl/range.c @@ -61,12 +61,12 @@ static zckRangeItem *range_insert_new(zckCtx *zck, zckRangeItem *prev, return new; } -static void range_remove(zckCtx *zck, zckRangeItem *range) { - if(range->prev) - range->prev->next = range->next; +static zckRangeItem *range_remove(zckCtx *zck, zckRangeItem *range) { + zckRangeItem *next = range->next; if(range->next) range->next->prev = range->prev; free(range); + return next; } static void range_merge_combined(zckCtx *zck, zckRange *info) { @@ -78,7 +78,7 @@ static void range_merge_combined(zckCtx *zck, zckRange *info) { if(ptr->next && ptr->end >= ptr->next->start-1) { if(ptr->end < ptr->next->end) ptr->end = ptr->next->end; - range_remove(zck, ptr->next); + ptr->next = range_remove(zck, ptr->next); info->count -= 1; } else { ptr = ptr->next; -- 2.30.2