X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fattributes.c;h=986ee3836531f4a1614ca2e9c49dbd628f32b3fc;hb=33f4e1fd0981727e78c82f97f64afbef5a3b056c;hp=4512880a5c6ec903f26e3f5af669a677a85dc653;hpb=f80e9ec14e8608e514891297246112606975b5f8;p=babeltrace.git

diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c
index 4512880a..986ee383 100644
--- a/src/lib/trace-ir/attributes.c
+++ b/src/lib/trace-ir/attributes.c
@@ -86,7 +86,6 @@ BT_HIDDEN
 const char *bt_attributes_get_field_name(const struct bt_value *attr_obj,
 		uint64_t index)
 {
-	const char *ret = NULL;
 	const struct bt_value *attr_field_obj = NULL;
 	const struct bt_value *attr_field_name_obj = NULL;
 
@@ -94,59 +93,28 @@ const char *bt_attributes_get_field_name(const struct bt_value *attr_obj,
 	BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
 	attr_field_obj = bt_value_array_borrow_element_by_index_const(
 		attr_obj, index);
-	if (!attr_field_obj) {
-		BT_LIB_LOGE_APPEND_CAUSE(
-			"Cannot borrow attributes object's array value's element by index: "
-			"%![value-]+v, index=%" PRIu64, attr_obj, index);
-		goto end;
-	}
 
 	attr_field_name_obj =
 		bt_value_array_borrow_element_by_index_const(attr_field_obj,
 			BT_ATTR_NAME_INDEX);
-	if (!attr_field_name_obj) {
-		BT_LIB_LOGE_APPEND_CAUSE(
-			"Cannot get attribute array value's element by index: "
-			"%![value-]+v, index=%" PRIu64, attr_field_obj,
-			(uint64_t) BT_ATTR_NAME_INDEX);
-		goto end;
-	}
-
-	ret = bt_value_string_get(attr_field_name_obj);
 
-end:
-	return ret;
+	return bt_value_string_get(attr_field_name_obj);
 }
 
 BT_HIDDEN
 struct bt_value *bt_attributes_borrow_field_value(
 		struct bt_value *attr_obj, uint64_t index)
 {
-	struct bt_value *value_obj = NULL;
 	struct bt_value *attr_field_obj = NULL;
 
 	BT_ASSERT_DBG(attr_obj);
 	BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
+
 	attr_field_obj =
 		bt_value_array_borrow_element_by_index(attr_obj, index);
-	if (!attr_field_obj) {
-		BT_LIB_LOGE_APPEND_CAUSE(
-			"Cannot get attributes object's array value's element by index: "
-			"%![value-]+v, index=%" PRIu64, attr_obj, index);
-		goto end;
-	}
 
-	value_obj = bt_value_array_borrow_element_by_index(
-		attr_field_obj, BT_ATTR_VALUE_INDEX);
-	if (!value_obj) {
-		BT_LIB_LOGE_APPEND_CAUSE(
-			"Cannot get attribute array value's element by index: "
-			"%![value-]+v, index=%" PRIu64, attr_field_obj,
-			(uint64_t) BT_ATTR_VALUE_INDEX);
-	}
-
-end:
-	return value_obj;
+	return bt_value_array_borrow_element_by_index( attr_field_obj,
+		BT_ATTR_VALUE_INDEX);
 }
 
 static
@@ -163,23 +131,10 @@ struct bt_value *bt_attributes_borrow_field_by_name(
 
 		value_obj = bt_value_array_borrow_element_by_index(
 			attr_obj, i);
-		if (!value_obj) {
-			BT_LIB_LOGE_APPEND_CAUSE(
-				"Cannot get attributes object's array value's element by index: "
-				"%![value-]+v, index=%" PRIu64, attr_obj, i);
-			goto error;
-		}
 
 		attr_field_name_obj =
 			bt_value_array_borrow_element_by_index(
 				value_obj, BT_ATTR_NAME_INDEX);
-		if (!attr_field_name_obj) {
-			BT_LIB_LOGE_APPEND_CAUSE(
-				"Cannot get attribute array value's element by index: "
-				"%![value-]+v, index=%" PRIu64,
-				value_obj, (int64_t) BT_ATTR_NAME_INDEX);
-			goto error;
-		}
 
 		field_name = bt_value_string_get(attr_field_name_obj);
 
@@ -191,10 +146,6 @@ struct bt_value *bt_attributes_borrow_field_by_name(
 	}
 
 	return value_obj;
-
-error:
-	value_obj = NULL;
-	return value_obj;
 }
 
 BT_HIDDEN
@@ -266,12 +217,6 @@ struct bt_value *bt_attributes_borrow_field_value_by_name(
 
 	value_obj = bt_value_array_borrow_element_by_index(
 		attr_field_obj, BT_ATTR_VALUE_INDEX);
-	if (!value_obj) {
-		BT_LIB_LOGE_APPEND_CAUSE(
-			"Cannot get attribute array value's element by index: "
-			"%![value-]+v, index=%" PRIu64, attr_field_obj,
-			(uint64_t) BT_ATTR_VALUE_INDEX);
-	}
 
 end:
 	return value_obj;