Keep byte order field mask set upon retry

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 2eba30bd46d3475cf9a2c74e679646bba7fef119..1947aa5e931b4602bb772d7b5183df1668b67e12 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1905,7 +1905,10 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                         * construction of the
                                         * intermediate representation.
                                         */
-                                       return -EINTR;
+                                       trace->field_mask = 0;
+                                       CTF_TRACE_SET_FIELD(trace, byte_order);
+                                       ret = -EINTR;
+                                       goto error;
                                }
                        }
                        CTF_TRACE_SET_FIELD(trace, byte_order);
@@ -2004,7 +2007,6 @@ error:
        trace->declaration_scope = NULL;
        /* byte order changed while creating types, retry. */
        if (ret == -EINTR) {
-               trace->field_mask = 0;
                goto restart;
        }
        return ret;