sink.ctf.fs: cleanup: duplicated `:` in log statements

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

diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.c b/src/plugins/ctf/fs-sink/fs-sink-trace.c
index d97816df4320f7fe9b5f7d9d6160212b1e96bdc7..d629d00d82b27edad28bcb1e1fc0b9159f3cdd06 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-trace.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-trace.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (trace->fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (trace->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRACE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>
@@ -176,16 +176,16 @@ int append_lttng_trace_path_ust_uid(const struct fs_sink_trace *trace,
        }
 
        g_string_append_printf(path, G_DIR_SEPARATOR_S "%" PRId64,
-               bt_value_signed_integer_get(v));
+               bt_value_integer_signed_get(v));
 
-       v = bt_trace_borrow_environment_entry_value_by_name_const(tc, "isa_length");
+       v = bt_trace_borrow_environment_entry_value_by_name_const(tc, "architecture_bit_width");
        if (!v || !bt_value_is_signed_integer(v)) {
-               BT_COMP_LOGI_STR("Couldn't get environment value: name=\"isa_length\"");
+               BT_COMP_LOGI_STR("Couldn't get environment value: name=\"architecture_bit_width\"");
                goto error;
        }
 
        g_string_append_printf(path, G_DIR_SEPARATOR_S "%" PRIu64 "-bit",
-               bt_value_signed_integer_get(v));
+               bt_value_integer_signed_get(v));
 
        ret = 0;
        goto end;
@@ -219,7 +219,7 @@ int append_lttng_trace_path_ust_pid(const struct fs_sink_trace *trace,
                goto error;
        }
 
-       g_string_append_printf(path, "-%" PRId64, bt_value_signed_integer_get(v));
+       g_string_append_printf(path, "-%" PRId64, bt_value_integer_signed_get(v));
 
        v = bt_trace_borrow_environment_entry_value_by_name_const(tc, "vpid_datetime");
        if (!v || !bt_value_is_string(v)) {
@@ -284,7 +284,7 @@ GString *make_lttng_trace_path_rel(const struct fs_sink_trace *trace)
                goto error;
        }
 
-       tracer_major = bt_value_signed_integer_get(v);
+       tracer_major = bt_value_integer_signed_get(v);
 
        v = bt_trace_borrow_environment_entry_value_by_name_const(
                trace->ir_trace, "tracer_minor");
@@ -293,7 +293,7 @@ GString *make_lttng_trace_path_rel(const struct fs_sink_trace *trace)
                goto error;
        }
 
-       tracer_minor = bt_value_signed_integer_get(v);
+       tracer_minor = bt_value_integer_signed_get(v);
 
        if (!(tracer_major >= 3 || (tracer_major == 2 && tracer_minor >= 11))) {
                BT_COMP_LOGI("Unsupported LTTng version for automatic trace path: major=%" PRId64 ", minor=%" PRId64,
@@ -506,7 +506,7 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace)
        fh = fopen(trace->metadata_path->str, "wb");
        if (!fh) {
                BT_COMP_LOGF_ERRNO("In trace destruction listener: "
-                       "cannot open metadata file for writing: ",
+                       "cannot open metadata file for writing",
                        ": path=\"%s\"", trace->metadata_path->str);
                abort();
        }
@@ -514,7 +514,7 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace)
        len = fwrite(tsdl->str, sizeof(*tsdl->str), tsdl->len, fh);
        if (len != tsdl->len) {
                BT_COMP_LOGF_ERRNO("In trace destruction listener: "
-                       "cannot write metadata file: ",
+                       "cannot write metadata file",
                        ": path=\"%s\"", trace->metadata_path->str);
                abort();
        }
@@ -528,28 +528,28 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace)
                trace->path = NULL;
        }
 
-       g_string_free(trace->metadata_path, TRUE);
-       trace->metadata_path = NULL;
-
-       fs_sink_ctf_trace_destroy(trace->trace);
-       trace->trace = NULL;
-       g_free(trace);
-
-end:
        if (fh) {
                int ret = fclose(fh);
 
                if (ret != 0) {
                        BT_COMP_LOGW_ERRNO("In trace destruction listener: "
-                               "cannot close metadata file: ",
+                               "cannot close metadata file",
                                ": path=\"%s\"", trace->metadata_path->str);
                }
        }
 
+       g_string_free(trace->metadata_path, TRUE);
+       trace->metadata_path = NULL;
+
+       fs_sink_ctf_trace_destroy(trace->trace);
+       trace->trace = NULL;
+       g_free(trace);
+
        if (tsdl) {
                g_string_free(tsdl, TRUE);
        }
 
+end:
        return;
 }