Add bt_common_append_file_content_to_g_string()

[babeltrace.git] / src / plugins / ctf / common / metadata / decoder.c

diff --git a/src/plugins/ctf/common/metadata/decoder.c b/src/plugins/ctf/common/metadata/decoder.c
index a690ca7127b89666376ec17166aedfeab2a586a2..a422ad433c4a2261cb7dc7626201bec6ebdd86e8 100644 (file)
--- a/src/plugins/ctf/common/metadata/decoder.c
+++ b/src/plugins/ctf/common/metadata/decoder.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP (mdec->config.self_comp)
 #define BT_LOG_OUTPUT_LEVEL (mdec->config.log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/DECODER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include "common/assert.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include "compat/memstream.h"
 #include <babeltrace2/babeltrace.h>
 #include <glib.h>
@@ -41,7 +41,7 @@ int yydebug;
 
 struct ctf_metadata_decoder {
        struct ctf_visitor_generate_ir *visitor;
-       uint8_t uuid[16];
+       bt_uuid_t uuid;
        bool is_uuid_set;
        int bo;
        struct ctf_metadata_decoder_config config;
@@ -49,7 +49,7 @@ struct ctf_metadata_decoder {
 
 struct packet_header {
        uint32_t magic;
-       uint8_t  uuid[16];
+       bt_uuid_t  uuid;
        uint32_t checksum;
        uint32_t content_size;
        uint32_t packet_size;
@@ -290,9 +290,7 @@ end:
                }
        }
 
-       if (buf) {
-               free(buf);
-       }
+       free(buf);
 
        return status;
 }