X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fevent.c;h=7d31a40162b67734511b477ed34ec0113dd124d9;hb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;hp=c2f772a56521e9f6095418c8894522b4a7905d67;hpb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;p=babeltrace.git

diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c
index c2f772a5..7d31a401 100644
--- a/lib/trace-ir/event.c
+++ b/lib/trace-ir/event.c
@@ -217,7 +217,7 @@ struct bt_field *bt_event_borrow_header_field(struct bt_event *event)
 	return event->header_field ? event->header_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_event_borrow_header_private_field(
+struct bt_private_field *bt_private_event_borrow_header_field(
 		struct bt_private_event *event)
 {
 	return (void *) bt_event_borrow_header_field((void *) event);
@@ -229,7 +229,7 @@ struct bt_field *bt_event_borrow_common_context_field(struct bt_event *event)
 	return event->common_context_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_common_context_private_field(
+struct bt_private_field *bt_private_event_borrow_common_context_field(
 		struct bt_private_event *event)
 {
 	return (void *) bt_event_borrow_common_context_field((void *) event);
@@ -241,7 +241,7 @@ struct bt_field *bt_event_borrow_specific_context_field(struct bt_event *event)
 	return event->specific_context_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_specific_context_private_field(
+struct bt_private_field *bt_private_event_borrow_specific_context_field(
 		struct bt_private_event *event)
 {
 	return (void *) bt_event_borrow_specific_context_field((void *) event);
@@ -253,7 +253,7 @@ struct bt_field *bt_event_borrow_payload_field(struct bt_event *event)
 	return event->payload_field;
 }
 
-struct bt_private_field *bt_private_event_borrow_payload_private_field(
+struct bt_private_field *bt_private_event_borrow_payload_field(
 		struct bt_private_event *event)
 {
 	return (void *) bt_event_borrow_payload_field((void *) event);
@@ -283,21 +283,25 @@ void bt_event_destroy(struct bt_event *event)
 	if (event->header_field) {
 		BT_LOGD_STR("Releasing event's header field.");
 		release_event_header_field(event->header_field, event);
+		event->header_field = NULL;
 	}
 
 	if (event->common_context_field) {
 		BT_LOGD_STR("Destroying event's stream event context field.");
 		bt_field_destroy(event->common_context_field);
+		event->common_context_field = NULL;
 	}
 
 	if (event->specific_context_field) {
 		BT_LOGD_STR("Destroying event's context field.");
 		bt_field_destroy(event->specific_context_field);
+		event->specific_context_field = NULL;
 	}
 
 	if (event->payload_field) {
 		BT_LOGD_STR("Destroying event's payload field.");
 		bt_field_destroy(event->payload_field);
+		event->payload_field = NULL;
 	}
 
 	BT_LOGD_STR("Putting event's class.");
@@ -305,14 +309,15 @@ void bt_event_destroy(struct bt_event *event)
 
 	if (event->default_cv) {
 		bt_clock_value_recycle(event->default_cv);
+		event->default_cv = NULL;
 	}
 
 	BT_LOGD_STR("Putting event's packet.");
-	bt_object_put_ref(event->packet);
+	BT_OBJECT_PUT_REF_AND_RESET(event->packet);
 	g_free(event);
 }
 
-int bt_private_event_set_default_clock_value(
+void bt_private_event_set_default_clock_value(
 		struct bt_private_event *priv_event, uint64_t value_cycles)
 {
 	struct bt_event *event = (void *) priv_event;
@@ -329,7 +334,6 @@ int bt_private_event_set_default_clock_value(
 	bt_clock_value_set_value_inline(event->default_cv, value_cycles);
 	BT_LIB_LOGV("Set event's default clock value: %![event-]+e, "
 		"value=%" PRIu64, event, value_cycles);
-	return 0;
 }
 
 enum bt_clock_value_status bt_event_borrow_default_clock_value(
@@ -353,7 +357,7 @@ struct bt_private_packet *bt_private_event_borrow_packet(
 	return (void *) bt_event_borrow_packet((void *) event);
 }
 
-int bt_private_event_move_private_header_field(
+int bt_private_event_move_header_field(
 		struct bt_private_event *priv_event,
 		struct bt_private_event_header_field *priv_header_field)
 {
@@ -378,9 +382,3 @@ int bt_private_event_move_private_header_field(
 	event->header_field = field_wrapper;
 	return 0;
 }
-
-struct bt_event *bt_event_borrow_from_private(
-		struct bt_private_event *priv_event)
-{
-	return (void *) priv_event;
-}