64 bits warnings fix

[lttv.git] / ltt / branches / poly / lttv / lttv / tracecontext.c

diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c
index 47a327621b98f5c496cca9d9269bd6542882d7c4..e6fb8fdfeaa46e27ae8f02c10ab8a13fa247bb9d 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/tracecontext.c
+++ b/ltt/branches/poly/lttv/lttv/tracecontext.c
@@ -968,18 +968,20 @@ struct marker_info *lttv_trace_hook_get_marker(LttTrace *t, LttvTraceHook *th)
   return marker_get_info_from_id(t, th->id);
 }
 
-
-int lttv_trace_find_hook(LttTrace *t, GQuark marker_name,
+int lttv_trace_find_hook(LttTrace *t, GQuark facility_name, GQuark event_name,
     GQuark fields[], LttvHook h, gpointer hook_data, GArray **trace_hooks)
 {
   struct marker_info *info;
-  struct marker_field *field;
   guint16 marker_id;
   int init_array_size;
+  GQuark marker_name;
+
+  marker_name = lttv_merge_facility_event_name(facility_name, event_name);
 
   info = marker_get_info_from_name(t, marker_name);
   if(unlikely(info == NULL)) {
-    return NULL;
+    g_warning("No marker of name %s found", g_quark_to_string(marker_name));
+    return 1;
   }
 
   init_array_size = (*trace_hooks)->len;
@@ -989,6 +991,7 @@ int lttv_trace_find_hook(LttTrace *t, GQuark marker_name,
     LttvTraceHook tmpth;
     int found;
     GQuark *f;
+    struct marker_field *marker_field;
 
     marker_id = marker_get_id_from_info(t, info);
 
@@ -1001,7 +1004,7 @@ int lttv_trace_find_hook(LttTrace *t, GQuark marker_name,
     for(f = fields; f && *f != 0; f++) {
       found = 0;
       for_each_marker_field(marker_field, info) {
-        if(marker_fieldfield->name == *f) {
+        if(marker_field->name == *f) {
           found = 1;
           g_ptr_array_add(tmpth.fields, marker_field);
           break;
@@ -1035,10 +1038,10 @@ skip_marker:
 void lttv_trace_hook_remove_all(GArray **th)
 {
   int i;
-  for(i=0; i<th->len; i++) {
-    g_ptr_array_free(g_array_index(th, LttvTraceHook, i).fields, TRUE);
+  for(i=0; i<(*th)->len; i++) {
+    g_ptr_array_free(g_array_index(*th, LttvTraceHook, i).fields, TRUE);
   }
-  *th = g_array_remove_range(*th, 0, th->len);
+  *th = g_array_remove_range(*th, 0, (*th)->len);
 }
 
 LttvTracesetContextPosition *lttv_traceset_context_position_new(
@@ -1561,6 +1564,7 @@ static gint seek_forward_event_hook(void *hook_data, void* call_data)
   sd->event_count++;
   if(sd->event_count >= sd->n)
       return TRUE;
+  return FALSE;
 }
 
 /* Seek back n events forward from the current position (1 to n)