From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 26 Jul 2011 00:19:36 +0000 (-0400)
Subject: Keep byte order field mask set upon retry
X-Git-Tag: v0.3~16
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=2e0c6b58a2a718d99e75a06f6b73688c537390ae;ds=sidebyside

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 2eba30bd..1947aa5e 100644
--- 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;