diff options
| 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-01-20 23:56:55 +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-01-20 23:56:55 +0000 |
| commit | d6f29c81c1452db525d12110d5f15f7f39df9b86 (patch) | |
| tree | d88c004d71f837666081158873d94a20c3773de7 | |
| parent | bcae271764d18e570a5fca382eeea748add4af62 (diff) | |
Max Kellermann <max@duempel.org>:
remove init_alarm() before add_alarm()
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/sync-alarm.c | 1 | ||||
| -rw-r--r-- | src/sync-ftfw.c | 1 |
3 files changed, 1 insertions, 2 deletions
@@ -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); } |