r4262@bucket (orig r252): kcr | 2008-01-20 22:11:00 -0500

[1ts-debian.git] / zephyr / server / timer.c

diff --git a/zephyr/server/timer.c b/zephyr/server/timer.c
index b6cbf514c9611dff562d8184bdfdd62609c157a0..11d61fed1b9f926679b9dfb7428e0d70d2d202d5 100644 (file)
--- a/zephyr/server/timer.c
+++ b/zephyr/server/timer.c
@@ -114,13 +114,13 @@ static Timer **heap;
 static int num_timers = 0;
 static int heap_size = 0;
 
-static void timer_botch __P((void*));
-static Timer *add_timer __P((Timer *));
+static void timer_botch (void*);
+static Timer *add_timer (Timer *);
 
-Timer *timer_set_rel(time_rel, proc, arg)
-    long time_rel;
-    void (*proc) __P((void *));
-    void *arg;
+Timer *
+timer_set_rel(long time_rel,
+             void (*proc)(void *),
+             void *arg)
 {
     Timer *new_t;
 
@@ -134,8 +134,7 @@ Timer *timer_set_rel(time_rel, proc, arg)
 }
 
 void
-timer_reset(tmr)
-    Timer *tmr;
+timer_reset(Timer *tmr)
 {
     int pos, min;
 
@@ -176,8 +175,7 @@ timer_reset(tmr)
 #define set_timeval(t,s) ((t).tv_sec=(s),(t).tv_usec=0,(t))
 
 static Timer *
-add_timer(new)
-    Timer *new;
+add_timer(Timer *new)
 {
     int pos;
 
@@ -207,7 +205,7 @@ add_timer(new)
 }
 
 void
-timer_process()
+timer_process(void)
 {
     Timer *t;
     timer_proc func;
@@ -231,8 +229,7 @@ timer_process()
 }
 
 struct timeval *
-timer_timeout(tvbuf)
-    struct timeval *tvbuf;
+timer_timeout(struct timeval *tvbuf)
 {
     if (num_timers > 0) {
        tvbuf->tv_sec = heap[0]->abstime - NOW;
@@ -246,8 +243,7 @@ timer_timeout(tvbuf)
 }
 
 static void
-timer_botch(arg)
-    void *arg;
+timer_botch(void *arg)
 {
     syslog(LOG_CRIT, "timer botch\n");
     abort();