ir: add tests for bt_ctf_trace_get_clock_by_name()

[babeltrace.git] / formats / ctf / ir / clock.c

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 195f83716bf3840c79f98fa15861a1783d80c34b..d1f435d50ae567ed6d879b32ce8647ca962bb2ac 100644 (file)
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -27,6 +27,7 @@
  */
 
 #include <babeltrace/ctf-ir/clock-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
 #include <babeltrace/compiler.h>
 #include <inttypes.h>
@@ -57,20 +58,21 @@ int bt_ctf_clock_set_name(struct bt_ctf_clock *clock,
 {
        int ret = 0;
 
-       if (validate_identifier(name)) {
+       if (bt_ctf_validate_identifier(name)) {
                ret = -1;
                goto end;
        }
 
        if (clock->name) {
-               g_string_free(clock->name, TRUE);
+               g_string_assign(clock->name, name);
+       } else {
+               clock->name = g_string_new(name);
+               if (!clock->name) {
+                       ret = -1;
+                       goto end;
+               }
        }
 
-       clock->name = g_string_new(name);
-       if (!clock->name) {
-               ret = -1;
-               goto end;
-       }
 end:
        return ret;
 }
@@ -389,7 +391,7 @@ void bt_ctf_clock_serialize(struct bt_ctf_clock *clock,
                uuid[4], uuid[5], uuid[6], uuid[7],
                uuid[8], uuid[9], uuid[10], uuid[11],
                uuid[12], uuid[13], uuid[14], uuid[15]);
-       if (clock->description->len) {
+       if (clock->description) {
                g_string_append_printf(context->string, "\tdescription = \"%s\";\n",
                        clock->description->str);
        }