Fix ctf_clock_declaration_visit returning an error when reading a boolean

[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 142923349f85aae059d2792a6115ed24933b64cb..c7de92e61d06eda45017d9313aeb05501b7bbdcf 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -875,7 +875,6 @@ struct bt_declaration *ctf_declaration_struct_visit(FILE *fd,
                        ret = get_unary_unsigned(min_align, &min_align_value);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__);
-                               ret = -EINVAL;
                                goto error;
                        }
                }
@@ -1476,9 +1475,9 @@ struct bt_declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth,
                struct ctf_trace *trace)
 {
        struct ctf_node *expression;
-       uint64_t alignment = 1, exp_dig = 0, mant_dig = 0,
-               byte_order = trace->byte_order;
-       int has_alignment = 0, has_exp_dig = 0, has_mant_dig = 0;
+       uint64_t alignment = 1, exp_dig = 0, mant_dig = 0;
+       int byte_order = trace->byte_order, has_alignment = 0,
+               has_exp_dig = 0, has_mant_dig = 0;
        struct declaration_float *float_declaration;
 
        bt_list_for_each_entry(expression, expressions, siblings) {
@@ -2400,6 +2399,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                goto error;
                        }
                        clock->absolute = ret;
+                       ret = 0;
                } else {
                        fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in clock declaration.\n", __func__, left);
                }