X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdmesg%2Fdmesg.c;h=9f22ac868cceb250235267bbd05e41457950ea6f;hb=59225a3e0e13a9c674234755e55055d9ff68d635;hp=7243bbb5d777dfdb28c416118f0b9a37ae6df297;hpb=26fc5aedf48df3f1654fe4d0b6ada1a10cd804f2;p=babeltrace.git

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 7243bbb5..9f22ac86 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>
@@ -296,9 +296,7 @@ error:
 	ret = -1;
 
 end:
-	if (basename) {
-		g_free(basename);
-	}
+	g_free(basename);
 
 	return ret;
 }
@@ -385,6 +383,7 @@ bt_component_class_init_method_status create_port(
 BT_HIDDEN
 bt_component_class_init_method_status dmesg_init(
 		bt_self_component_source *self_comp_src,
+		bt_self_component_source_configuration *config,
 		bt_value *params, void *init_method_data)
 {
 	int ret = 0;
@@ -636,12 +635,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", ".");
@@ -866,14 +867,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