X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=59924dafc90d81bc6efefd24d6ef9aee94046280;hp=22103ce80b742522bc779582542a0cd0dc0e0e77;hb=312623540c466defab45503fbe0ce7ec79dcce85;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index 22103ce8..59924daf 100644
--- a/formats/ctf-text/types/string.c
+++ b/formats/ctf-text/types/string.c
@@ -21,8 +21,8 @@
 #include <limits.h>		/* C99 limits */
 #include <string.h>
 
-void ctf_text_string_write(struct stream_pos *ppos,
-		      struct definition *definition)
+int ctf_text_string_write(struct stream_pos *ppos,
+			  struct definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -30,7 +30,17 @@ void ctf_text_string_write(struct stream_pos *ppos,
 
 	assert(string_definition->value != NULL);
 	if (pos->dummy)
-		return;
-	print_pos_tabs(pos);
-	fprintf(pos->fp, "%s\n", string_definition->value);
+		return 0;
+	//print_pos_tabs(pos);
+
+	if (definition->index != 0 && definition->index != INT_MAX)
+		fprintf(pos->fp, ",");
+	if (definition->index != INT_MAX)
+		fprintf(pos->fp, " ");
+	if (pos->print_names)
+		fprintf(pos->fp, "%s = ",
+			g_quark_to_string(definition->name));
+
+	fprintf(pos->fp, "\"%s\"", string_definition->value);
+	return 0;
 }