Remove old hooks.

diff --git a/core/Makefile b/core/Makefile
index 37c47d8f1ed84526057aef63b074f7b367b99c47..6754b012f8ce683163e1e8cfa7af69ada1eae748 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -8,4 +8,4 @@ ifeq (${USE_VALGRIND},1)
 CFLAGS+=-DUSE_NSMALLOC_VALGRIND=1
 endif
 
-all: events-${EVENT_ENGINE}.o main.o schedule.o hooks-${HOOK_ENGINE}.o error.o modules.o config.o schedulealloc.o nsmalloc.o
+all: events-${EVENT_ENGINE}.o main.o schedule.o hooks.o error.o modules.o config.o schedulealloc.o nsmalloc.o

diff --git a/core/hooks-old.c b/core/hooks-old.c
deleted file mode 100644 (file)
index f0f6bee..0000000
--- a/core/hooks-old.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* hooks.c */
-
-#include "hooks.h"
-#include "error.h"
-#include "../lib/array.h"
-#include <assert.h>
-#include <stdlib.h>
-
-array hooks[HOOKMAX];
-unsigned int hookqueuelength;
-
-void inithooks() {
-  int i;
-  
-  hookqueuelength=0;
-  for (i=0;i<HOOKMAX;i++) {
-    array_init(&(hooks[i]),sizeof(HookCallback));
-    array_setlim1(&(hooks[i]),2);
-    array_setlim2(&(hooks[i]),2);
-  }
-}
-
-int registerhook(int hooknum, HookCallback callback) {
-  int i;
-  HookCallback *hcbs;
-  
-  if (hooknum>HOOKMAX)
-    return 1;
-    
-  hcbs=(HookCallback *)(hooks[hooknum].content);
-  for(i=0;i<hooks[hooknum].cursi;i++)
-    if(hcbs[i]==callback)
-      return 1;
-
-  /* If there is a previously blanked slot, go in there */
-  for(i=0;i<hooks[hooknum].cursi;i++) {
-    if(hcbs[i]==NULL) {
-      hcbs[i]=callback;
-      return 0;
-    }
-  }
-
-  i=array_getfreeslot(&hooks[hooknum]);
-  hcbs=(HookCallback *)(hooks[hooknum].content);
-  hcbs[i]=callback;
-  
-  return 0;
-}
-
-int registerpriorityhook(int hooknum, HookCallback callback, long priority) {
-  Error("core", ERR_WARNING, "Priority hook system not loaded.");
-
-  return registerhook(hooknum, callback);
-}
-
-int deregisterhook(int hooknum, HookCallback callback) {
-  int i;
-  HookCallback *hcbs;
-  
-  if (hooknum>HOOKMAX)
-    return 1;
-    
-  hcbs=(HookCallback *)(hooks[hooknum].content);
-
-  for(i=0;i<hooks[hooknum].cursi;i++)
-    if(hcbs[i]==callback) {
-      /* If there is an ongoing callback, don't actually delete from the
-       * array in case THIS hook is active */
-      if (hookqueuelength) {
-        hcbs[i]=NULL;
-      } else {
-        array_delslot(&(hooks[hooknum]),i);
-      }
-      return 0;
-    }
-
-  return 1;
-}
-  
-void triggerhook(int hooknum, void *arg) {
-  int i;
-  HookCallback *hcbs;
-  
-  if (hooknum>HOOKMAX)
-    return;
-    
-  hookqueuelength++;
-  hcbs=(HookCallback *)(hooks[hooknum].content);
-  for (i=0;i<hooks[hooknum].cursi;i++) {
-    if (hcbs[i])
-      (hcbs[i])(hooknum, arg);
-  }
-  hookqueuelength--;
-  
-  if (!hookqueuelength && hooknum!=HOOK_CORE_ENDOFHOOKSQUEUE)
-    triggerhook(HOOK_CORE_ENDOFHOOKSQUEUE, 0);
-}

diff --git a/core/hooks-new.c b/core/hooks.c
similarity index 100%
rename from core/hooks-new.c
rename to core/hooks.c