From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 22 Mar 2010 14:50:32 +0000 (+0000)
Subject: rrdcached: Do not put any code in assert(). -- Sebastian Harl
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=756e8034345f6f44cd7096859dbff431c8f3e0be;p=rrdtool-all.git

rrdcached: Do not put any code in assert(). -- Sebastian Harl


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@2036 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/src/rrd_daemon.c b/program/src/rrd_daemon.c
index b290bcc0..ba9c2adf 100644
--- a/program/src/rrd_daemon.c
+++ b/program/src/rrd_daemon.c
@@ -821,9 +821,10 @@ static int flush_old_values (int max_age)
 
   for (k = 0; k < cfd.keys_num; k++)
   {
+    gboolean status = g_tree_remove(cache_tree, cfd.keys[k]);
     /* should never fail, since we have held the cache_lock
      * the entire time */
-    assert( g_tree_remove(cache_tree, cfd.keys[k]) == TRUE );
+    assert(status == TRUE);
   }
 
   if (cfd.keys != NULL)