From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 20 Oct 2014 17:41:51 +0000 (-0400)
Subject: Reuse existing g_string instance when setting a clock name
X-Git-Tag: v2.0.0-pre1~1471
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=e1ae7645ef265eb69a0a500c8f4d6620c50543da

Reuse existing g_string instance when setting a clock name

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 195f8371..45ed1476 100644
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -63,14 +63,15 @@ int bt_ctf_clock_set_name(struct bt_ctf_clock *clock,
 	}
 
 	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;
 }