X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdmesg%2Fdmesg.c;h=4a131ea3c31169ce64f4b26c64d49674053be0df;hb=f2fb1b3297ca0bc13b53189a063b63944be7fae9;hp=49fba13f80221c9522aa033024017df7932beb93;hpb=19bbdc9bfcbbfabb1f04dad12ff1df5d7075bf11;p=babeltrace.git

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 49fba13f..4a131ea3 100644
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (dmesg_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 #include <string.h>
@@ -634,12 +634,14 @@ end:
 static
 void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 {
-	struct dmesg_component *dmesg_comp = dmesg_msg_iter->dmesg_comp;
+	struct dmesg_component *dmesg_comp;
 
 	if (!dmesg_msg_iter) {
 		return;
 	}
 
+	dmesg_comp = dmesg_msg_iter->dmesg_comp;
+
 	if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) {
 		if (fclose(dmesg_msg_iter->fp)) {
 			BT_COMP_LOGE_ERRNO("Cannot close input file", ".");
@@ -864,14 +866,17 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next(
 }
 
 BT_HIDDEN
-bt_bool dmesg_msg_iter_can_seek_beginning(
-		bt_self_message_iterator *self_msg_iter)
+bt_component_class_message_iterator_can_seek_beginning_method_status
+dmesg_msg_iter_can_seek_beginning(
+		bt_self_message_iterator *self_msg_iter, bt_bool *can_seek)
 {
 	struct dmesg_msg_iter *dmesg_msg_iter =
 		bt_self_message_iterator_get_data(self_msg_iter);
 
 	/* Can't seek the beginning of the standard input stream */
-	return !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+	*can_seek = !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
 }
 
 BT_HIDDEN