X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=1ac38c46ff86da5e6f9b282fb73a08aba41104d2;hp=d07501e5c2b510bee955ab8aa215a1636116aff7;hb=4716614abaa127d6d6722c845a413495d9cb2b6f;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index d07501e5..1ac38c46 100644
--- a/formats/ctf-text/types/string.c
+++ b/formats/ctf-text/types/string.c
@@ -3,7 +3,9 @@
  *
  * Strings 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
@@ -29,9 +31,20 @@ int ctf_text_string_write(struct stream_pos *ppos,
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
 	assert(string_definition->value != NULL);
+
+	if (!print_field(definition))
+		return 0;
+
 	if (pos->dummy)
 		return 0;
-	print_pos_tabs(pos);
-	fprintf(pos->fp, "%s\n", string_definition->value);
+
+	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)));
+
+	fprintf(pos->fp, "\"%s\"", string_definition->value);
 	return 0;
 }