X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fprint.c;h=4b7ef44717d93080152384b24737130b425264a1;hb=a5ea8f1b4774e8c80ce8b0a5478a5fe8c4d46b07;hp=53873d22f19b70bf2577927cd0d26db93fe12dfc;hpb=14bc9b7c68fe5eb3d0177ed45bfced546957fdce;p=lttv.git

diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index 53873d22..4b7ef447 100644
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -50,25 +50,26 @@ static inline void print_enum_events(LttEvent *e, struct marker_field *f,
   LttTracefile *tf = tfs->parent.tf;
   struct marker_info *info = marker_get_info_from_id(tf->mdata, e->event_id);
   LttvTraceState *ts = (LttvTraceState*)(tfs->parent.t_context);
+  LttvNameTables *nt = ts->name_tables;
   
   if (tf->name == LTT_CHANNEL_KERNEL) {
     if (info->name == LTT_EVENT_SYSCALL_ENTRY
         && f->name == LTT_FIELD_SYSCALL_ID) {
       g_string_append_printf(s, " [%s]",
-        g_quark_to_string(ts->syscall_names[value]));
+        g_quark_to_string(nt->syscall_names[value]));
     } else if ((info->name == LTT_EVENT_SOFT_IRQ_ENTRY
                 || info->name == LTT_EVENT_SOFT_IRQ_EXIT
                 || info->name == LTT_EVENT_SOFT_IRQ_RAISE)
                && f->name == LTT_FIELD_SOFT_IRQ_ID) {
       g_string_append_printf(s, " [%s]",
-        g_quark_to_string(ts->soft_irq_names[value]));
+        g_quark_to_string(nt->soft_irq_names[value]));
     } else if (info->name == LTT_EVENT_KPROBE
                && f->name == LTT_FIELD_IP) {
-#if (__SIZEOF_LONG__ == 4)
-      GQuark symbol = (GQuark)g_hash_table_lookup(ts->kprobe_hash,
+#if (__WORDSIZE == 32)
+      GQuark symbol = (GQuark)g_hash_table_lookup(nt->kprobe_hash,
                                           (gconstpointer)&value);
 #else
-      GQuark symbol = (GQuark)g_hash_table_lookup(ts->kprobe_hash,
+      GQuark symbol = (GQuark)(unsigned long)g_hash_table_lookup(nt->kprobe_hash,
                                           (gconstpointer)value);
 #endif
       if (symbol)