X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fevent.c;h=97186a4c8df132cc6743d5a7bc9d01b5f21b147c;hb=094ff7c009937bb23c056333baffe734308a6b06;hp=b42801d741393e5381e2a4472979351980b5e039;hpb=f6ccaed94e575af57fe6bf38154771bee4871a2a;p=babeltrace.git

diff --git a/lib/graph/notification/event.c b/lib/graph/notification/event.c
index b42801d7..97186a4c 100644
--- a/lib/graph/notification/event.c
+++ b/lib/graph/notification/event.c
@@ -76,7 +76,7 @@ bt_bool validate_clock_classes(struct bt_notification_event *notif)
 	struct bt_stream_class *stream_class = NULL;
 	struct bt_trace *trace = NULL;
 
-	event_class = bt_event_borrow_event_class(notif->event);
+	event_class = bt_event_borrow_class(notif->event);
 	BT_ASSERT(event_class);
 	stream_class = bt_event_class_borrow_stream_class(event_class);
 	BT_ASSERT(stream_class);
@@ -158,7 +158,7 @@ static inline bool event_has_trace(struct bt_event *event)
 	struct bt_event_class *event_class;
 	struct bt_stream_class *stream_class;
 
-	event_class = bt_event_borrow_event_class(event);
+	event_class = bt_event_borrow_class(event);
 	BT_ASSERT(event_class);
 	stream_class = bt_event_class_borrow_stream_class(event_class);
 	BT_ASSERT(stream_class);
@@ -185,7 +185,7 @@ struct bt_notification *bt_notification_event_create(struct bt_event *event,
 	}
 
 	BT_ASSERT(cc_prio_map);
-	event_class = bt_event_borrow_event_class(event);
+	event_class = bt_event_borrow_class(event);
 	BT_ASSERT(event_class);
 	BT_LOGD("Creating event notification object: "
 		"event-addr=%p, event-class-addr=%p, "
@@ -233,7 +233,7 @@ end:
 	return &notification->parent;
 }
 
-struct bt_event *bt_notification_event_get_event(
+struct bt_event *bt_notification_event_borrow_event(
 		struct bt_notification *notification)
 {
 	struct bt_notification_event *event_notification;
@@ -242,11 +242,11 @@ struct bt_event *bt_notification_event_get_event(
 	BT_ASSERT_PRE_NOTIF_IS_TYPE(notification, BT_NOTIFICATION_TYPE_EVENT);
 	event_notification = container_of(notification,
 			struct bt_notification_event, parent);
-	return bt_get(event_notification->event);
+	return event_notification->event;
 }
 
 extern struct bt_clock_class_priority_map *
-bt_notification_event_get_clock_class_priority_map(
+bt_notification_event_borrow_clock_class_priority_map(
 		struct bt_notification *notification)
 {
 	struct bt_notification_event *event_notification;
@@ -255,5 +255,5 @@ bt_notification_event_get_clock_class_priority_map(
 	BT_ASSERT_PRE_NOTIF_IS_TYPE(notification, BT_NOTIFICATION_TYPE_EVENT);
 	event_notification = container_of(notification,
 			struct bt_notification_event, parent);
-	return bt_get(event_notification->cc_prio_map);
+	return event_notification->cc_prio_map;
 }