X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=06c8370c8f8ce960bfcc7f18f1bcc05f947f9993;hb=79257ba540581e198c9d9b047fe0738a25c324ff;hp=f0eca9cb991323bccfd7add62433ff207beec80f;hpb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c
index f0eca9cb..06c8370c 100644
--- a/ltt/branches/poly/lttv/lttv/filter.c
+++ b/ltt/branches/poly/lttv/lttv/filter.c
@@ -74,6 +74,9 @@
 #endif
 
 #include <lttv/filter.h>
+#include <ltt/trace.h>
+#include <stdlib.h>
+#include <string.h>
 
 /**
  * @fn LttvSimpleExpression* lttv_simple_expression_new()
@@ -109,7 +112,7 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
   GString* f = NULL;
   
   if(fp->len < 2) return FALSE;
-  g_assert(f=g_ptr_array_remove_index(fp,0)); 
+  g_assert((f=g_ptr_array_remove_index(fp,0))); 
   
   /*
    * Parse through the specified 
@@ -376,7 +379,6 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
   gboolean is_double = FALSE;
   LttTime t = ltt_time_zero;
   GString* v;
-  GQuark quark;
   
   switch(se->field) {
      /* 
@@ -421,14 +423,14 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
               /* cannot specify number with more than one '.' */
               if(is_double) return FALSE; 
               else is_double = TRUE;
-              t.tv_sec = atoi(v);
+              t.tv_sec = atoi(v->str);
               g_string_free(v,TRUE);
               v = g_string_new("");
           } else g_string_append_c(v,value[i]);
        }
        /* number can be integer or double */
-       if(is_double) t.tv_nsec = atoi(v);
-       else t.tv_sec = atoi(v);
+       if(is_double) t.tv_nsec = atoi(v->str);
+       else t.tv_sec = atoi(v->str);
        
        g_string_free(v,TRUE);
        
@@ -1537,6 +1539,7 @@ lttv_filter_append_expression(LttvFilter* filter, const char *expression) {
 
   if(expression == NULL) return FALSE;
   if(filter == NULL) return FALSE;
+  if(expression[0] == '\0') return FALSE;  /* Empty expression */
 
   GString* s = g_string_new("");
   if(filter->expression != NULL) {
@@ -1726,16 +1729,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;
@@ -1794,8 +1795,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;