configure: re-enable '-Wmissing-field-initializers'

[babeltrace.git] / src / plugins / utils / trimmer / trimmer.c

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 5b3a6c35d2c2918b4b4e47b9bb8c96f64427221d..31cad1c4823613adbaee93ee3f0ac6199680991f 100644 (file)
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -140,7 +140,6 @@ struct trimmer_comp *create_trimmer_comp(void)
        return g_new0(struct trimmer_comp, 1);
 }
 
-BT_HIDDEN
 void trimmer_finalize(bt_self_component_filter *self_comp)
 {
        struct trimmer_comp *trimmer_comp =
@@ -440,7 +439,7 @@ int set_bound_from_param(struct trimmer_comp *trimmer_comp,
                 * Just convert it to a temporary string to handle
                 * everything the same way.
                 */
-               sprintf(tmp_arg, "%" PRId64, value);
+               snprintf(tmp_arg, sizeof(tmp_arg), "%" PRId64, value);
                arg = tmp_arg;
        } else {
                BT_ASSERT(bt_value_is_string(param));
@@ -679,7 +678,6 @@ void destroy_trimmer_iterator_stream_state(
        g_free(sstate);
 }
 
-BT_HIDDEN
 bt_message_iterator_class_initialize_method_status trimmer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
@@ -784,27 +782,33 @@ int get_msg_ns_from_origin(const bt_message *msg, int64_t *ns_from_origin,
                        msg);
                break;
        case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-               clock_class =
-                       bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
-                               msg);
-               if (G_UNLIKELY(!clock_class)) {
-                       goto error;
+       {
+               const bt_packet *packet = bt_message_packet_beginning_borrow_packet_const(msg);
+               const bt_stream *stream = bt_packet_borrow_stream_const(packet);
+               const bt_stream_class *stream_class = bt_stream_borrow_class_const(stream);
+
+               if (!bt_stream_class_packets_have_beginning_default_clock_snapshot(stream_class)) {
+                       goto no_clock_snapshot;
                }
 
                clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(
                        msg);
                break;
+       }
        case BT_MESSAGE_TYPE_PACKET_END:
-               clock_class =
-                       bt_message_packet_end_borrow_stream_class_default_clock_class_const(
-                               msg);
-               if (G_UNLIKELY(!clock_class)) {
-                       goto error;
+       {
+               const bt_packet *packet = bt_message_packet_end_borrow_packet_const(msg);
+               const bt_stream *stream = bt_packet_borrow_stream_const(packet);
+               const bt_stream_class *stream_class = bt_stream_borrow_class_const(stream);
+
+               if (!bt_stream_class_packets_have_end_default_clock_snapshot(stream_class)) {
+                       goto no_clock_snapshot;
                }
 
                clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(
                        msg);
                break;
+       }
        case BT_MESSAGE_TYPE_STREAM_BEGINNING:
        {
                enum bt_message_stream_clock_snapshot_state cs_state;
@@ -840,27 +844,31 @@ int get_msg_ns_from_origin(const bt_message *msg, int64_t *ns_from_origin,
                break;
        }
        case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
-               clock_class =
-                       bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
-                               msg);
-               if (G_UNLIKELY(!clock_class)) {
-                       goto error;
+       {
+               const bt_stream *stream = bt_message_discarded_events_borrow_stream_const(msg);
+               const bt_stream_class *stream_class = bt_stream_borrow_class_const(stream);
+
+               if (!bt_stream_class_discarded_events_have_default_clock_snapshots(stream_class)) {
+                       goto no_clock_snapshot;
                }
 
                clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
                        msg);
                break;
+       }
        case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
-               clock_class =
-                       bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
-                               msg);
-               if (G_UNLIKELY(!clock_class)) {
-                       goto error;
+       {
+               const bt_stream *stream = bt_message_discarded_packets_borrow_stream_const(msg);
+               const bt_stream_class *stream_class = bt_stream_borrow_class_const(stream);
+
+               if (!bt_stream_class_discarded_packets_have_default_clock_snapshots(stream_class)) {
+                       goto no_clock_snapshot;
                }
 
                clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
                        msg);
                break;
+       }
        case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
                clock_snapshot =
                        bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
@@ -1865,7 +1873,6 @@ end:
        return status;
 }
 
-BT_HIDDEN
 bt_message_iterator_class_next_method_status trimmer_msg_iter_next(
                bt_self_message_iterator *self_msg_iter,
                bt_message_array_const msgs, uint64_t capacity,
@@ -1934,7 +1941,6 @@ end:
        return status;
 }
 
-BT_HIDDEN
 void trimmer_msg_iter_finalize(bt_self_message_iterator *self_msg_iter)
 {
        struct trimmer_iterator *trimmer_it =