X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2FtextFilter.c;h=3630b8e19ec14fde69ab6201d7096fc3b85c753a;hb=beed0826da72d30455ea860dffa1346ce261a20d;hp=28b5c8ee9e7933b92986a90891426d699ff2a756;hpb=8f31828398b8a4fcdb679324291132f4f0e3dce6;p=lttv.git

diff --git a/lttv/modules/text/textFilter.c b/lttv/modules/text/textFilter.c
index 28b5c8ee..3630b8e1 100644
--- a/lttv/modules/text/textFilter.c
+++ b/lttv/modules/text/textFilter.c
@@ -83,16 +83,15 @@ void filter_analyze_file(void *hook_data) {
 
   g_file_get_contents(a_file_name,&a_file_content,NULL,NULL);
   
-
-  if(((GString*)*(value.v_pointer))->len != 0)
-      g_string_append_c((GString*)*(value.v_pointer),'&');
-     g_string_append_c((GString*)*(value.v_pointer),'(');
-    g_string_append((GString*)*(value.v_pointer),a_file_content);
-    g_string_append_c((GString*)*(value.v_pointer),')');
-  
   retval= lttv_iattribute_find_by_path(attributes, "filter/expression",
     LTTV_POINTER, &value);
   g_assert(retval);
+
+  if (((GString*)*(value.v_pointer))->len != 0)
+    g_string_append_c((GString*)*(value.v_pointer),'&');
+  g_string_append_c((GString*)*(value.v_pointer),'(');
+  g_string_append((GString*)*(value.v_pointer),a_file_content);
+  g_string_append_c((GString*)*(value.v_pointer),')');
 }
 
 /**
@@ -111,16 +110,15 @@ void filter_analyze_string(void *hook_data) {
 	 * 	and/or command line string.  From these sources, an 
 	 * 	option string is rebuilded and sent to the filter core
 	 */
-
-  if(((GString*)*(value.v_pointer))->len != 0)
-      g_string_append_c((GString*)*(value.v_pointer),'&');
-    g_string_append_c((GString*)*(value.v_pointer),'(');
-    g_string_append((GString*)*(value.v_pointer),a_string);
-    g_string_append_c((GString*)*(value.v_pointer),')');
-
   retval= lttv_iattribute_find_by_path(attributes, "filter/expression",
     LTTV_POINTER, &value);
   g_assert(retval);
+
+  if (((GString*)*(value.v_pointer))->len != 0)
+    g_string_append_c((GString*)*(value.v_pointer),'&');
+  g_string_append_c((GString*)*(value.v_pointer),'(');
+  g_string_append((GString*)*(value.v_pointer),a_string);
+  g_string_append_c((GString*)*(value.v_pointer),')');
 }
 
 /**
@@ -146,7 +144,6 @@ void filter_list_commands(void *hook_data) {
   g_print("state.creation_time (double)\n");
   g_print("state.insertion_time (double)\n");
   g_print("state.process_name (string)\n");
-  g_print("state.thread_brand (string)\n");
   g_print("state.execution_mode (string)\n");
   g_print("state.execution_submode (string)\n");
   g_print("state.process_status (string)\n");