X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=ff0fcb302864dbb520daa01285b5facebab1bade;hb=1cf393f63db4dce618515749d5549564d1313ee4;hp=ac7dce46828daf103adea381e30e2c84f31f50ab;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;p=babeltrace.git

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index ac7dce46..ff0fcb30 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -106,7 +106,7 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 	if (!ctf_event || !scope || !field)
 		return NULL;
 
-	def = lookup_definition(scope, field);
+	def = bt_lookup_definition(scope, field);
 	/*
 	 * optionally a field can have an underscore prefix, try
 	 * to lookup the field with this prefix if it failed
@@ -115,7 +115,7 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 		field_underscore = g_new(char, strlen(field) + 2);
 		field_underscore[0] = '_';
 		strcpy(&field_underscore[1], field);
-		def = lookup_definition(scope, field_underscore);
+		def = bt_lookup_definition(scope, field_underscore);
 		g_free(field_underscore);
 	}
 	if (bt_ctf_field_type(bt_ctf_get_decl_from_def(def)) == CTF_TYPE_VARIANT) {
@@ -140,12 +140,12 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 		struct definition_array *array_definition;
 		array_definition = container_of(field,
 				struct definition_array, p);
-		ret = array_index(array_definition, index);
+		ret = bt_array_index(array_definition, index);
 	} else if (bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_SEQUENCE) {
 		struct definition_sequence *sequence_definition;
 		sequence_definition = container_of(field,
 				struct definition_sequence, p);
-		ret = sequence_index(sequence_definition, index);
+		ret = bt_sequence_index(sequence_definition, index);
 	}
 	return ret;
 }
@@ -168,7 +168,7 @@ const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 
 const char *bt_ctf_field_name(const struct definition *def)
 {
-	if (!def)
+	if (!def || !def->name)
 		return NULL;
 
 	return rem_(g_quark_to_string(def->name));
@@ -462,12 +462,12 @@ const char *bt_ctf_get_enum_str(const struct definition *field)
 	}
 	def_enum = container_of(field, const struct definition_enum, p);
 	decl_enum = def_enum->declaration;
-	if (get_int_signedness(&def_enum->integer->p)) {
-		array = enum_int_to_quark_set(decl_enum,
-			get_signed_int(&def_enum->integer->p));
+	if (bt_get_int_signedness(&def_enum->integer->p)) {
+		array = bt_enum_int_to_quark_set(decl_enum,
+			bt_get_signed_int(&def_enum->integer->p));
 	} else {
-		array = enum_uint_to_quark_set(decl_enum,
-			get_unsigned_int(&def_enum->integer->p));
+		array = bt_enum_uint_to_quark_set(decl_enum,
+			bt_get_unsigned_int(&def_enum->integer->p));
 	}
 	if (!array) {
 		bt_ctf_field_set_error(-ENOENT);
@@ -559,7 +559,7 @@ uint64_t bt_ctf_get_uint64(const struct definition *field)
 	uint64_t ret = 0;
 
 	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
-		ret = get_unsigned_int(field);
+		ret = bt_get_unsigned_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
@@ -571,7 +571,7 @@ int64_t bt_ctf_get_int64(const struct definition *field)
 	int64_t ret = 0;
 
 	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
-		ret = get_signed_int(field);
+		ret = bt_get_signed_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
@@ -584,7 +584,7 @@ char *bt_ctf_get_char_array(const struct definition *field)
 	GString *char_array;
 
 	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_ARRAY) {
-		char_array = get_char_array(field);
+		char_array = bt_get_char_array(field);
 		if (char_array) {
 			ret = char_array->str;
 			goto end;
@@ -601,7 +601,7 @@ char *bt_ctf_get_string(const struct definition *field)
 	char *ret = NULL;
 
 	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_STRING)
-		ret = get_string(field);
+		ret = bt_get_string(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);