lib: bt_object_{get,put}_ref(): accept a `const` parameter

[babeltrace.git] / lib / trace-ir / stream-class.c

diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c
index f99ce1adf9aa306d4453a43dd625f1041d728cad..6b33bca6473a2cc7e1bf5fa7cbc3ca513a2b3fa6 100644 (file)
--- a/lib/trace-ir/stream-class.c
+++ b/lib/trace-ir/stream-class.c
@@ -56,23 +56,26 @@ void destroy_stream_class(struct bt_object *obj)
 
        BT_LIB_LOGD("Destroying stream class: %!+S", stream_class);
        BT_LOGD_STR("Putting default clock class.");
-       bt_object_put_ref(stream_class->default_clock_class);
+       BT_OBJECT_PUT_REF_AND_RESET(stream_class->default_clock_class);
 
        if (stream_class->event_classes) {
                BT_LOGD_STR("Destroying event classes.");
                g_ptr_array_free(stream_class->event_classes, TRUE);
+               stream_class->event_classes = NULL;
        }
 
        if (stream_class->name.str) {
                g_string_free(stream_class->name.str, TRUE);
+               stream_class->name.str = NULL;
+               stream_class->name.value = NULL;
        }
 
        BT_LOGD_STR("Putting event header field classe.");
-       bt_object_put_ref(stream_class->event_header_fc);
+       BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc);
        BT_LOGD_STR("Putting packet context field classe.");
-       bt_object_put_ref(stream_class->packet_context_fc);
+       BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc);
        BT_LOGD_STR("Putting event common context field classe.");
-       bt_object_put_ref(stream_class->event_common_context_fc);
+       BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_common_context_fc);
        bt_object_pool_finalize(&stream_class->event_header_field_pool);
        bt_object_pool_finalize(&stream_class->packet_context_field_pool);
        g_free(stream_class);
@@ -342,7 +345,8 @@ int bt_private_stream_class_set_packet_context_field_class(
 
        bt_field_class_make_part_of_trace(field_class);
        bt_object_put_ref(stream_class->packet_context_fc);
-       stream_class->packet_context_fc = bt_object_get_ref(field_class);
+       stream_class->packet_context_fc = field_class;
+       bt_object_get_no_null_check(stream_class->packet_context_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGV("Set stream class's packet context field classe: %!+S",
                stream_class);
@@ -399,7 +403,8 @@ int bt_private_stream_class_set_event_header_field_class(
 
        bt_field_class_make_part_of_trace(field_class);
        bt_object_put_ref(stream_class->event_header_fc);
-       stream_class->event_header_fc = bt_object_get_ref(field_class);
+       stream_class->event_header_fc = field_class;
+       bt_object_get_no_null_check(stream_class->event_header_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGV("Set stream class's event header field classe: %!+S",
                stream_class);
@@ -457,7 +462,8 @@ int bt_private_stream_class_set_event_common_context_field_class(
 
        bt_field_class_make_part_of_trace(field_class);
        bt_object_put_ref(stream_class->event_common_context_fc);
-       stream_class->event_common_context_fc = bt_object_get_ref(field_class);
+       stream_class->event_common_context_fc = field_class;
+       bt_object_get_no_null_check(stream_class->event_common_context_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGV("Set stream class's event common context field classe: %!+S",
                stream_class);
@@ -485,7 +491,8 @@ int bt_private_stream_class_set_default_clock_class(
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
        bt_object_put_ref(stream_class->default_clock_class);
-       stream_class->default_clock_class = bt_object_get_ref(clock_class);
+       stream_class->default_clock_class = clock_class;
+       bt_object_get_no_null_check(stream_class->default_clock_class);
        bt_clock_class_freeze(clock_class);
        BT_LIB_LOGV("Set stream class's default clock class: %!+S",
                stream_class);
@@ -506,7 +513,7 @@ bt_bool bt_stream_class_assigns_automatic_event_class_id(
        return (bt_bool) stream_class->assigns_automatic_event_class_id;
 }
 
-int bt_private_stream_class_set_assigns_automatic_event_class_id(
+void bt_private_stream_class_set_assigns_automatic_event_class_id(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -517,7 +524,6 @@ int bt_private_stream_class_set_assigns_automatic_event_class_id(
        stream_class->assigns_automatic_event_class_id = (bool) value;
        BT_LIB_LOGV("Set stream class's automatic event class ID "
                "assignment property: %!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_assigns_automatic_stream_id(
@@ -527,7 +533,7 @@ bt_bool bt_stream_class_assigns_automatic_stream_id(
        return (bt_bool) stream_class->assigns_automatic_stream_id;
 }
 
-int bt_private_stream_class_set_assigns_automatic_stream_id(
+void bt_private_stream_class_set_assigns_automatic_stream_id(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -538,7 +544,6 @@ int bt_private_stream_class_set_assigns_automatic_stream_id(
        stream_class->assigns_automatic_stream_id = (bool) value;
        BT_LIB_LOGV("Set stream class's automatic stream ID "
                "assignment property: %!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot(
@@ -548,7 +553,7 @@ bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot(
        return (bt_bool) stream_class->packets_have_discarded_event_counter_snapshot;
 }
 
-int bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot(
+void bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -561,7 +566,6 @@ int bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot(
        BT_LIB_LOGV("Set stream class's "
                "\"packets have discarded event counter snapshot\" property: "
                "%!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_packets_have_packet_counter_snapshot(
@@ -571,7 +575,7 @@ bt_bool bt_stream_class_packets_have_packet_counter_snapshot(
        return (bt_bool) stream_class->packets_have_packet_counter_snapshot;
 }
 
-int bt_private_stream_class_set_packets_have_packet_counter_snapshot(
+void bt_private_stream_class_set_packets_have_packet_counter_snapshot(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -584,7 +588,6 @@ int bt_private_stream_class_set_packets_have_packet_counter_snapshot(
        BT_LIB_LOGV("Set stream class's "
                "\"packets have packet counter snapshot\" property: "
                "%!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_packets_have_default_beginning_clock_value(
@@ -594,7 +597,7 @@ bt_bool bt_stream_class_packets_have_default_beginning_clock_value(
        return (bt_bool) stream_class->packets_have_default_beginning_cv;
 }
 
-int bt_private_stream_class_set_packets_have_default_beginning_clock_value(
+void bt_private_stream_class_set_packets_have_default_beginning_clock_value(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -609,7 +612,6 @@ int bt_private_stream_class_set_packets_have_default_beginning_clock_value(
        BT_LIB_LOGV("Set stream class's "
                "\"packets have default beginning clock value\" property: "
                "%!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_packets_have_default_end_clock_value(
@@ -619,7 +621,7 @@ bt_bool bt_stream_class_packets_have_default_end_clock_value(
        return (bt_bool) stream_class->packets_have_default_end_cv;
 }
 
-int bt_private_stream_class_set_packets_have_default_end_clock_value(
+void bt_private_stream_class_set_packets_have_default_end_clock_value(
                struct bt_private_stream_class *priv_stream_class,
                bt_bool value)
 {
@@ -634,7 +636,6 @@ int bt_private_stream_class_set_packets_have_default_end_clock_value(
        BT_LIB_LOGV("Set stream class's "
                "\"packets have default end clock value\" property: "
                "%!+S", stream_class);
-       return 0;
 }
 
 bt_bool bt_stream_class_default_clock_is_always_known(
@@ -643,9 +644,3 @@ bt_bool bt_stream_class_default_clock_is_always_known(
        /* BT_CLOCK_VALUE_STATUS_UNKNOWN is not supported as of 2.0 */
        return BT_TRUE;
 }
-
-struct bt_stream_class *bt_stream_class_borrow_from_private(
-               struct bt_private_stream_class *priv_stream_class)
-{
-       return (void *) priv_stream_class;
-}