X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fctf-writer%2Ftrace.c;h=7f5f3d556c8942b8e3092f811d7290cc3edc155c;hb=601b0d3c9a6bf91274d0f01ccdec7fecfe3ed310;hp=98d79b977346727ebfceb6de0ea78da009bb59bb;hpb=da91b29ad2964b85601e25843f1dca92f6c97406;p=babeltrace.git

diff --git a/lib/ctf-writer/trace.c b/lib/ctf-writer/trace.c
index 98d79b97..7f5f3d55 100644
--- a/lib/ctf-writer/trace.c
+++ b/lib/ctf-writer/trace.c
@@ -1763,13 +1763,11 @@ void append_env_metadata(struct bt_ctf_trace *trace,
 			bt_value_borrow_from_private(env_field_value_obj))) {
 		case BT_VALUE_TYPE_INTEGER:
 		{
-			int ret;
 			int64_t int_value;
 
-			ret = bt_value_integer_get(
+			int_value = bt_value_integer_get(
 				bt_value_borrow_from_private(
-					env_field_value_obj), &int_value);
-			BT_ASSERT(ret == 0);
+					env_field_value_obj));
 			g_string_append_printf(context->string,
 				"\t%s = %" PRId64 ";\n", entry_name,
 				int_value);
@@ -1777,14 +1775,12 @@ void append_env_metadata(struct bt_ctf_trace *trace,
 		}
 		case BT_VALUE_TYPE_STRING:
 		{
-			int ret;
 			const char *str_value;
 			char *escaped_str = NULL;
 
-			ret = bt_value_string_get(
+			str_value = bt_value_string_get(
 				bt_value_borrow_from_private(
-					env_field_value_obj), &str_value);
-			BT_ASSERT(ret == 0);
+					env_field_value_obj));
 			escaped_str = g_strescape(str_value, NULL);
 			if (!escaped_str) {
 				BT_LOGE("Cannot escape string: string=\"%s\"",