X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=trunk%2Flttv%2Flttv%2Flttv%2Fprint.c;h=c9099064d2bab23142806629342ad50cd707aa9b;hb=d2d7b248bca9a289b83aa8122174b9cd085753ac;hp=8bba69719df48a48d69ce92114c2f8d7c0750926;hpb=750eb11ac3adbb2c4c3e6cf5323a523e9da7b8ae;p=lttv.git

diff --git a/trunk/lttv/lttv/lttv/print.c b/trunk/lttv/lttv/lttv/print.c
index 8bba6971..c9099064 100644
--- a/trunk/lttv/lttv/lttv/print.c
+++ b/trunk/lttv/lttv/lttv/print.c
@@ -42,6 +42,7 @@
 #include <ctype.h>
 #include <ltt/ltt-private.h>
 #include <string.h>
+#include <inttypes.h>
 
 static inline void print_enum_events(LttEvent *e, struct marker_field *f,
                       guint64 value, GString *s, LttvTracefileState *tfs)
@@ -140,7 +141,7 @@ void lttv_print_field(LttEvent *e, struct marker_field *f, GString *s,
         if(name)
           g_string_append_printf(s, "%s = ", g_quark_to_string(name));
       }
-      g_string_append_printf(s, "0x%llx", ltt_event_get_long_unsigned(e,f));
+      g_string_append_printf(s, "0x%" PRIx64, ltt_event_get_long_unsigned(e,f));
       //g_string_append_printf(s, type->fmt, ltt_event_get_long_unsigned(e,f));
       break;
 
@@ -263,7 +264,7 @@ void lttv_event_to_string(LttEvent *e, GString *s,
 
   if(mandatory_fields) {
     time = ltt_event_time(e);
-    g_string_append_printf(s,"%s: %ld.%09ld (%s%s_%u)",
+    g_string_append_printf(s,"%s: %ld.%09ld (%s/%s_%u)",
         g_quark_to_string(info->name),
         (long)time.tv_sec, time.tv_nsec,
 	g_quark_to_string(
@@ -271,12 +272,13 @@ void lttv_event_to_string(LttEvent *e, GString *s,
         g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
         cpu);
     /* Print the process id and the state/interrupt type of the process */
-    g_string_append_printf(s,", %u, %u, %s, %s, %u, 0x%llX, %s", process->pid,
-        process->tgid,
-        g_quark_to_string(process->name),
-        g_quark_to_string(process->brand),
-        process->ppid, process->current_function,
-        g_quark_to_string(process->state->t));
+    g_string_append_printf(s,", %u, %u, %s, %s, %u, 0x%" PRIx64", %s",
+			   process->pid,
+			   process->tgid,
+			   g_quark_to_string(process->name),
+			   g_quark_to_string(process->brand),
+			   process->ppid, process->current_function,
+			   g_quark_to_string(process->state->t));
   }
   
   if(marker_get_num_fields(info) == 0) return;