summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/sync-alarm.c1
-rw-r--r--src/sync-ftfw.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dad662..3ca5746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,7 @@ o major simplification of the logging infrastructure
o use fputs() instead of fprintf() in log.c
o improve error message if netlink initialization fails
o merge mod_alarm() into add_alarm(), remove alarm_set_expiration()
+o remove init_alarm() before add_alarm()
version 0.9.5 (2007/07/29)
------------------------------
diff --git a/src/sync-alarm.c b/src/sync-alarm.c
index 1f164b2..f7a1536 100644
--- a/src/sync-alarm.c
+++ b/src/sync-alarm.c
@@ -35,7 +35,6 @@ static void refresher(struct alarm_list *a, void *data)
debug_ct(u->ct, "persistence update");
- init_alarm(a, u, refresher);
add_alarm(a,
random() % CONFIG(refresh) + 1,
((random() % 5 + 1) * 200000) - 1);
diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index dc3bf44..1d12002 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -89,7 +89,6 @@ static void do_alive_alarm(struct alarm_list *a, void *data)
{
tx_queue_add_ctlmsg(NET_F_ALIVE, 0, 0);
- init_alarm(&alive_alarm, NULL, do_alive_alarm);
add_alarm(&alive_alarm, 1, 0);
}