X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fenum.c;h=b973d494b195dcd67d65931979b3d28dc06996a7;hp=198f7829e7db948890311ebda15c75a0a5054445;hb=de913cfdf87242ec3ff54c72a318ebb8714e5465;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f

diff --git a/formats/ctf-text/types/enum.c b/formats/ctf-text/types/enum.c
index 198f7829..b973d494 100644
--- a/formats/ctf-text/types/enum.c
+++ b/formats/ctf-text/types/enum.c
@@ -3,7 +3,9 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +22,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-void ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_enum *enum_definition =
 		container_of(definition, struct definition_enum, p);
@@ -28,25 +30,49 @@ void ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 		enum_definition->integer;
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 	GArray *qs;
-	int i;
+	int i, ret;
+	int field_nr_saved;
+
+	if (!print_field(definition))
+		return 0;
 
 	if (pos->dummy)
-		return;
-	print_pos_tabs(pos);
+		return 0;
+
+	if (pos->field_nr++ != 0)
+		fprintf(pos->fp, ",");
+	fprintf(pos->fp, " ");
+	if (pos->print_names)
+		fprintf(pos->fp, "%s = ",
+			rem_(g_quark_to_string(definition->name)));
+
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
 	fprintf(pos->fp, "(");
 	pos->depth++;
-	generic_rw(ppos, &integer_definition->p);
-	print_pos_tabs(pos);
-
 	qs = enum_definition->value;
-	assert(qs);
 
-	for (i = 0; i < qs->len; i++) {
-		GQuark q = g_array_index(qs, GQuark, i);
-		const char *str = g_quark_to_string(q);
-		fprintf(pos->fp, "%s\n", str);
+	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);
+		}
+	} else {
+		fprintf(pos->fp, " <unknown>");
 	}
+
+	pos->field_nr = 0;
+	fprintf(pos->fp, " :");
+	ret = generic_rw(ppos, &integer_definition->p);
+
 	pos->depth--;
-	print_pos_tabs(pos);
-	fprintf(pos->fp, ")");
+	fprintf(pos->fp, " )");
+	pos->field_nr = field_nr_saved;
+	return ret;
 }