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:51:23 +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:51:23 +0000 |
| commit | bcae271764d18e570a5fca382eeea748add4af62 (patch) | |
| tree | 27dd1b721b8635145aafe17dbec7cc83d25a4cf1 /src/alarm.c | |
| parent | 00ad2e9e1c6cf9e14c76660f2b748247c1f4bd83 (diff) | |
Based on patch from Max Kellermann <max@duempel.org>:
merge mod_alarm() into add_alarm(), remove alarm_set_expiration()
Diffstat (limited to 'src/alarm.c')
| -rw-r--r-- | src/alarm.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/alarm.c b/src/alarm.c index 13a790e..2190bb6 100644 --- a/src/alarm.c +++ b/src/alarm.c @@ -52,10 +52,13 @@ __add_alarm(struct alarm_list *alarm) list_add_tail(&alarm->head, &alarm_hash[i]); } -void add_alarm(struct alarm_list *alarm) +void add_alarm(struct alarm_list *alarm, unsigned long sc, unsigned long usc) { struct timeval tv; + del_alarm(alarm); + alarm->tv.tv_sec = sc; + alarm->tv.tv_usec = usc; gettimeofday(&tv, NULL); timeradd(&alarm->tv, &tv, &alarm->tv); __add_alarm(alarm); @@ -71,17 +74,6 @@ void del_alarm(struct alarm_list *alarm) } } -void mod_alarm(struct alarm_list *alarm, unsigned long sc, unsigned long usc) -{ - struct timeval tv; - - set_alarm_expiration(alarm, sc, usc); - gettimeofday(&tv, NULL); - timeradd(&alarm->tv, &tv, &alarm->tv); - list_del(&alarm->head); - __add_alarm(alarm); -} - static int calculate_next_run(struct timeval *cand, struct timeval *tv, |