Update FSF address

[lttv.git] / lttv / lttv / hook.c

diff --git a/lttv/lttv/hook.c b/lttv/lttv/hook.c
index 62918cd5e0a321f67f638e995ec09497a5a9415e..2216aa52490ac34ff87bb1f11164d3323a68027e 100644 (file)
--- a/lttv/lttv/hook.c
+++ b/lttv/lttv/hook.c
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -21,8 +21,7 @@
 #endif
 
 #include <lttv/hook.h>
-#include <ltt/compiler.h>
-#include <ltt/ltt.h>
+#include <stdio.h>
 
 typedef struct _LttvHookClosure {
        LttvHook      hook;
@@ -193,19 +192,23 @@ void lttv_hooks_remove_data(LttvHooks *h, LttvHook f, void *hook_data)
 }
 
 
-void lttv_hooks_remove_list(LttvHooks *h, LttvHooks *list)
+void lttv_hooks_remove_list(LttvHooks *h, const LttvHooks *list)
 {
        guint i, j;
 
        LttvHookClosure *c, *c_list;
 
        if(list == NULL) return;
+       g_assert(h != list);
+       /* This iteration assume that both list are in the same order */
        for(i = 0, j = 0 ; i < h->len && j < list->len ;) {
                c = &g_array_index(h, LttvHookClosure, i);
                c_list = &g_array_index(list, LttvHookClosure, j);
                if(c->hook == c_list->hook && c->hook_data == c_list->hook_data) {
                        if(c->ref_count == 1) {
+                               int count = h->len;
                                lttv_hooks_remove_by_position(h, i);
+                               g_assert((count-1) == h->len);
                        } else {
                                g_assert(c->ref_count != 0);
                                c->ref_count--;
@@ -394,3 +397,20 @@ gboolean lttv_hooks_call_check_merge(LttvHooks *h1, void *call_data1,
 
        return FALSE;
 }
+
+
+void lttv_hooks_print(const LttvHooks *h)
+{
+       LttvHookClosure *c;
+
+       guint i;
+
+       if(likely(h != NULL)) {
+               for(i = 0 ; i < h->len ; i++) {
+                       c = &g_array_index(h, LttvHookClosure, i);
+                       printf("%p:%i:%i,", c->hook, c->ref_count, c->prio);
+               }
+               printf("\n");
+       }
+
+}