From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 22 May 2011 16:52:59 +0000 (-0400)
Subject: Update enum pretty print
X-Git-Tag: v0.1~31
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=07bc033e9dbd6de26f3a59728e09cefd1b5f3da6

Update enum pretty print

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

diff --git a/formats/ctf-text/types/enum.c b/formats/ctf-text/types/enum.c
index 7a9a948d..4a3eac0f 100644
--- a/formats/ctf-text/types/enum.c
+++ b/formats/ctf-text/types/enum.c
@@ -45,23 +45,27 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 	pos->field_nr = 0;
 	fprintf(pos->fp, "(");
 	pos->depth++;
-	ret = generic_rw(ppos, &integer_definition->p);
-	fprintf(pos->fp, ":");
-
 	qs = enum_definition->value;
-	assert(qs);
 
-	pos->field_nr = 0;
-	for (i = 0; i < qs->len; i++) {
-		GQuark q = g_array_index(qs, GQuark, i);
-		const char *str = g_quark_to_string(q);
+	if (qs) {
+		for (i = 0; i < qs->len; i++) {
+			GQuark q = g_array_index(qs, GQuark, i);
+			const char *str = g_quark_to_string(q);
 
-		assert(str);
-		if (pos->field_nr++ != 0)
-			fprintf(pos->fp, ",");
-		fprintf(pos->fp, " ");
-		fprintf(pos->fp, "%s", str);
+			assert(str);
+			if (pos->field_nr++ != 0)
+				fprintf(pos->fp, ",");
+			fprintf(pos->fp, " ");
+			fprintf(pos->fp, "%s", str);
+		}
+	} else {
+		fprintf(pos->fp, " <unknown>");
 	}
+
+	pos->field_nr = 0;
+	fprintf(pos->fp, " :");
+	ret = generic_rw(ppos, &integer_definition->p);
+
 	pos->depth--;
 	fprintf(pos->fp, " )");
 	pos->field_nr = field_nr_saved;