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

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index 59924daf..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,17 +31,19 @@ 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);
 
-	if (definition->index != 0 && definition->index != INT_MAX)
+	if (pos->field_nr++ != 0)
 		fprintf(pos->fp, ",");
-	if (definition->index != INT_MAX)
-		fprintf(pos->fp, " ");
+	fprintf(pos->fp, " ");
 	if (pos->print_names)
 		fprintf(pos->fp, "%s = ",
-			g_quark_to_string(definition->name));
+			rem_(g_quark_to_string(definition->name)));
 
 	fprintf(pos->fp, "\"%s\"", string_definition->value);
 	return 0;