[netfilter-cvslog] r7283 - in trunk/conntrack-tools: include src
pablo at netfilter.org
pablo at netfilter.org
Tue Jan 22 02:32:21 CET 2008
Author: pablo at netfilter.org
Date: 2008-01-22 02:32:21 +0100 (Tue, 22 Jan 2008)
New Revision: 7283
Modified:
trunk/conntrack-tools/include/alarm.h
trunk/conntrack-tools/src/alarm.c
Log:
remove alarm counter
Modified: trunk/conntrack-tools/include/alarm.h
===================================================================
--- trunk/conntrack-tools/include/alarm.h 2008-01-22 01:28:07 UTC (rev 7282)
+++ trunk/conntrack-tools/include/alarm.h 2008-01-22 01:32:21 UTC (rev 7283)
@@ -5,8 +5,6 @@
#include <sys/time.h>
-extern int alarm_counter;
-
struct alarm_list {
struct list_head head;
struct timeval tv;
Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c 2008-01-22 01:28:07 UTC (rev 7282)
+++ trunk/conntrack-tools/src/alarm.c 2008-01-22 01:32:21 UTC (rev 7283)
@@ -24,7 +24,6 @@
#define ALARM_HASH_SIZE 2048
static struct list_head *alarm_hash;
-int alarm_counter;
void init_alarm(struct alarm_list *t,
void *data,
@@ -62,16 +61,13 @@
gettimeofday(&tv, NULL);
timeradd(&alarm->tv, &tv, &alarm->tv);
__add_alarm(alarm);
- alarm_counter++;
}
void del_alarm(struct alarm_list *alarm)
{
/* don't remove a non-inserted node */
- if (!list_empty(&alarm->head)) {
+ if (!list_empty(&alarm->head))
list_del_init(&alarm->head);
- alarm_counter--;
- }
}
static struct timeval *
More information about the netfilter-cvslog
mailing list