[netfilter-cvslog] r7364 - in trunk/conntrack-tools: . src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-02-14 15:19:56 +0100 (Thu, 14 Feb 2008)
New Revision: 7364

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/src/alarm.c
Log:
From: Max Kellermann <max at duempel.org>
eliminate duplicated initialization


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2008-02-12 12:12:06 UTC (rev 7363)
+++ trunk/conntrack-tools/ChangeLog	2008-02-14 14:19:56 UTC (rev 7364)
@@ -99,6 +99,7 @@
 o check if the received packet is large enough
 o introduce alarm_pending()
 o cleanup: use size_t instead of integer
+o cleanup: remove unrequired initialization in the rbtree-based alarm
 
 version 0.9.5 (2007/07/29)
 ------------------------------

Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c	2008-02-12 12:12:06 UTC (rev 7363)
+++ trunk/conntrack-tools/src/alarm.c	2008-02-14 14:19:56 UTC (rev 7364)
@@ -105,7 +105,7 @@
 struct timeval *
 get_next_alarm_run(struct timeval *next_run)
 {
-	struct rb_node *node = alarm_root.rb_node;
+	struct rb_node *node;
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
@@ -122,7 +122,7 @@
 struct timeval *
 do_alarm_run(struct timeval *next_run)
 {
-	struct rb_node *node = alarm_root.rb_node;
+	struct rb_node *node;
 	struct alarm_block *this, *tmp;
 	struct timeval tv;