lib: make values API const-correct

[babeltrace.git] / tests / lib / test_trace_ir_ref.c

diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c
index 9191890e73584d582bca1e80dd5f8314087f198e..d8af80b97c49e1d01f5ff6e8a5b44af2072599ab 100644 (file)
--- a/tests/lib/test_trace_ir_ref.c
+++ b/tests/lib/test_trace_ir_ref.c
@@ -73,22 +73,19 @@ static struct bt_private_field_class *create_integer_struct(void)
        BT_ASSERT(structure);
        ui8 = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(ui8);
-       ret = bt_private_field_class_integer_set_field_value_range(ui8, 8);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(ui8, 8);
        ret = bt_private_field_class_structure_append_member(structure,
                "payload_8", ui8);
        BT_ASSERT(ret == 0);
        ui16 = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(ui16);
-       ret = bt_private_field_class_integer_set_field_value_range(ui16, 16);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(ui16, 16);
        ret = bt_private_field_class_structure_append_member(structure,
                "payload_16", ui16);
        BT_ASSERT(ret == 0);
        ui32 = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(ui32);
-       ret = bt_private_field_class_integer_set_field_value_range(ui32, 32);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(ui32, 32);
        ret = bt_private_field_class_structure_append_member(structure,
                "payload_32", ui32);
        BT_ASSERT(ret == 0);
@@ -202,16 +199,14 @@ static void set_stream_class_field_classes(
        BT_ASSERT(packet_context_type);
        fc = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_private_field_class_structure_append_member(packet_context_type,
                "packet_size", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
        fc = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_private_field_class_structure_append_member(packet_context_type,
                "content_size", fc);
        BT_ASSERT(ret == 0);
@@ -220,8 +215,7 @@ static void set_stream_class_field_classes(
        BT_ASSERT(event_header_type);
        fc = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_private_field_class_structure_append_member(event_header_type,
                "id", fc);
        BT_ASSERT(ret == 0);
@@ -288,8 +282,7 @@ static void set_trace_packet_header(struct bt_private_trace *trace)
        BT_ASSERT(packet_header_type);
        fc = bt_private_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_private_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_private_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_private_field_class_structure_append_member(packet_header_type,
                "stream_id", fc);
        BT_ASSERT(ret == 0);
@@ -367,9 +360,9 @@ static void test_example_scenario(void)
                        "TC1 reference count is 1");
 
        /* User A acquires a reference to SC2 from TC1. */
-       user_a.sc = bt_object_get_ref(
-               bt_private_trace_borrow_stream_class_by_index(
-                       user_a.tc, 1));
+       user_a.sc = bt_private_trace_borrow_stream_class_by_index(
+                       user_a.tc, 1);
+       bt_object_get_ref(user_a.sc);
        ok(user_a.sc, "User A acquires SC2 from TC1");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
@@ -377,9 +370,9 @@ static void test_example_scenario(void)
                        "SC2 reference count is 1");
 
        /* User A acquires a reference to EC3 from SC2. */
-       user_a.ec = bt_object_get_ref(
-               bt_private_stream_class_borrow_event_class_by_index(
-                       user_a.sc, 0));
+       user_a.ec = bt_private_stream_class_borrow_event_class_by_index(
+                       user_a.sc, 0);
+       bt_object_get_ref(user_a.ec);
        ok(user_a.ec, "User A acquires EC3 from SC2");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
@@ -418,7 +411,8 @@ static void test_example_scenario(void)
 
        /* User B acquires a reference to SC1. */
        diag("User B acquires a reference to SC1");
-       user_b.sc = bt_object_get_ref(weak_sc1);
+       user_b.sc = weak_sc1;
+       bt_object_get_ref(user_b.sc);
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
        ok(bt_object_get_ref_count((void *) weak_sc1) == 1,
@@ -426,9 +420,9 @@ static void test_example_scenario(void)
 
        /* User C acquires a reference to EC1. */
        diag("User C acquires a reference to EC1");
-       user_c.ec = bt_object_get_ref(
-               bt_private_stream_class_borrow_event_class_by_index(
-                       user_b.sc, 0));
+       user_c.ec = bt_private_stream_class_borrow_event_class_by_index(
+                       user_b.sc, 0);
+       bt_object_get_ref(user_c.ec);
        ok(bt_object_get_ref_count((void *) weak_ec1) == 1,
                        "EC1 reference count is 1");
        ok(bt_object_get_ref_count((void *) weak_sc1) == 2,