From: Jonathan Dieter <jdieter@gmail.com>
Date: Tue, 18 Sep 2018 12:39:50 +0000 (+0100)
Subject: When removing a range, pass next range to calling function, which makes
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~107
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3253af62730e821bef3426ca868927ed7eb3cce8;p=zchunk.git

When removing a range, pass next range to calling function, which makes
coverity happy
(Coverity ID: 310898)

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

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;