X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=0886b0628fffc6a5ffb8784f8fb610b401e41fd3;hp=3d1c459fd91b9259949526200e469b75d273c206;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=db39339174d3b35b7eb07fdd3350a951cdbf18b5

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 3d1c459f..0886b062 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -3,7 +3,9 @@
  *
  * Integers read/write functions.
  *
- * Copyright 2010 - 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
@@ -14,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf-text/types.h>
@@ -30,6 +40,9 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		integer_definition->declaration;
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
+	if (!print_field(definition))
+		return 0;
+
 	if (pos->dummy)
 		return 0;
 
@@ -38,7 +51,21 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 	fprintf(pos->fp, " ");
 	if (pos->print_names)
 		fprintf(pos->fp, "%s = ",
-			g_quark_to_string(definition->name));
+			rem_(g_quark_to_string(definition->name)));
+
+	if (pos->string
+	    && (integer_declaration->encoding == CTF_STRING_ASCII
+	      || integer_declaration->encoding == CTF_STRING_UTF8)) {
+
+		if (!integer_declaration->signedness) {
+			g_string_append_c(pos->string,
+				(int) integer_definition->value._unsigned);
+		} else {
+			g_string_append_c(pos->string,
+				(int) integer_definition->value._signed);
+		}
+		return 0;
+	}
 
 	switch (integer_declaration->base) {
 	case 0:	/* default */
@@ -78,8 +105,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		else
 			v = (uint64_t) integer_definition->value._signed;
 
-		fprintf(pos->fp, "0%" PRIo64,
-			integer_definition->value._unsigned);
+		fprintf(pos->fp, "0%" PRIo64, v);
 		break;
 	}
 	case 16:
@@ -91,8 +117,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		else
 			v = (uint64_t) integer_definition->value._signed;
 
-		fprintf(pos->fp, "0x%" PRIX64,
-			integer_definition->value._unsigned);
+		fprintf(pos->fp, "0x%" PRIX64, v);
 		break;
 	}
 	default: