From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Mon, 11 Mar 2013 21:36:31 +0000 (-0400)
Subject: Change in babeltrace namespacing
X-Git-Tag: v1.5-beta1~26
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7f0923173774f57d40214a61fbc7d33af1edd93a;p=lttv.git

Change in babeltrace namespacing

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
---

diff --git a/lttv/lttv/event.c b/lttv/lttv/event.c
index c30dcf0b..61bdafb8 100644
--- a/lttv/lttv/event.c
+++ b/lttv/lttv/event.c
@@ -13,7 +13,7 @@ LttTime lttv_event_get_timestamp(LttvEvent *event)
 //TODO ybrosseau find a way to return an error code
 unsigned long lttv_event_get_long_unsigned(LttvEvent *event, const char* field)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	unsigned long data;
 	struct bt_ctf_event *ctf_event = event->bt_event;
@@ -41,7 +41,7 @@ unsigned long lttv_event_get_long_unsigned(LttvEvent *event, const char* field)
 
 char* lttv_event_get_string(LttvEvent *event, const char* field)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	char* data;
 	struct bt_ctf_event *ctf_event = event->bt_event;
@@ -78,7 +78,7 @@ char* lttv_event_get_string(LttvEvent *event, const char* field)
 }
 long lttv_event_get_long(LttvEvent *event, const char* field)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	long data;
 	struct bt_ctf_event *ctf_event = event->bt_event;
@@ -104,7 +104,7 @@ long lttv_event_get_long(LttvEvent *event, const char* field)
 /*
 unsigned int lttv_event_get_int_unsigned(LttvEvent *event, const char* field)
 {
-	struct definition *scope;
+	struct bt_definition *scope;
 	unsigned long timestamp;
 	char* data;
 	struct bt_ctf_event *ctf_event = event->bt_event;
@@ -126,7 +126,7 @@ unsigned int lttv_event_get_int_unsigned(LttvEvent *event, const char* field)
 }
 int lttv_event_get_int(LttvEvent *event, const char* field)
 {
-	struct definition *scope;
+	struct bt_definition *scope;
 	unsigned long timestamp;
 	char* data;
 	struct bt_ctf_event *ctf_event = event->bt_event;
diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index a8de92df..ff9cedac 100644
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -345,11 +345,11 @@ int getCPUIdFromEvent(LttvEvent *event, GString* cpuId_str)
 	return 0;
 }
 
-int getFields(struct bt_ctf_event *ctf_event, struct definition const *fields, GString* fieldsStr)
+int getFields(struct bt_ctf_event *ctf_event, struct bt_definition const *fields, GString* fieldsStr)
 {
 	enum ctf_type_id fieldType = bt_ctf_field_type(bt_ctf_get_decl_from_def(fields));
 	int ret = 0, isSigned = -1, len = 0, i = 0;
-	const struct definition *index_def; 
+	const struct bt_definition *index_def; 
 	switch (fieldType) {
 	case CTF_TYPE_INTEGER:
 		isSigned = bt_ctf_get_int_signedness(bt_ctf_get_decl_from_def(fields));
@@ -395,11 +395,11 @@ int getFields(struct bt_ctf_event *ctf_event, struct definition const *fields, G
 
 int getFieldsFromEvent(struct bt_ctf_event *ctf_event, GString* fields, gboolean field_names)
 {
-	struct definition const * const *list = NULL;
+	struct bt_definition const * const *list = NULL;
 	unsigned int count;
 	int i = 0, ret = 0;
 	gboolean noError = TRUE;
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	scope = bt_ctf_get_top_level_scope(ctf_event, BT_EVENT_FIELDS);
 
 	if (!scope) {