Clean-up: coding style adjustments

[babeltrace.git] / plugins / ctf / fs-sink / writer.c

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 1bc5966deac4e4fbca37cea34d926a0078553f80..8f383a519de7cef9e5e4407ce3b8390d7c1d3840 100644 (file)
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -28,6 +28,7 @@
 
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/private-component.h>
 #include <babeltrace/graph/component-sink.h>
@@ -46,6 +47,7 @@
 #include "writer.h"
 #include <assert.h>
 
+static
 gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
 {
        struct fs_writer *fs_writer = value;
@@ -213,6 +215,7 @@ void writer_component_port_connected(
 {
        struct bt_private_connection *connection;
        struct writer_component *writer;
+       enum bt_connection_status conn_status;
        static const enum bt_notification_type notif_types[] = {
                BT_NOTIFICATION_TYPE_EVENT,
                BT_NOTIFICATION_TYPE_PACKET_BEGIN,
@@ -227,11 +230,9 @@ void writer_component_port_connected(
        assert(!writer->input_iterator);
        connection = bt_private_port_get_private_connection(self_port);
        assert(connection);
-       writer->input_iterator =
-               bt_private_connection_create_notification_iterator(connection,
-                       notif_types);
-
-       if (!writer->input_iterator) {
+       conn_status = bt_private_connection_create_notification_iterator(
+               connection, notif_types, &writer->input_iterator);
+       if (conn_status != BT_CONNECTION_STATUS_OK) {
                writer->error = true;
        }
 
@@ -280,6 +281,36 @@ end:
        return ret;
 }
 
+static
+enum bt_component_status apply_one_bool(const char *key,
+               struct bt_value *params,
+               bool *option,
+               bool *found)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_value *value = NULL;
+       enum bt_value_status status;
+       bt_bool bool_val;
+
+       value = bt_value_map_get(params, key);
+       if (!value) {
+               goto end;
+       }
+       status = bt_value_bool_get(value, &bool_val);
+       if (status != BT_VALUE_STATUS_OK) {
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
+       }
+
+       *option = (bool) bool_val;
+       if (found) {
+               *found = true;
+       }
+end:
+       bt_put(value);
+       return ret;
+}
+
 BT_HIDDEN
 enum bt_component_status writer_component_init(
        struct bt_private_component *component, struct bt_value *params,
@@ -323,6 +354,13 @@ enum bt_component_status writer_component_init(
                goto error;
        }
 
+       writer_component->single_trace = false;
+       ret = apply_one_bool("single-trace", params,
+                       &writer_component->single_trace, NULL);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               goto end;
+       }
+
        ret = bt_private_component_set_user_data(component, writer_component);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;