src/plugins/ctf/common: restructure subtree

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

diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp
index a80be2dda78b137ba04b459da7b4c56de07bd478..22f35106407b8d14dc7a73d90fae85bcfecaa381 100644 (file)
--- a/src/plugins/ctf/fs-src/query.cpp
+++ b/src/plugins/ctf/fs-src/query.cpp
@@ -6,24 +6,20 @@
  * Babeltrace CTF file system Reader Component queries
  */
 
-#include <fcntl.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 
 #include <babeltrace2/babeltrace.h>
 
-#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_OUTPUT_LEVEL ((enum bt_log_level) log_level)
 #define BT_LOG_TAG          "PLUGIN/SRC.CTF.FS/QUERY"
 #include "logging/comp-logging.h"
 #include "logging/log.h"
 
 #include "common/assert.h"
-#include "common/common.h"
-#include "common/macros.h"
 
-#include "../common/metadata/decoder.hpp"
+#include "../common/src/metadata/tsdl/decoder.hpp"
 #include "fs.hpp"
 #include "metadata.hpp"
 #include "query.hpp"
@@ -169,7 +165,7 @@ end:
     if (metadata_fp) {
         ret = fclose(metadata_fp);
         if (ret) {
-            BT_LOGE_ERRNO("Cannot close metatada file stream", ": path=\"%s\"", path);
+            BT_LOGE_ERRNO("Cannot close metadata file stream", ": path=\"%s\"", path);
         }
     }