X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fiterator.c;h=ddfe417cf607841490d41b5f1d3cb04046a5d04d;hb=c7072d5abafd9208df8bd1a1203f57c503a4da01;hp=094447b6f1f1a28d359616916ce8fc949e8e4c37;hpb=5366eb53a99e3943697ebd9be69ca7478ccaeb72;p=babeltrace.git

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 094447b6..ddfe417c 100644
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -987,8 +987,8 @@ int get_message_ns_from_origin(const struct bt_message *msg,
 
 		clk_snapshot = event_msg->default_cs;
 		BT_ASSERT_PRE(clk_snapshot,
-			"Event has no default clock snapshot: %!+e",
-			event_msg->event);
+			"Event message has no default clock snapshot: %!+n",
+			event_msg);
 		break;
 	}
 	case BT_MESSAGE_TYPE_INACTIVITY:
@@ -1002,8 +1002,16 @@ int get_message_ns_from_origin(const struct bt_message *msg,
 	}
 	case BT_MESSAGE_TYPE_PACKET_BEGINNING:
 	case BT_MESSAGE_TYPE_PACKET_END:
-		/* Ignore */
-		goto end;
+	{
+		const struct bt_message_packet *packet_msg =
+			(const void *) msg;
+
+		clk_snapshot = packet_msg->default_cs;
+		BT_ASSERT_PRE(clk_snapshot,
+			"Packet message has no default clock snapshot: %!+n",
+			packet_msg);
+		break;
+	}
 	case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
 	case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
 	{