X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=77e6a656f932b4d94b1af17c71d10ed9b9bd2f68;hb=c8db321922f3730c70628a5e452baf8a046e70fd;hp=567a85f4d396398f2a3e0e6f92b9063b48ec3fef;hpb=707b7d3548cc010d582f7faed43630aed26508fd;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index 567a85f4..77e6a656 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,64 +15,63 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/component-class.h>
-#include <babeltrace/values.h>
-#include <babeltrace/private-values.h>
-#include <babeltrace/object.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/assert-internal.h>
 
 static enum bt_self_component_status sink_consume(
-		struct bt_self_component_sink *self_comp)
+		bt_self_component_sink *self_comp)
 {
 	return BT_SELF_COMPONENT_STATUS_OK;
 }
 
 static enum bt_self_notification_iterator_status src_dummy_iterator_init_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		struct bt_self_component_source *self_comp,
-		struct bt_self_component_port_output *self_port)
+		bt_self_notification_iterator *self_notif_iter,
+		bt_self_component_source *self_comp,
+		bt_self_component_port_output *self_port)
 {
 	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
 static enum bt_self_notification_iterator_status flt_dummy_iterator_init_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		struct bt_self_component_filter *self_comp,
-		struct bt_self_component_port_output *self_port)
+		bt_self_notification_iterator *self_notif_iter,
+		bt_self_component_filter *self_comp,
+		bt_self_component_port_output *self_port)
 {
 	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
 static void dummy_iterator_finalize_method(
-		struct bt_self_notification_iterator *self_notif_iter)
+		bt_self_notification_iterator *self_notif_iter)
 {
 }
 
 static enum bt_self_notification_iterator_status dummy_iterator_next_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		bt_notification_array notifs, uint64_t capacity,
+		bt_self_notification_iterator *self_notif_iter,
+		bt_notification_array_const notifs, uint64_t capacity,
 		uint64_t *count)
 {
 	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
 }
 
 static enum bt_query_status flt_query_method(
-		struct bt_self_component_class_filter *component_class,
-		struct bt_query_executor *query_exec,
-		const char *object, struct bt_value *params,
-		struct bt_value **result)
+		bt_self_component_class_filter *component_class,
+		const bt_query_executor *query_exec,
+		const char *object, const bt_value *params,
+		const bt_value **result)
 {
-	struct bt_private_value *res = bt_private_value_array_create();
-	*result = bt_private_value_as_value(res);
+	bt_value *res = bt_value_array_create();
+	bt_value *val;
+	*result = res;
 	int iret;
 
 	BT_ASSERT(*result);
-	iret = bt_private_value_array_append_string_element(res, object);
+	iret = bt_value_array_append_string_element(res, object);
+	BT_ASSERT(iret == 0);
+	iret = bt_value_copy(params, &val);
 	BT_ASSERT(iret == 0);
-	iret = bt_private_value_array_append_element(res, params);
+	iret = bt_value_array_append_element(res, val);
 	BT_ASSERT(iret == 0);
+	bt_value_put_ref(val);
 	return BT_QUERY_STATUS_OK;
 }