`ctf` plugin: metadata: use local log level

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

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 3fa28b86e8eceb5a1346d879d9cff0f9b8034637..0a89084df7744d24df7de4f4f435c5a5f4bb9c1b 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -30,11 +30,11 @@
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 #include "common/common.h"
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 #include "fs.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/QUERY"
 #include "logging.h"
 
 #define METADATA_TEXT_SIG      "/* CTF 1.8"
@@ -99,11 +99,12 @@ bt_query_status metadata_info_query(
        }
 
        is_packetized = ctf_metadata_decoder_is_packetized(metadata_fp,
-               &bo);
+               &bo, BT_LOG_OUTPUT_LEVEL);
 
        if (is_packetized) {
                ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
-                       metadata_fp, &metadata_text, bo);
+                       metadata_fp, &metadata_text, bo,
+                       BT_LOG_OUTPUT_LEVEL);
                if (ret) {
                        BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
                                path);
@@ -427,15 +428,15 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                }
 
                if (group_range.set) {
-                       trace_range.begin_ns = min(trace_range.begin_ns,
+                       trace_range.begin_ns = MIN(trace_range.begin_ns,
                                        group_range.begin_ns);
-                       trace_range.end_ns = max(trace_range.end_ns,
+                       trace_range.end_ns = MAX(trace_range.end_ns,
                                        group_range.end_ns);
                        trace_range.set = true;
 
-                       trace_intersection.begin_ns = max(trace_intersection.begin_ns,
+                       trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
                                        group_range.begin_ns);
-                       trace_intersection.end_ns = min(trace_intersection.end_ns,
+                       trace_intersection.end_ns = MIN(trace_intersection.end_ns,
                                        group_range.end_ns);
                        trace_intersection.set = true;
                }