X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fprint.c;h=57936e648c89c1ce38e977668a472f872a802d46;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=ff9cedac41d03ebae394926a97281f59d03a7619;hpb=7f0923173774f57d40214a61fbc7d33af1edd93a;p=lttv.git

diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index ff9cedac..57936e64 100644
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.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.
  */
 
 /* print.c
@@ -37,12 +37,8 @@
 #include <lttv/filter.h>
 #endif
 #include <lttv/print.h>
-#include <ltt/ltt.h>
-#include <ltt/event.h>
-#include <ltt/trace.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <ltt/ltt-private.h>
 #include <babeltrace/ctf/events.h>
 #include <string.h>
 #include <inttypes.h>
@@ -357,7 +353,7 @@ int getFields(struct bt_ctf_event *ctf_event, struct bt_definition const *fields
 			g_string_append_printf(fieldsStr, "%lu", bt_ctf_get_int64(fields));
 		}
 		else if (isSigned == 0) {
-			g_string_append_printf(fieldsStr, "%llu", bt_ctf_get_uint64(fields));
+			g_string_append_printf(fieldsStr, "%" PRIu64 , bt_ctf_get_uint64(fields));
 		}
 		break;
 	case CTF_TYPE_STRING:
@@ -445,7 +441,7 @@ void lttv_event_to_string(LttvEvent *event, GString *a_string,
 
 	g_string_set_size(a_string,0);
 	if(long_version){
-		g_string_append_printf(a_string, "%llu %s: ", 
+		g_string_append_printf(a_string,"%" PRIu64 " %s: ", 
 				       bt_ctf_get_timestamp(event->bt_event), 
 				       bt_ctf_event_name(event->bt_event));
 	}
@@ -493,11 +489,10 @@ void lttv_event_to_string(LttEvent *e, GString *s, gboolean mandatory_fields,
 					ltt_trace_name(ltt_tracefile_get_trace(tfs->parent.tf))),
 			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%" PRIx64", %s",
+		g_string_append_printf(s,", %u, %u, %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));