summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-02-14 14:19:56 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-02-14 14:19:56 +0000
commitbc7329870e82a9909cfc01e4876ebcc5adeef629 (patch)
tree988f0222f6143c51a1b3830f8acc5e6ec38ff374
parentef56ba7fa2103984eefce9eb01227feab6fa2898 (diff)
From: Max Kellermann <max@duempel.org>
eliminate duplicated initialization
-rw-r--r--ChangeLog1
-rw-r--r--src/alarm.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a91511f..6b0fba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,7 @@ o remove unused prototypes in network.h
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)
------------------------------
diff --git a/src/alarm.c b/src/alarm.c
index 5013735..470efdd 100644
--- a/src/alarm.c
+++ b/src/alarm.c
@@ -105,7 +105,7 @@ calculate_next_run(struct timeval *cand,
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 @@ get_next_alarm_run(struct timeval *next_run)
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;