X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fstream-class.c;h=b23d47713251d93e53192d97e03144d1711c33a7;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=ffec66557f991456a8ecdf4a8dfc4f09731e247f;hpb=217cf9d33a3ffc88e6eeaf21f3d46ee00cbeb0c4;p=babeltrace.git

diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c
index ffec6655..b23d4771 100644
--- a/src/ctf-writer/stream-class.c
+++ b/src/ctf-writer/stream-class.c
@@ -25,7 +25,6 @@
 #include "logging.h"
 
 #include <inttypes.h>
-#include <stdbool.h>
 #include <stdint.h>
 
 #include <babeltrace2-ctf-writer/event.h>
@@ -166,8 +165,9 @@ int bt_ctf_stream_class_common_add_event_class(
 	const enum bt_ctf_validation_flag validation_flags =
 		BT_CTF_VALIDATION_FLAG_EVENT;
 	struct bt_ctf_clock_class *expected_clock_class = NULL;
+	struct bt_ctf_search_query query = { .value = event_class, .found = 0 };
 
-	BT_ASSERT(copy_field_type_func);
+	BT_ASSERT_DBG(copy_field_type_func);
 
 	if (!stream_class || !event_class) {
 		BT_LOGW("Invalid parameter: stream class or event class is NULL: "
@@ -238,7 +238,6 @@ int bt_ctf_stream_class_common_add_event_class(
 	}
 
 	/* Check for duplicate event classes */
-	struct bt_ctf_search_query query = { .value = event_class, .found = 0 };
 	g_ptr_array_foreach(stream_class->event_classes, event_class_exists,
 		&query);
 	if (query.found) {
@@ -271,8 +270,8 @@ int bt_ctf_stream_class_common_add_event_class(
 		 * The trace and stream class should be valid at this
 		 * point.
 		 */
-		BT_ASSERT(trace->valid);
-		BT_ASSERT(stream_class->valid);
+		BT_ASSERT_DBG(trace->valid);
+		BT_ASSERT_DBG(stream_class->valid);
 		packet_header_type =
 			bt_ctf_trace_common_borrow_packet_header_field_type(trace);
 		packet_context_type =
@@ -371,7 +370,7 @@ int bt_ctf_stream_class_common_add_event_class(
 	 * now if the stream class is frozen.
 	 */
 	if (stream_class->frozen && expected_clock_class) {
-		BT_ASSERT(!stream_class->clock_class ||
+		BT_ASSERT_DBG(!stream_class->clock_class ||
 			stream_class->clock_class == expected_clock_class);
 		BT_CTF_OBJECT_MOVE_REF(stream_class->clock_class, expected_clock_class);
 	}
@@ -478,8 +477,8 @@ int bt_ctf_stream_class_common_validate_single_clock_class(
 	int ret;
 	uint64_t i;
 
-	BT_ASSERT(stream_class);
-	BT_ASSERT(expected_clock_class);
+	BT_ASSERT_DBG(stream_class);
+	BT_ASSERT_DBG(expected_clock_class);
 	ret = bt_ctf_field_type_common_validate_single_clock_class(
 		stream_class->packet_context_field_type,
 		expected_clock_class);
@@ -538,7 +537,7 @@ int bt_ctf_stream_class_common_validate_single_clock_class(
 		struct bt_ctf_event_class_common *event_class =
 			g_ptr_array_index(stream_class->event_classes, i);
 
-		BT_ASSERT(event_class);
+		BT_ASSERT_DBG(event_class);
 		ret = bt_ctf_event_class_common_validate_single_clock_class(
 			event_class, expected_clock_class);
 		if (ret) {
@@ -613,7 +612,7 @@ int init_packet_context(struct bt_ctf_stream_class *stream_class)
 		bt_ctf_field_type_structure_create();
 	struct bt_ctf_field_type *_uint64_t =
 		get_field_type(FIELD_TYPE_ALIAS_UINT64_T);
-	struct bt_ctf_field_type *ts_begin_end_uint64_t;
+	struct bt_ctf_field_type *ts_begin_end_uint64_t = NULL;
 
 	if (!packet_context_type) {
 		BT_LOGE_STR("Cannot create empty structure field type.");
@@ -747,14 +746,14 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class,
 		bt_ctf_field_type_structure_get_field_type_by_name(parent_ft,
 			field_name);
 
-	BT_ASSERT(stream_class->clock);
+	BT_ASSERT_DBG(stream_class->clock);
 
 	if (!ft) {
 		/* Field does not exist: not an error */
 		goto end;
 	}
 
-	BT_ASSERT(((struct bt_ctf_field_type_common *) ft)->id ==
+	BT_ASSERT_DBG(((struct bt_ctf_field_type_common *) ft)->id ==
 		BT_CTF_FIELD_TYPE_ID_INTEGER);
 	mapped_clock_class =
 		bt_ctf_field_type_integer_get_mapped_clock_class(ft);
@@ -776,11 +775,13 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class,
 		if (!ft_copy) {
 			BT_LOGE("Failed to copy integer field type: ft-addr=%p",
 				ft);
+			ret = -1;
+			goto end;
 		}
 
 		ret = bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen(
 			(void *) ft_copy, stream_class->clock->clock_class);
-		BT_ASSERT(ret == 0);
+		BT_ASSERT_DBG(ret == 0);
 
 		ret = bt_ctf_field_type_common_structure_replace_field(
 			(void *) parent_ft, field_name, (void *) ft_copy);
@@ -808,7 +809,7 @@ int bt_ctf_stream_class_map_clock_class(
 {
 	int ret = 0;
 
-	BT_ASSERT(stream_class);
+	BT_ASSERT_DBG(stream_class);
 
 	if (!stream_class->clock) {
 		/* No clock class to map to */
@@ -944,7 +945,7 @@ int bt_ctf_stream_class_serialize(struct bt_ctf_stream_class *stream_class,
 	 */
 	trace = BT_CTF_FROM_COMMON(bt_ctf_stream_class_common_borrow_trace(
 		BT_CTF_TO_COMMON(stream_class)));
-	BT_ASSERT(trace);
+	BT_ASSERT_DBG(trace);
 	packet_header_type = bt_ctf_trace_get_packet_header_field_type(trace);
 	trace = NULL;
 	if (packet_header_type) {