X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=82bc361f2b96931cbe1f79be93a777f5b0940fd8;hb=5c551b40d8697add8fde696de8bce7c2d43993ea;hp=3979e826407fb745d6fc0e9ac7acf856d7c9b3f0;hpb=d63ca2cd2249356c28a63653d30c681e9a7ce249;p=babeltrace.git

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index 3979e826..82bc361f 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,13 +31,16 @@ 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;
 
-	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));