[netfilter-cvslog] r7367 - trunk/conntrack-tools/src

pablo at netfilter.org pablo at netfilter.org
Thu Feb 14 15:25:11 CET 2008


Author: pablo at netfilter.org
Date: 2008-02-14 15:25:11 +0100 (Thu, 14 Feb 2008)
New Revision: 7367

Modified:
   trunk/conntrack-tools/src/alarm.c
Log:
From: Max Kellermann <max at duempel.org>
use list_for_each_entry()


Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c	2008-02-14 14:24:09 UTC (rev 7366)
+++ trunk/conntrack-tools/src/alarm.c	2008-02-14 14:25:11 UTC (rev 7367)
@@ -123,7 +123,7 @@
 {
 	struct list_head alarm_run_queue;
 	struct rb_node *node;
-	struct alarm_block *this, *tmp;
+	struct alarm_block *this;
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
@@ -138,8 +138,7 @@
 		list_add(&this->list, &alarm_run_queue);
 	}
 
-	list_for_each_entry_safe(this, tmp, &alarm_run_queue, list) {
-		list_del(&this->list);
+	list_for_each_entry(this, &alarm_run_queue, list) {
 		rb_erase(&this->node, &alarm_root);
 		RB_CLEAR_NODE(&this->node);
 		this->function(this, this->data);




More information about the netfilter-cvslog mailing list