From 8f6accb5bb26d534576e086894c107387f67906a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Thu, 27 Apr 2000 22:28:49 +0000
Subject: Event handlers no longer return re-queue flag. Instead of using it,
 just call ev_schedule() on the same handler which should work perfectly now.

---
 nest/locks.c    | 3 +--
 nest/proto.c    | 8 +++-----
 nest/rt-table.c | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'nest')

diff --git a/nest/locks.c b/nest/locks.c
index 0f43c56..d321fab 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -111,7 +111,7 @@ olock_acquire(struct object_lock *l)
   ev_schedule(olock_event);
 }
 
-int
+static void
 olock_run_event(void *unused)
 {
   node *n;
@@ -132,7 +132,6 @@ olock_run_event(void *unused)
       add_tail(&olock_list, &q->n);
       q->hook(q);
     }
-  return 0;
 }
 
 void
diff --git a/nest/proto.c b/nest/proto.c
index f6eb32c..1af76ea 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -43,7 +43,7 @@ static event *proto_flush_event;
 static char *p_states[] = { "DOWN", "START", "UP", "STOP" };
 static char *c_states[] = { "HUNGRY", "FEEDING", "HAPPY", "FLUSHING" };
 
-static int proto_flush_all(void *);
+static void proto_flush_all(void *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
 
@@ -399,7 +399,7 @@ proto_fell_down(struct proto *p)
   proto_rethink_goal(p);
 }
 
-static int
+static void
 proto_feed(void *P)
 {
   struct proto *p = P;
@@ -411,7 +411,6 @@ proto_feed(void *P)
   p->core_state = FS_HAPPY;
   proto_relink(p);
   DBG("Protocol %s up and running\n", p->name);
-  return 0;
 }
 
 void
@@ -469,7 +468,7 @@ proto_notify_state(struct proto *p, unsigned ps)
   proto_relink(p);
 }
 
-static int
+static void
 proto_flush_all(void *unused)
 {
   struct proto *p;
@@ -485,7 +484,6 @@ proto_flush_all(void *unused)
       proto_relink(p);
       proto_fell_down(p);
     }
-  return 0;
 }
 
 /*
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6ad5b06..ae27ceb 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -466,7 +466,7 @@ rt_dump_all(void)
     rt_dump(t);
 }
 
-static int
+static void
 rt_gc(void *tab)
 {
   rtable *t = tab;
@@ -474,7 +474,6 @@ rt_gc(void *tab)
   DBG("Entered routing table garbage collector for %s after %d seconds and %d deletes\n",
       t->name, (int)(now - t->gc_time), t->gc_counter);
   rt_prune(t);
-  return 0;
 }
 
 void
-- 
cgit v1.2.3