X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=44aeb40d640cf9c76764e92107172e2dcf550f10;hp=eca5f91f9e3d7dc8b1dca38c2b7d06c2aa615b6e;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=fd3382e8659903b36971efb933e5770e802b45d5

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index eca5f91f..44aeb40d 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
@@ -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>
@@ -29,6 +39,10 @@ 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;
 
@@ -37,7 +51,7 @@ int ctf_text_string_write(struct stream_pos *ppos,
 	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;