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

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index 22103ce8..c397f0e2 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>
@@ -21,16 +31,28 @@
 #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 bt_stream_pos *ppos,
+			  struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
 	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;
-	print_pos_tabs(pos);
-	fprintf(pos->fp, "%s\n", string_definition->value);
+		return 0;
+
+	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;
 }