Cleanup: missing empty line between functions

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

diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index 6fa7446f1e4119b0c3899a917f1659cff6301501..b037f609b7c57c6371e14e77d08697dd0a38744e 100644 (file)
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -65,24 +65,21 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
        }
 
        if (!bt_value_is_map(params)) {
-               fprintf(stderr,
-                       "Query parameters is not a map value object\n");
+               BT_LOGE_STR("Query parameters is not a map value object.");
                goto error;
        }
 
        path_value = bt_value_map_get(params, "path");
        ret = bt_value_string_get(path_value, &path);
        if (ret) {
-               fprintf(stderr,
-                       "Cannot get `path` string parameter\n");
+               BT_LOGE_STR("Cannot get `path` string parameter.");
                goto error;
        }
 
        assert(path);
        metadata_fp = ctf_fs_metadata_open_file(path);
        if (!metadata_fp) {
-               fprintf(stderr,
-                       "Cannot open trace at path `%s`\n", path);
+               BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
                goto error;
        }
 
@@ -93,26 +90,35 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
                ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
                        metadata_fp, &metadata_text, bo);
                if (ret) {
-                       fprintf(stderr,
-                               "Cannot decode packetized metadata file\n");
+                       BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
+                               path);
                        goto error;
                }
        } else {
                long filesize;
 
-               fseek(metadata_fp, 0, SEEK_END);
+               ret = fseek(metadata_fp, 0, SEEK_END);
+               if (ret) {
+                       BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+                               ": path=\"%s\"", path);
+                       goto error;
+               }
                filesize = ftell(metadata_fp);
+               if (filesize < 0) {
+                       BT_LOGE_ERRNO("Failed to get the current position in the metadata file",
+                               ": path=\"%s\"", path);
+                       goto error;
+               }
                rewind(metadata_fp);
                metadata_text = malloc(filesize + 1);
                if (!metadata_text) {
-                       fprintf(stderr,
-                               "Cannot allocate buffer for metadata text\n");
+                       BT_LOGE_STR("Cannot allocate buffer for metadata text.");
                        goto error;
                }
 
                if (fread(metadata_text, filesize, 1, metadata_fp) != 1) {
-                       fprintf(stderr,
-                               "Cannot read metadata file\n");
+                       BT_LOGE_ERRNO("Cannot read metadata file", ": path=\"%s\"",
+                               path);
                        goto error;
                }
 
@@ -135,14 +141,14 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
        ret = bt_value_map_insert_string(result, "text",
                g_metadata_text->str);
        if (ret) {
-               fprintf(stderr, "Cannot insert metadata text into result\n");
+               BT_LOGE_STR("Cannot insert metadata text into query result.");
                goto error;
        }
 
        ret = bt_value_map_insert_bool(result, "is-packetized",
                is_packetized);
        if (ret) {
-               fprintf(stderr, "Cannot insert is packetized into result\n");
+               BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
                goto error;
        }
 
@@ -164,6 +170,7 @@ end:
        }
        return result;
 }
+
 static
 int add_range(struct bt_value *info, struct range *range,
                const char *range_name)
@@ -213,7 +220,7 @@ int add_stream_ids(struct bt_value *info, struct bt_ctf_stream *stream)
        int ret = 0;
        int64_t stream_class_id, stream_instance_id;
        enum bt_value_status status;
-       struct bt_ctf_stream_class *stream_class;
+       struct bt_ctf_stream_class *stream_class = NULL;
 
        stream_instance_id = bt_ctf_stream_get_id(stream);
        if (stream_instance_id != -1) {