fix type casting

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

diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c
index 09b512b448611619c763b242f5a2667a38b5a8fe..e837068cb2bfc7ba8091a5ca4ac4932d463ba993 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/filter.c
+++ b/ltt/branches/poly/lttv/lttv/filter.c
@@ -63,6 +63,10 @@
  *  - remove the idle expressions in the tree 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 //#define TEST
 #ifdef TEST
 #include <time.h>
@@ -588,7 +592,7 @@ gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_eq_quark(const gpointer v1, LttvFieldValue v2) {
   GQuark* r = (GQuark*) v1;
-  g_print("v1:%i v2:%i\n",*r,v2.v_uint32);
+//  g_print("v1:%i v2:%i\n",*r,v2.v_uint32);
   return (*r == v2.v_uint32);
 }
 
@@ -1042,7 +1046,9 @@ lttv_filter_tree_clone(const LttvFilterTree* tree) {
  */
 LttvFilter*
 lttv_filter_clone(const LttvFilter* filter) {
-    
+ 
+       if(!filter) return NULL;
+
   LttvFilter* newfilter = g_new(LttvFilter,1); 
 
   strcpy(newfilter->expression,filter->expression);
@@ -1486,8 +1492,12 @@ lttv_filter_update(LttvFilter* filter) {
 void
 lttv_filter_destroy(LttvFilter* filter) {
   
-  g_free(filter->expression);
-  lttv_filter_tree_destroy(filter->head);
+       if(!filter) return;
+
+       if(filter->expression)
+         g_free(filter->expression);
+       if(filter->head)
+         lttv_filter_tree_destroy(filter->head);
   g_free(filter);
   
 }
@@ -1667,7 +1677,6 @@ lttv_filter_tree_parse(
       rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context);
   }
 
-  g_print("t:%p rresult:%i lresult:%i\n",t,rresult,lresult);
   
   /*
    * Apply and return the 
@@ -1717,16 +1726,14 @@ lttv_filter_tree_parse_branch(
         case LTTV_FILTER_TRACE_NAME:
             if(trace == NULL) return TRUE;
             else {
-                char* trace_name = ltt_trace_name(trace);
-                GQuark quark = g_quark_from_string(trace_name);
+                GQuark quark = ltt_trace_name(trace);
                 return se->op((gpointer)&quark,v);
             }
             break;
         case LTTV_FILTER_TRACEFILE_NAME:
             if(tracefile == NULL) return TRUE;
             else {
-                char* tracefile_name = ltt_tracefile_name(tracefile);
-                GQuark quark = g_quark_from_string(tracefile_name);
+                GQuark quark = ltt_tracefile_name(tracefile);
                 return se->op((gpointer)&quark,v);
             }
             break;
@@ -1785,8 +1792,7 @@ lttv_filter_tree_parse_branch(
             else {
               LttEventType* et;
               et = ltt_event_eventtype(event);
-              char* event_name = ltt_eventtype_name(et);
-              GQuark quark = g_quark_from_string(event_name);
+              GQuark quark = ltt_eventtype_name(et);
               return se->op((gpointer)&quark,v);
             }
             break;