ctf: make ctf_trace_class_configure_ir_trace use bt2::Trace

[babeltrace.git] / src / plugins / ctf / common / src / metadata / tsdl / ctf-meta-configure-ir-trace.cpp

diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
index eb252def3d76f85febb9649231242c57bfeb044e..dbcbbbd8b160f56915dc8b9f988bc8bc5735800a 100644 (file)
--- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
+++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
@@ -6,21 +6,19 @@
 
 #include <babeltrace2/babeltrace.h>
 
-#include "common/assert.h"
+#include "cpp-common/bt2c/uuid.hpp"
 
 #include "ctf-meta-configure-ir-trace.hpp"
 #include "plugins/ctf/common/src/metadata/tsdl/ctf-meta.hpp"
 
-int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace)
+void ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, const bt2::Trace ir_trace)
 {
-    int ret = 0;
     uint64_t i;
 
     BT_ASSERT(tc);
-    BT_ASSERT(ir_trace);
 
     if (tc->is_uuid_set) {
-        bt_trace_set_uuid(ir_trace, tc->uuid);
+        ir_trace.uuid(bt2c::Uuid {tc->uuid});
     }
 
     for (i = 0; i < tc->env_entries->len; i++) {
@@ -29,22 +27,13 @@ int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_
 
         switch (env_entry->type) {
         case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT:
-            ret = bt_trace_set_environment_entry_integer(ir_trace, env_entry->name->str,
-                                                         env_entry->value.i);
+            ir_trace.environmentEntry(env_entry->name->str, env_entry->value.i);
             break;
         case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR:
-            ret = bt_trace_set_environment_entry_string(ir_trace, env_entry->name->str,
-                                                        env_entry->value.str->str);
+            ir_trace.environmentEntry(env_entry->name->str, env_entry->value.str->str);
             break;
         default:
             bt_common_abort();
         }
-
-        if (ret) {
-            goto end;
-        }
     }
-
-end:
-    return ret;
 }