Update FSF address

[lttv.git] / lttv / modules / text / textFilter.c

diff --git a/lttv/modules/text/textFilter.c b/lttv/modules/text/textFilter.c
index 28b5c8ee9e7933b92986a90891426d699ff2a756..2fbd670391409fe97f74a4ac8a00916c00efe680 100644 (file)
--- a/lttv/modules/text/textFilter.c
+++ b/lttv/modules/text/textFilter.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.
  */
 
 /*! \file 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");