fix some format string errors and dergister some hooks, also do some (pointless)...

--HG--
branch : paul

diff --git a/core/error.c b/core/error.c
index 04c998756b978bdd2e69d3ad565c83f25c9be582..edd986990bb5e7056f329c07c9c3fa5a3a403e1c 100644 (file)
--- a/core/error.c
+++ b/core/error.c
@@ -48,6 +48,11 @@ void init_logfile() {
   registerhook(HOOK_CORE_SIGUSR1, reopen_logfile);
 }
 
+void fini_logfile() {
+  deregisterhook(HOOK_CORE_SIGUSR1, reopen_logfile);
+  fclose(logfile);
+}
+
 void Error(char *source, int severity, char *reason, ... ) {
   char buf[512];
   va_list va;

diff --git a/core/events-epoll.c b/core/events-epoll.c
index 3cb3a7a19ae4f908a6bbbac2af79d4ca7f1e788d..01364a362c61922ec62e73f1c6791a77251578e1 100644 (file)
--- a/core/events-epoll.c
+++ b/core/events-epoll.c
@@ -52,6 +52,11 @@ void inithandlers() {
   registerhook(HOOK_CORE_STATSREQUEST, &eventstats);
 }
 
+void finihandlers() {
+  deregisterhook(HOOK_CORE_STATSREQUEST, &eventstats);
+  free(eventhandlers);
+}
+
 /*
  * checkindex():
  *  Given the number of a new file descriptor, makes sure that the array

diff --git a/core/events-kqueue.c b/core/events-kqueue.c
index 083e551db77e326cbf100e31bcd555d926a4c902..e0cc379af61875974371d265a6197349e2e1d2ff 100644 (file)
--- a/core/events-kqueue.c
+++ b/core/events-kqueue.c
@@ -54,6 +54,11 @@ void inithandlers() {
   registerhook(HOOK_CORE_STATSREQUEST, &eventstats);
 }
 
+void finihandlers() {
+  deregisterhook(HOOK_CORE_STATSREQUEST, &eventstats);
+}
+
+
 /*
  * checkindex():
  *  Given the number of a new file descriptor, makes sure that the array

diff --git a/core/events-poll.c b/core/events-poll.c
index 51ca8478de1d2f969cec44e42a72373fabc04832..7d939b0b0ca5c0410246ea2c4fca78b523ccbdd6 100644 (file)
--- a/core/events-poll.c
+++ b/core/events-poll.c
@@ -51,6 +51,12 @@ void inithandlers() {
   registerhook(HOOK_CORE_STATSREQUEST, &eventstats);
 }
 
+void finihandlers() {
+  deregisterhook(HOOK_CORE_STATSREQUEST, &eventstats);
+  free(eventfds);
+  free(eventhandlers);
+}
+
 /*
  * checkindex():
  *  Given the number of a new file descriptor, makes sure that the arrays

diff --git a/core/main.c b/core/main.c
index ec6f4abce165d1d9a73949888257c9a97bfe43a4..a2dbdd7afa8924fd2874b41e12780afa6ffebf55 100644 (file)
--- a/core/main.c
+++ b/core/main.c
@@ -65,6 +65,10 @@ int main(int argc, char **argv) {
   freeconfig();
   finisstring();  
 
+  fini_logfile();
+  finischedule();
+  finihandlers();
+
   nsexit();
 }
 

diff --git a/core/schedule.c b/core/schedule.c
index cf495e0d5980fb880a1b34bb92aa88666d1f3ef4..e619f05ed8322a167dda2415ce03d9398afbb57b 100644 (file)
--- a/core/schedule.c
+++ b/core/schedule.c
@@ -36,6 +36,11 @@ void initschedule() {
   events=(schedule **)malloc(INITSCHEDSIZE*sizeof(schedule *));
 }
 
+void finischedule() {
+  deregisterhook(HOOK_CORE_STATSREQUEST, &schedulestats);
+  free(events);
+}
+
 void schedule_heapify(int index) {
   int firstindex=index;
   schedule *ep;
@@ -166,7 +171,7 @@ void *scheduleoneshot(time_t when, ScheduleCallback callback, void *arg) {
   insertschedule(sp);
   
 #ifdef SCHEDDEBUG
-  Error("schedule",ERR_DEBUG,"scheduleoneshot: (%ld, %x, %x) = %x",when, callback, arg, sp);
+  Error("schedule",ERR_DEBUG,"scheduleoneshot: (%ld, %x, %x) = %x",when, (unsigned int)callback, (unsigned int)arg, (unsigned int)sp);
 #endif
 
   return (void *)sp;
@@ -201,7 +206,7 @@ void deleteschedule(void *sch, ScheduleCallback callback, void *arg) {
    * pass it in here for an O(1) *cough* O(lg n) delete */
 
 #ifdef SCHEDDEBUG
-  Error("schedule",ERR_DEBUG,"deleteschedule(%x,%x,%x)",sch,callback, arg);
+  Error("schedule",ERR_DEBUG,"deleteschedule(%x,%x,%x)",(unsigned int)sch,(unsigned int)callback, (unsigned int)arg);
 #endif
 
   if (sch) {
@@ -296,7 +301,7 @@ void doscheduledevents(time_t when) {
       break;
     }
 #ifdef SCHEDDEBUG
-    Error("schedule",ERR_DEBUG,"exec schedule:(%x, %x, %x)", sp, sc, arg);
+    Error("schedule",ERR_DEBUG,"exec schedule:(%x, %x, %x)", (unsigned int)sp, (unsigned int)sc, (unsigned int)arg);
 #endif
     (sc)(arg);
 #ifdef SCHEDDEBUG