From: Philippe Proulx Date: Tue, 5 Jun 2018 21:55:38 +0000 (-0400) Subject: Fix: bt_field*_reset_recursive() returns nothing X-Git-Tag: v2.0.0-pre5~295 X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=f681c8a0e9b3e2b6285c782a302d3f9c757fffbd;p=babeltrace.git Fix: bt_field*_reset_recursive() returns nothing Signed-off-by: Philippe Proulx --- diff --git a/include/babeltrace/ctf-ir/fields-internal.h b/include/babeltrace/ctf-ir/fields-internal.h index c616328c..25310430 100644 --- a/include/babeltrace/ctf-ir/fields-internal.h +++ b/include/babeltrace/ctf-ir/fields-internal.h @@ -278,12 +278,12 @@ bt_bool bt_field_common_sequence_is_set_recursive(struct bt_field_common *field) # define bt_field_common_validate_recursive(_field) (-1) # define bt_field_common_set_is_frozen_recursive(_field, _is_frozen) # define bt_field_common_is_set_recursive(_field) (BT_FALSE) -# define bt_field_common_reset_recursive(_field) (BT_TRUE) +# define bt_field_common_reset_recursive(_field) # define bt_field_common_set(_field, _val) # define bt_field_validate_recursive(_field) (-1) # define bt_field_set_is_frozen_recursive(_field, _is_frozen) # define bt_field_is_set_recursive(_field) (BT_FALSE) -# define bt_field_reset_recursive(_field) (BT_TRUE) +# define bt_field_reset_recursive(_field) # define bt_field_set(_field, _val) #endif diff --git a/lib/ctf-writer/stream.c b/lib/ctf-writer/stream.c index e0ced0e9..b9f9752d 100644 --- a/lib/ctf-writer/stream.c +++ b/lib/ctf-writer/stream.c @@ -1564,7 +1564,7 @@ void reset_structure_field(struct bt_ctf_field *structure, const char *name) member = bt_ctf_field_structure_get_field_by_name(structure, name); if (member) { - (void) bt_field_common_reset_recursive((void *) member); + bt_field_common_reset_recursive((void *) member); bt_put(member); } }