lib: add internal bt_field_sequence_get_int_length()

This new internal helper returns a sequence field's length as an
`int64_t` value instead of returning the integer field. Returns a
negative value on error or if the sequence fields's length field is not
set.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/include/babeltrace/ctf-ir/fields-internal.h b/include/babeltrace/ctf-ir/fields-internal.h
index 43e79b72b7527d23c67c0721f1569f94f350482f..6c25b26ca4d61b5656ac1ce80968fffd355303c8 100644 (file)
--- a/include/babeltrace/ctf-ir/fields-internal.h
+++ b/include/babeltrace/ctf-ir/fields-internal.h
@@ -102,4 +102,7 @@ int bt_field_serialize(struct bt_field *field,
 BT_HIDDEN
 void bt_field_freeze(struct bt_field *field);
 
+BT_HIDDEN
+int64_t bt_field_sequence_get_int_length(struct bt_field *field);
+
 #endif /* BABELTRACE_CTF_IR_FIELDS_INTERNAL_H */

diff --git a/lib/ctf-ir/fields.c b/lib/ctf-ir/fields.c
index 1525934ed2703316e7841d73a44d8f2966f73896..0fe5630e232d400b8efed96fd5c54a38d0650a91 100644 (file)
--- a/lib/ctf-ir/fields.c
+++ b/lib/ctf-ir/fields.c
@@ -406,6 +406,27 @@ bt_bool bt_field_is_variant(struct bt_field *field)
        return bt_field_get_type_id(field) == BT_FIELD_TYPE_ID_VARIANT;
 }
 
+BT_HIDDEN
+int64_t bt_field_sequence_get_int_length(struct bt_field *field)
+{
+       struct bt_field_sequence *sequence;
+       int64_t ret;
+
+       assert(field);
+       assert(bt_field_type_get_type_id(field->type) ==
+               BT_FIELD_TYPE_ID_SEQUENCE);
+       sequence = container_of(field, struct bt_field_sequence, parent);
+       if (!sequence->length) {
+               ret = -1;
+               goto end;
+       }
+
+       ret = (int64_t) sequence->elements->len;
+
+end:
+       return ret;
+}
+
 struct bt_field *bt_field_sequence_get_length(
                struct bt_field *field)
 {