X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=bindings%2Fpython%2Fbabeltrace.i.in;h=a5426c825d9b40cb0b8248a8fd58a8d389e99d79;hp=d45afb0ac70e1f1caf10be29a8a6b80c37533baa;hb=f01efa78296179efeb48b1ec5379fa1465ae2824;hpb=db66cd1e87c54d500cb0c654bd6f32527e2c0623

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index d45afb0a..a5426c82 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -194,9 +194,6 @@ extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
 
-void format_init(void);
-void format_finalize(void);
-
 %pythoncode %{
 
 def print_format_list(babeltrace_file):
@@ -556,8 +553,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 		const struct definition *scope,	const char *field);
 %rename("_bt_ctf_get_index") bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 		const struct definition *field,	unsigned int index);
-%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct definition *def);
-%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct declaration *def);
+%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct definition *field);
+%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct declaration *field);
 %rename("_bt_ctf_get_int_signedness") bt_ctf_get_int_signedness(
 		const struct declaration *field);
 %rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct declaration *field);
@@ -575,6 +572,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 		bt_ctf_event_decl *event);
 %rename("_bt_ctf_get_decl_field_name") bt_ctf_get_decl_field_name(
 		const struct bt_ctf_field_decl *field);
+%rename("_bt_ctf_get_decl_from_def") bt_ctf_get_decl_from_def(
+		const struct definition *field);
 
 const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
 		enum bt_ctf_scope scope);
@@ -587,8 +586,8 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 		const struct definition *field,
 		unsigned int index);
-const char *bt_ctf_field_name(const struct definition *def);
-enum ctf_type_id bt_ctf_field_type(const struct declaration *def);
+const char *bt_ctf_field_name(const struct definition *field);
+enum ctf_type_id bt_ctf_field_type(const struct declaration *field);
 int bt_ctf_get_int_signedness(const struct declaration *field);
 int bt_ctf_get_int_base(const struct declaration *field);
 int bt_ctf_get_int_byte_order(const struct declaration *field);
@@ -602,6 +601,7 @@ char *bt_ctf_get_string(const struct definition *field);
 int bt_ctf_field_get_error(void);
 const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event);
 const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field);
+const struct declaration *bt_ctf_get_decl_from_def(const struct definition *field);
 
 %pythoncode%{
 
@@ -842,25 +842,25 @@ class ctf:
 
 		def field_type(self):
 			"""Return the type of a field or -1 if unknown."""
-			return _bt_ctf_field_type(self._d)
+			return _bt_ctf_field_type(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_int_signedness(self):
 			"""
 			Return the signedness of an integer:
 			0 if unsigned; 1 if signed; -1 on error.
 			"""
-			return _bt_ctf_get_int_signedness(self._d)
+			return _bt_ctf_get_int_signedness(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_int_base(self):
 			"""Return the base of an int or a negative value on error."""
-			return _bt_ctf_get_int_base(self._d)
+			return _bt_ctf_get_int_base(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_int_byte_order(self):
 			"""
 			Return the byte order of an int or a negative
 			value on error.
 			"""
-			return _bt_ctf_get_int_byte_order(self._d)
+			return _bt_ctf_get_int_byte_order(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_int_len(self):
 			"""
@@ -874,14 +874,14 @@ class ctf:
 			Return the encoding of an int or a string.
 			Return a negative value on error.
 			"""
-			return _bt_ctf_get_encoding(self._d)
+			return _bt_ctf_get_encoding(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_array_len(self):
 			"""
 			Return the len of an array or a negative
 			value on error.
 			"""
-			return _bt_ctf_get_array_len(self._d)
+			return _bt_ctf_get_array_len(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_uint64(self):
 			"""