bt2: make bt_bt2_trace_{,class}_add_destruction_listener return a status

[babeltrace.git] / src / bindings / python / bt2 / bt2 / trace_class.py

diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py
index d480b819b4da9ed434bca596d61208a9b7f2e37a..8032ed117b88532f3728c252aef55384804de33a 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace_class.py
+++ b/src/bindings/python/bt2/bt2/trace_class.py
@@ -226,7 +226,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
         self, field_value_range=None, preferred_display_base=None
     ):
         return self._create_integer_field_class(
-            native_bt.field_class_signed_integer_create,
+            native_bt.field_class_integer_signed_create,
             bt2.field_class._SignedIntegerFieldClass,
             'signed integer',
             field_value_range,
@@ -237,7 +237,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
         self, field_value_range=None, preferred_display_base=None
     ):
         return self._create_integer_field_class(
-            native_bt.field_class_unsigned_integer_create,
+            native_bt.field_class_integer_unsigned_create,
             bt2.field_class._UnsignedIntegerFieldClass,
             'unsigned integer',
             field_value_range,
@@ -248,7 +248,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
         self, field_value_range=None, preferred_display_base=None
     ):
         return self._create_integer_field_class(
-            native_bt.field_class_signed_enumeration_create,
+            native_bt.field_class_enumeration_signed_create,
             bt2.field_class._SignedEnumerationFieldClass,
             'signed enumeration',
             field_value_range,
@@ -259,7 +259,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
         self, field_value_range=None, preferred_display_base=None
     ):
         return self._create_integer_field_class(
-            native_bt.field_class_unsigned_enumeration_create,
+            native_bt.field_class_enumeration_unsigned_create,
             bt2.field_class._UnsignedEnumerationFieldClass,
             'unsigned enumeration',
             field_value_range,
@@ -291,7 +291,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
     def create_static_array_field_class(self, elem_fc, length):
         utils._check_type(elem_fc, bt2.field_class._FieldClass)
         utils._check_uint64(length)
-        ptr = native_bt.field_class_static_array_create(self._ptr, elem_fc._ptr, length)
+        ptr = native_bt.field_class_array_static_create(self._ptr, elem_fc._ptr, length)
         self._check_create_status(ptr, 'static array')
 
         return bt2.field_class._StaticArrayFieldClass._create_from_ptr_and_get_ref(ptr)
@@ -304,7 +304,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
             utils._check_type(length_fc, bt2.field_class._UnsignedIntegerFieldClass)
             length_fc_ptr = length_fc._ptr
 
-        ptr = native_bt.field_class_dynamic_array_create(
+        ptr = native_bt.field_class_array_dynamic_create(
             self._ptr, elem_fc._ptr, length_fc_ptr
         )
         self._check_create_status(ptr, 'dynamic array')
@@ -333,10 +333,9 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
             _trace_class_destruction_listener_from_native, listener
         )
 
-        listener_id = fn(self._ptr, listener_from_native)
-        if listener_id is None:
-            utils._raise_bt2_error(
-                'cannot add destruction listener to trace class object'
-            )
+        status, listener_id = fn(self._ptr, listener_from_native)
+        utils._handle_func_status(
+            status, 'cannot add destruction listener to trace class object'
+        )
 
         return bt2._ListenerHandle(listener_id, self)