X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fstream.c;h=f24194d81efea23f84488ca9f66cf02dd2d0868f;hb=c8bbf8219235d1e8a9e04dc7b641210e6c93c02c;hp=0e3a13d3c8cb6ec84b4c9bd3d044f8c5ad8d99d6;hpb=834e9996a9d02f0cec468cb103ab2a573b7317b1;p=babeltrace.git

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 0e3a13d3..f24194d8 100644
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -108,11 +108,10 @@ struct bt_private_stream *bt_private_notification_stream_end_borrow_stream(
 		(void *) notification);
 }
 
-int bt_private_notification_stream_end_set_default_clock_value(
+void bt_private_notification_stream_end_set_default_clock_value(
 		struct bt_private_notification *priv_notif,
 		uint64_t value_cycles)
 {
-	int ret = 0;
 	struct bt_notification *notif = (void *) priv_notif;
 	struct bt_notification_stream_end *se_notif = (void *) notif;
 
@@ -123,21 +122,13 @@ int bt_private_notification_stream_end_set_default_clock_value(
 		"Notification's stream class has no default clock class: "
 		"%![notif-]+n, %![sc-]+S", notif, se_notif->stream->class);
 
-	if (!se_notif->default_cv) {
-		se_notif->default_cv = bt_clock_value_create(
-			se_notif->stream->class->default_clock_class);
-		if (!se_notif->default_cv) {
-			ret = -1;
-			goto end;
-		}
-	}
-
+	/* TODO: have the object already created */
+	se_notif->default_cv = bt_clock_value_create(
+		se_notif->stream->class->default_clock_class);
+	BT_ASSERT(se_notif->default_cv);
 	bt_clock_value_set_value_inline(se_notif->default_cv, value_cycles);
 	BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
 		"value=%" PRIu64, value_cycles);
-
-end:
-	return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_end_borrow_default_clock_value(
@@ -221,11 +212,10 @@ struct bt_private_stream *bt_private_notification_stream_begin_borrow_stream(
 		(void *) notification);
 }
 
-int bt_private_notification_stream_begin_set_default_clock_value(
+void bt_private_notification_stream_begin_set_default_clock_value(
 		struct bt_private_notification *priv_notif,
 		uint64_t value_cycles)
 {
-	int ret = 0;
 	struct bt_notification *notif = (void *) priv_notif;
 	struct bt_notification_stream_begin *sb_notif = (void *) notif;
 
@@ -236,21 +226,13 @@ int bt_private_notification_stream_begin_set_default_clock_value(
 		"Notification's stream class has no default clock class: "
 		"%![notif-]+n, %![sc-]+S", notif, sb_notif->stream->class);
 
-	if (!sb_notif->default_cv) {
-		sb_notif->default_cv = bt_clock_value_create(
-			sb_notif->stream->class->default_clock_class);
-		if (!sb_notif->default_cv) {
-			ret = -1;
-			goto end;
-		}
-	}
-
+	/* TODO: have the object already created */
+	sb_notif->default_cv = bt_clock_value_create(
+		sb_notif->stream->class->default_clock_class);
+	BT_ASSERT(sb_notif->default_cv);
 	bt_clock_value_set_value_inline(sb_notif->default_cv, value_cycles);
 	BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
 		"value=%" PRIu64, value_cycles);
-
-end:
-	return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_begin_borrow_default_clock_value(