Fix: bt_field*_reset_recursive() returns nothing

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 c616328cd4cbb61f2cd0a5a2e6be6129c9908d86..25310430eba36e65e7700f5f6ad12106f85456fa 100644 (file)
--- 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 e0ced0e959fb8ce5722e73dc2a8a449f9e15b255..b9f9752da33c12d7a67800da20d10840a6cd2a2c 100644 (file)
--- 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);
        }
 }