diff options
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/ </C=EU/ST=EU/CN=Pablo Neira Ayuso/>2008-01-15 13:45:10 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/ </C=EU/ST=EU/CN=Pablo Neira Ayuso/>2008-01-15 13:45:10 +0000
commitf299e48a40c6bd214783148273315e19e3de00b1 (patch)
parente62e70e2cfe62f3df55fdb17f35895ebb43c0de9 (diff)
merge several *_alarm() functions into init_alarm()
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d417dab..71f6a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ o fix wrong invocations after prototype cleanup
o set the return type of the parse functions to "void"
o use the comma operator instead of curly braces
o add missing function prototypes
+o merge several *_alarm() functions into init_alarm()
version 0.9.5 (2007/07/29)
diff --git a/include/alarm.h b/include/alarm.h
index c68e7f4..338968a 100644
--- a/include/alarm.h
+++ b/include/alarm.h
@@ -17,12 +17,9 @@ set_alarm_expiration(struct alarm_list *t, long tv_sec, long tv_usec)
t->tv.tv_usec = tv_usec;
-void set_alarm_function(struct alarm_list *t,
- void (*fcn)(struct alarm_list *a, void *data));
-void set_alarm_data(struct alarm_list *t, void *data);
-void init_alarm(struct alarm_list *t);
+void init_alarm(struct alarm_list *t,
+ void *data,
+ void (*fcn)(struct alarm_list *a, void *data));
void add_alarm(struct alarm_list *alarm);