warning fixed for lttvwindow and controlflow view

[lttv.git] / ltt / branches / poly / lttv / lttv / hook.h

diff --git a/ltt/branches/poly/lttv/lttv/hook.h b/ltt/branches/poly/lttv/lttv/hook.h
index c1814d8191b66b156c5707cf388fa5826aa859b3..1227203514dd20a18d51cffded051b56fcb73bcd 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/hook.h
+++ b/ltt/branches/poly/lttv/lttv/hook.h
@@ -22,6 +22,7 @@
 #define HOOK_H
 
 #include <glib.h>
+#include <ltt/compiler.h>
 
 /* A hook is a function to call with the supplied hook data, and with 
    call site specific data (e.g., hooks for events are called with a 
@@ -76,7 +77,7 @@ void lttv_hooks_remove_data(LttvHooks *h, LttvHook f, void *hook_data);
 
 /* Remove a list of hooks from the hooks list in h. */
 
-void lttv_hooks_remove_data_list(LttvHooks *h, LttvHooks *list);
+void lttv_hooks_remove_list(LttvHooks *h, LttvHooks *list);
 
 
 /* Return the number of hooks in the list */
@@ -92,6 +93,7 @@ void lttv_hooks_get(LttvHooks *h, unsigned i, LttvHook *f, void **hook_data,
 
 
 /* Remove the specified hook. The position of the following hooks may change */
+/* The hook is removed from the list event if its ref_count is higher than 1 */
 
 void lttv_hooks_remove_by_position(LttvHooks *h, unsigned i);
 
@@ -143,7 +145,14 @@ unsigned lttv_hooks_by_id_max_id(LttvHooksById *h);
 
 /* Get the list of hooks for an id, NULL if none exists */
 
-LttvHooks *lttv_hooks_by_id_get(LttvHooksById *h, unsigned id);
+static inline LttvHooks *lttv_hooks_by_id_get(LttvHooksById *h, unsigned id)
+{
+  LttvHooks *ret;
+  if(likely(id < h->len)) ret = h->pdata[id];
+  else ret = NULL;
+
+  return ret;
+}
 
 
 /* Remove the list of hooks associated with an id */