ctf: allocate some structures with new

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

diff --git a/src/plugins/ctf/fs-src/file.cpp b/src/plugins/ctf/fs-src/file.cpp
index 6361123cd6e5144491bdb36e78ce34f7759108df..5184de45c4a218951b7e7fa967d213d23b2788c2 100644 (file)
--- a/src/plugins/ctf/fs-src/file.cpp
+++ b/src/plugins/ctf/fs-src/file.cpp
@@ -4,19 +4,18 @@
  * Copyright 2016 Philippe Proulx <pproulx@efficios.com>
  */
 
+#include <glib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+
 #define BT_COMP_LOG_SELF_COMP (file->self_comp)
 #define BT_LOG_OUTPUT_LEVEL   (file->log_level)
 #define BT_LOG_TAG            "PLUGIN/SRC.CTF.FS/FILE"
 #include "logging/comp-logging.h"
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glib.h>
 #include "file.hpp"
+#include "fs.hpp"
 
-BT_HIDDEN
 void ctf_fs_file_destroy(struct ctf_fs_file *file)
 {
     if (!file) {
@@ -36,18 +35,12 @@ void ctf_fs_file_destroy(struct ctf_fs_file *file)
         g_string_free(file->path, TRUE);
     }
 
-    g_free(file);
+    delete file;
 }
 
-BT_HIDDEN
 struct ctf_fs_file *ctf_fs_file_create(bt_logging_level log_level, bt_self_component *self_comp)
 {
-    struct ctf_fs_file *file = g_new0(struct ctf_fs_file, 1);
-
-    if (!file) {
-        goto error;
-    }
-
+    ctf_fs_file *file = new ctf_fs_file;
     file->log_level = log_level;
     file->self_comp = self_comp;
     file->path = g_string_new(NULL);
@@ -65,7 +58,6 @@ end:
     return file;
 }
 
-BT_HIDDEN
 int ctf_fs_file_open(struct ctf_fs_file *file, const char *mode)
 {
     int ret = 0;