X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firhooks.c;h=b32b91e76b0b798916d37730a56f3f68c436470a;hb=db56911d21a286c880fea81364d3a658ad169bd3;hp=9d40a82599f4e9237b6c6e2af1b86f8e68cf0ade;hpb=a142727aca4ef56cf754045fc0129b6d1b840a63;p=libfirm

diff --git a/ir/ir/irhooks.c b/ir/ir/irhooks.c
index 9d40a8259..b32b91e76 100644
--- a/ir/ir/irhooks.c
+++ b/ir/ir/irhooks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,31 +21,30 @@
  * @file
  * @brief    Generic hooks for various libFirm functions.
  * @author   Michael Beck
- * @version  $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include "irhooks.h"
+#include <assert.h>
 
-#ifdef FIRM_ENABLE_HOOKS
+#include "irhooks.h"
 
-/* the hooks */
 hook_entry_t *hooks[hook_last];
 
-/* register a hook */
-void register_hook(hook_type_t hook, hook_entry_t *entry) {
+void register_hook(hook_type_t hook, hook_entry_t *entry)
+{
   /* check if a hook function is specified. It's a union, so no matter which one */
   if (! entry->hook._hook_turn_into_id)
     return;
 
+  /* hook should not be registered yet */
+  assert(entry->next == NULL && hooks[hook] != entry);
+
   entry->next = hooks[hook];
   hooks[hook] = entry;
 }
 
-/* unregister a hook */
-void unregister_hook(hook_type_t hook, hook_entry_t *entry) {
+void unregister_hook(hook_type_t hook, hook_entry_t *entry)
+{
   hook_entry_t *p;
 
   if (hooks[hook] == entry) {
@@ -54,25 +53,11 @@ void unregister_hook(hook_type_t hook, hook_entry_t *entry) {
     return;
   }
 
-  for (p = hooks[hook]; p && p->next != entry; p = p->next);
+  for (p = hooks[hook]; p && p->next != entry; p = p->next) {
+  }
 
   if (p) {
     p->next     = entry->next;
     entry->next = NULL;
   }
 }
-
-
-#else
-
-void register_hook(hook_type_t hook, hook_entry_t *entry) {}
-void unregister_hook(hook_type_t hook, hook_entry_t *entry) {}
-
-#endif /* FIRM_ENABLE_HOOKS */
-
-int firm_init_hooks(void) {
-  /* this strange code assures that both functions are available
-     in a shared library even if none of them is called.
-     Meanwhile not needed anymore but ... */
-  return (int)register_hook + (int)unregister_hook;
-}