X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2FtextDump.c;h=46f676ff90351875f3d0a4963bbdc420dac7c1c7;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=a8fadb5d509c805f490258246e1bdbdaa19a8e5c;hpb=7a4bdb546094fea3343bfc80e3744ea26a08dd22;p=lttv.git

diff --git a/lttv/modules/text/textDump.c b/lttv/modules/text/textDump.c
index a8fadb5d..46f676ff 100644
--- a/lttv/modules/text/textDump.c
+++ b/lttv/modules/text/textDump.c
@@ -13,8 +13,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.
  */
 
 /* The text dump facility needs to print headers before the trace set and
@@ -35,10 +35,8 @@
 #include <lttv/stats.h>
 #include <lttv/filter.h>
 #endif
+#include <lttv/traceset.h>
 #include <lttv/print.h>
-#include <ltt/ltt.h>
-#include <ltt/event.h>
-#include <ltt/trace.h>
 #include <stdio.h>
 #include <inttypes.h>
 
@@ -61,7 +59,7 @@ static LttvHooks
   *before_trace,
   *event_hook;
 
-
+#ifdef BABEL_CLEANUP
 static void 
 print_path_tree(FILE *fp, GString *indent, LttvAttribute *tree)
 {
@@ -199,6 +197,7 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
     }
   }
 }
+#endif
 #ifdef BABEL_CLEANUP
 static void
 print_stats(FILE *fp, LttvTracesetStats *tscs)
@@ -275,8 +274,9 @@ static gboolean write_traceset_header(void *hook_data, void *call_data)
 
 static gboolean write_traceset_footer(void *hook_data, void *call_data)
 {
+#ifdef BABEL_CLEAUP
   LttvTraceset *traceset = (LttvTraceset *)call_data;
-
+#endif
   g_info("TextDump traceset footer");
 
   fprintf(a_file,"End trace set\n\n");
@@ -308,10 +308,11 @@ static gboolean write_trace_header(void *hook_data, void *call_data)
 
 static int write_event_content(void *hook_data, void *call_data)
 {
+#ifdef BABEL_CLEANUP
   gboolean result;
 
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
-  
+#endif   
   LttvEvent *event = (LttvEvent *)call_data;
 #ifdef BABEL_CLEANUP  
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
@@ -351,7 +352,7 @@ static int write_event_content(void *hook_data, void *call_data)
 #endif
 
   /* TODO 2012-03-12 Add state info */
-  lttv_event_to_string(event, a_string, !a_no_field_names);
+  lttv_event_to_string(event, a_string, !a_no_field_names, TRUE);
 
 #ifdef BABEL_CLEANUP
   if(a_state) {