X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ftrace.c;h=f5c66cb8332d22087d6ac4f1a0e5ccbd77542bde;hb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;hp=fdb075886367deaab5dfab922fc40e29b98ae1ec;hpb=d94d92ac6656fd252a5d7bb4f6c76935ba18e62e;p=babeltrace.git

diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c
index fdb07588..f5c66cb8 100644
--- a/lib/trace-ir/trace.c
+++ b/lib/trace-ir/trace.c
@@ -89,6 +89,7 @@ void destroy_trace(struct bt_object *obj)
 		}
 
 		g_array_free(trace->is_static_listeners, TRUE);
+		trace->is_static_listeners = NULL;
 	}
 
 	bt_object_pool_finalize(&trace->packet_header_field_pool);
@@ -96,28 +97,35 @@ void destroy_trace(struct bt_object *obj)
 	if (trace->environment) {
 		BT_LOGD_STR("Destroying environment attributes.");
 		bt_attributes_destroy(trace->environment);
+		trace->environment = NULL;
 	}
 
 	if (trace->name.str) {
 		g_string_free(trace->name.str, TRUE);
+		trace->name.str = NULL;
+		trace->name.value = NULL;
 	}
 
 	if (trace->streams) {
 		BT_LOGD_STR("Destroying streams.");
 		g_ptr_array_free(trace->streams, TRUE);
+		trace->streams = NULL;
 	}
 
 	if (trace->stream_classes) {
 		BT_LOGD_STR("Destroying stream classes.");
 		g_ptr_array_free(trace->stream_classes, TRUE);
+		trace->stream_classes = NULL;
 	}
 
 	if (trace->stream_classes_stream_count) {
 		g_hash_table_destroy(trace->stream_classes_stream_count);
+		trace->stream_classes_stream_count = NULL;
 	}
 
 	BT_LOGD_STR("Putting packet header field classe.");
 	bt_object_put_ref(trace->packet_header_fc);
+	trace->packet_header_fc = NULL;
 	g_free(trace);
 }
 
@@ -228,7 +236,8 @@ bt_uuid bt_trace_get_uuid(struct bt_trace *trace)
 	return trace->uuid.value;
 }
 
-int bt_private_trace_set_uuid(struct bt_private_trace *priv_trace, bt_uuid uuid)
+void bt_private_trace_set_uuid(struct bt_private_trace *priv_trace,
+		bt_uuid uuid)
 {
 	struct bt_trace *trace = (void *) priv_trace;
 
@@ -238,7 +247,6 @@ int bt_private_trace_set_uuid(struct bt_private_trace *priv_trace, bt_uuid uuid)
 	memcpy(trace->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
 	trace->uuid.value = trace->uuid.uuid;
 	BT_LIB_LOGV("Set trace's UUID: %!+t", trace);
-	return 0;
 }
 
 BT_ASSERT_FUNC
@@ -667,7 +675,7 @@ bt_bool bt_trace_assigns_automatic_stream_class_id(struct bt_trace *trace)
 	return (bt_bool) trace->assigns_automatic_stream_class_id;
 }
 
-int bt_private_trace_set_assigns_automatic_stream_class_id(
+void bt_private_trace_set_assigns_automatic_stream_class_id(
 		struct bt_private_trace *priv_trace, bt_bool value)
 {
 	struct bt_trace *trace = (void *) priv_trace;
@@ -677,7 +685,6 @@ int bt_private_trace_set_assigns_automatic_stream_class_id(
 	trace->assigns_automatic_stream_class_id = (bool) value;
 	BT_LIB_LOGV("Set trace's automatic stream class ID "
 		"assignment property: %!+t", trace);
-	return 0;
 }
 
 BT_HIDDEN