tap-driver.sh: flush stdout after each test result

[babeltrace.git] / lib / graph / message / message-iterator-inactivity.c

diff --git a/lib/graph/message/message-iterator-inactivity.c b/lib/graph/message/message-iterator-inactivity.c
index 26b863f482969cf9a07abaa3767ec0b013d92479..4cb0a8e05ddddaf4aa46068e0fd7a703d3c3e302 100644 (file)
--- a/lib/graph/message/message-iterator-inactivity.c
+++ b/lib/graph/message/message-iterator-inactivity.c
@@ -21,17 +21,17 @@
  */
 
 #define BT_LOG_TAG "MSG-MESSAGE-ITERATOR-INACTIVITY"
-#include <babeltrace/lib-logging-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
 
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-snapshot-internal.h>
-#include <babeltrace/graph/message-internal.h>
-#include <babeltrace/graph/message-message-iterator-inactivity-const.h>
-#include <babeltrace/graph/message-message-iterator-inactivity.h>
-#include <babeltrace/graph/message-message-iterator-inactivity-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/trace-ir/clock-class.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/graph/message-internal.h>
+#include <babeltrace2/graph/message-message-iterator-inactivity-const.h>
+#include <babeltrace2/graph/message-message-iterator-inactivity.h>
+#include <babeltrace2/graph/message-message-iterator-inactivity-internal.h>
 
 static
 void bt_message_message_iterator_inactivity_destroy(struct bt_object *obj)
@@ -93,15 +93,13 @@ end:
        return (void *) ret_msg;
 }
 
-extern enum bt_clock_snapshot_state
+extern const struct bt_clock_snapshot *
 bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
-               const bt_message *msg, const bt_clock_snapshot **snapshot)
+               const bt_message *msg)
 {
        struct bt_message_message_iterator_inactivity *inactivity = (void *) msg;
 
        BT_ASSERT_PRE_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_NON_NULL(snapshot, "Clock snapshot (output)");
        BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY);
-       *snapshot = inactivity->default_cs;
-       return BT_CLOCK_SNAPSHOT_STATE_KNOWN;
+       return inactivity->default_cs;
 }