X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ffields-internal.h;fp=include%2Fbabeltrace%2Fctf-ir%2Ffields-internal.h;h=d6da0a4a5028176298cd85f594da6e162eb8959d;hp=115d4ffbfa101ff4da4c455ff394a3d23dcf8187;hb=6c677fb54f458456e3b5a15cffa6774bd7a86f54;hpb=3fea54f69edd1780566230255da196cb6e82df62

diff --git a/include/babeltrace/ctf-ir/fields-internal.h b/include/babeltrace/ctf-ir/fields-internal.h
index 115d4ffb..d6da0a4a 100644
--- a/include/babeltrace/ctf-ir/fields-internal.h
+++ b/include/babeltrace/ctf-ir/fields-internal.h
@@ -396,9 +396,12 @@ int bt_field_common_sequence_set_length(struct bt_field_common *field,
 	struct bt_field_common_sequence *sequence = BT_FROM_COMMON(field);
 
 	BT_ASSERT_PRE_NON_NULL(field, "Sequence field");
+	BT_ASSERT_PRE(((int64_t) length) >= 0,
+		"Invalid sequence length (too large): length=%" PRId64,
+		length);
 	BT_ASSERT_PRE_FIELD_COMMON_HOT(field, "Sequence field");
 
-	if (length > sequence->elements->len) {
+	if (unlikely(length > sequence->elements->len)) {
 		/* Make more room */
 		struct bt_field_type_common_sequence *sequence_ft;
 		uint64_t cur_len = sequence->elements->len;
@@ -654,27 +657,15 @@ const char *bt_field_common_string_get_value(struct bt_field_common *field)
 }
 
 static inline
-int bt_field_common_string_set_value(struct bt_field_common *field,
-		const char *value)
+int bt_field_common_string_clear(struct bt_field_common *field)
 {
-	struct bt_field_common_string *string = BT_FROM_COMMON(field);
-	size_t str_len;
+	struct bt_field_common_string *string_field = BT_FROM_COMMON(field);
 
 	BT_ASSERT_PRE_NON_NULL(field, "String field");
-	BT_ASSERT_PRE_NON_NULL(value, "Value");
 	BT_ASSERT_PRE_FIELD_COMMON_HOT(field, "String field");
 	BT_ASSERT_PRE_FIELD_COMMON_HAS_TYPE_ID(field,
 		BT_FIELD_TYPE_ID_STRING, "Field");
-
-	str_len = strlen(value);
-
-	if (str_len + 1 > string->buf->len) {
-		g_array_set_size(string->buf, str_len + 1);
-	}
-
-	memcpy(string->buf->data, value, str_len);
-	((char *) string->buf->data)[str_len] = '\0';
-	string->size = str_len;
+	string_field->size = 0;
 	bt_field_common_set(field, true);
 	return 0;
 }
@@ -700,7 +691,7 @@ int bt_field_common_string_append_len(struct bt_field_common *field,
 
 	new_size = string_field->size + length;
 
-	if (new_size + 1 > string_field->buf->len) {
+	if (unlikely(new_size + 1 > string_field->buf->len)) {
 		g_array_set_size(string_field->buf, new_size + 1);
 	}
 
@@ -717,23 +708,22 @@ int bt_field_common_string_append(struct bt_field_common *field,
 		const char *value)
 {
 	BT_ASSERT_PRE_NON_NULL(value, "Value");
-
 	return bt_field_common_string_append_len(field, value,
 		strlen(value));
 }
 
 static inline
-int bt_field_common_string_clear(struct bt_field_common *field)
+int bt_field_common_string_set_value(struct bt_field_common *field,
+		const char *value)
 {
-	struct bt_field_common_string *string_field = BT_FROM_COMMON(field);
-
 	BT_ASSERT_PRE_NON_NULL(field, "String field");
+	BT_ASSERT_PRE_NON_NULL(value, "Value");
 	BT_ASSERT_PRE_FIELD_COMMON_HOT(field, "String field");
 	BT_ASSERT_PRE_FIELD_COMMON_HAS_TYPE_ID(field,
 		BT_FIELD_TYPE_ID_STRING, "Field");
-	string_field->size = 0;
-	bt_field_common_set(field, true);
-	return 0;
+	bt_field_common_string_clear(field);
+	return bt_field_common_string_append_len(field,
+		value, strlen(value));
 }
 
 static inline