Port: replace literal '/' with G_DIR_SEPARATOR

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

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index 8a7705fe1b6549cc7324c767203a251366926740..4b6f6e9ac2e28553afee26b8d4961ad648ba13c6 100644 (file)
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -66,10 +66,13 @@ gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
 static
 gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
 {
+       int ret;
        struct bt_ctf_stream *writer_stream = value;
 
-       bt_ctf_stream_flush(writer_stream);
-
+       ret = bt_ctf_stream_flush(writer_stream);
+       if (ret) {
+               BT_LOGD_STR("Failed to flush stream while emptying hash table.");
+       }
        return TRUE;
 }
 
@@ -166,12 +169,13 @@ enum fs_writer_stream_state *insert_new_stream_state(
 
        v = g_new0(enum fs_writer_stream_state, 1);
        if (!v) {
-               BT_LOGE_STR("Failed to allocate writer_stream_state.");
+               BT_LOGE_STR("Failed to allocate fs_writer_stream_state.");
+               goto end;
        }
        *v = FS_WRITER_UNKNOWN_STREAM;
 
        g_hash_table_insert(fs_writer->stream_states, stream, v);
-
+end:
        return v;
 }
 
@@ -244,7 +248,7 @@ int make_trace_path(struct writer_component *writer_component,
 
        }
 
-       snprintf(trace_path, PATH_MAX, "%s/%s",
+       snprintf(trace_path, PATH_MAX, "%s" G_DIR_SEPARATOR_S "%s",
                        writer_component->base_path->str,
                        trace_name);
        /*
@@ -261,7 +265,7 @@ int make_trace_path(struct writer_component *writer_component,
                        int i = 0;
 
                        do {
-                               snprintf(trace_path, PATH_MAX, "%s/%s-%d",
+                               snprintf(trace_path, PATH_MAX, "%s" G_DIR_SEPARATOR_S "%s-%d",
                                                writer_component->base_path->str,
                                                trace_name, ++i);
                        } while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
@@ -356,7 +360,7 @@ struct fs_writer *insert_new_writer(
                fs_writer->static_listener_id = -1;
        } else {
                ret = bt_ctf_trace_add_is_static_listener(trace,
-                               trace_is_static_listener, fs_writer);
+                               trace_is_static_listener, NULL, fs_writer);
                assert(ret >= 0);
                fs_writer->static_listener_id = ret;
        }