#include <stdint.h>
#include <stdlib.h>
#include <stdbool.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#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"
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;
}
}
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;
struct ctf_fs_file *file = NULL;
struct ctf_metadata_decoder *metadata_decoder = NULL;
struct ctf_metadata_decoder_config decoder_config = {
- .clock_class_offset_s = config->clock_class_offset_s,
- .clock_class_offset_ns = config->clock_class_offset_ns,
- .strict = config->strict,
+ .clock_class_offset_s = config ? config->clock_class_offset_s : 0,
+ .clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
};
file = get_file(ctf_fs_trace->path->str);
goto end;
}
- metadata_decoder = ctf_metadata_decoder_create(&decoder_config,
+ metadata_decoder = ctf_metadata_decoder_create(
+ config ? &decoder_config : NULL,
ctf_fs_trace->name->str);
if (!metadata_decoder) {
BT_LOGE("Cannot create metadata decoder object");
ctf_fs_trace->metadata->trace = ctf_metadata_decoder_get_trace(
metadata_decoder);
- assert(ctf_fs_trace->metadata->trace);
+ BT_ASSERT(ctf_fs_trace->metadata->trace);
end:
ctf_fs_file_destroy(file);