Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

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

diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index 383944c4011fce9515d62e63cfb06677e8648d55..231d946ce791d15222bff4fa5b0d429057ae805d 100644 (file)
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -31,6 +31,7 @@
 #include <glib.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
+#include <babeltrace/babeltrace.h>
 
 #include "fs.h"
 #include "file.h"
@@ -43,29 +44,18 @@
 BT_HIDDEN
 FILE *ctf_fs_metadata_open_file(const char *trace_path)
 {
-       GString *metadata_path = g_string_new(trace_path);
+       GString *metadata_path;
        FILE *fp = NULL;
 
+       metadata_path = g_string_new(trace_path);
        if (!metadata_path) {
-               goto error;
+               goto end;
        }
 
-       g_string_append(metadata_path, "/" CTF_FS_METADATA_FILENAME);
+       g_string_append(metadata_path, G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME);
        fp = fopen(metadata_path->str, "rb");
-       if (!fp) {
-               goto error;
-       }
-
-       goto end;
-
-error:
-       if (fp) {
-               fclose(fp);
-               fp = NULL;
-       }
-
-end:
        g_string_free(metadata_path, TRUE);
+end:
        return fp;
 }
 
@@ -78,7 +68,7 @@ static struct ctf_fs_file *get_file(const char *trace_path)
        }
 
        g_string_append(file->path, trace_path);
-       g_string_append(file->path, "/" CTF_FS_METADATA_FILENAME);
+       g_string_append(file->path, G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME);
 
        if (ctf_fs_file_open(file, "rb")) {
                goto error;