From f9b799fc29b05c824aa1599b51fb3cc3b007ba98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 13 May 2015 14:05:53 -0400 Subject: [PATCH] ir: support optional parameters in bt_ctf_field_type_structure_get_field MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/event-types.c | 13 ++++++++----- tests/lib/test_ctf_writer.c | 10 ++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c index 78d0fa0d..c03f0b77 100644 --- a/formats/ctf/ir/event-types.c +++ b/formats/ctf/ir/event-types.c @@ -1207,8 +1207,7 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type, struct structure_field *field; int ret = 0; - if (!type || index < 0 || !field_name || !field_type || - (type->declaration->id != CTF_TYPE_STRUCT)) { + if (!type || index < 0 || (type->declaration->id != CTF_TYPE_STRUCT)) { ret = -1; goto end; } @@ -1221,9 +1220,13 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type, } field = g_ptr_array_index(structure->fields, index); - *field_type = field->type; - bt_ctf_field_type_get(field->type); - *field_name = g_quark_to_string(field->name); + if (field_type) { + *field_type = field->type; + bt_ctf_field_type_get(field->type); + } + if (field_name) { + *field_name = g_quark_to_string(field->name); + } end: return ret; } diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 60a51132..47096354 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -1072,10 +1072,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, &ret_field_type, 0) < 0, "bt_ctf_event_class_get_field handles a NULL event class correctly"); ok(bt_ctf_event_class_get_field(event_class, NULL, - &ret_field_type, 0) < 0, + &ret_field_type, 0) == 0, "bt_ctf_event_class_get_field handles a NULL field name correctly"); + bt_ctf_field_type_put(ret_field_type); ok(bt_ctf_event_class_get_field(event_class, &ret_string, - NULL, 0) < 0, + NULL, 0) == 0, "bt_ctf_event_class_get_field handles a NULL field type correctly"); ok(bt_ctf_event_class_get_field(event_class, &ret_string, &ret_field_type, 42) < 0, @@ -1980,10 +1981,11 @@ void type_field_tests() &ret_string, &returned_type, 1) < 0, "bt_ctf_field_type_structure_get_field handles a NULL type correctly"); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, - NULL, &returned_type, 1) < 0, + NULL, &returned_type, 1) == 0, "bt_ctf_field_type_structure_get_field handles a NULL name correctly"); + bt_ctf_field_type_put(returned_type); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, - &ret_string, NULL, 1) < 0, + &ret_string, NULL, 1) == 0, "bt_ctf_field_type_structure_get_field handles a NULL return type correctly"); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, &ret_string, &returned_type, 10) < 0, -- 2.34.1