X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Farray.c;h=d9f57a2f7133965370dd78d8fedd7d107e1e77ed;hp=1ee556a02431bcf3b1796c2a9efeba5f5ff57200;hb=0d69b916c5ba44b63a26aa038d416d6ee286306b;hpb=d335f0f72a86c7cdcc18e524c74b82a51ad01b16

diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c
index 1ee556a0..d9f57a2f 100644
--- a/formats/ctf-text/types/array.c
+++ b/formats/ctf-text/types/array.c
@@ -3,7 +3,9 @@
  *
  * Array format access 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,12 +16,20 @@
  *
  * 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>
 #include <stdio.h>
 
-int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 	struct definition_array *array_definition =
@@ -39,7 +49,7 @@ int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
 		fprintf(pos->fp, " ");
 		if (pos->print_names)
 			fprintf(pos->fp, "%s = ",
-				g_quark_to_string(definition->name));
+				rem_(g_quark_to_string(definition->name)));
 	}
 
 	if (elem->id == CTF_TYPE_INTEGER) {
@@ -53,7 +63,7 @@ int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
 			    && integer_declaration->p.alignment == CHAR_BIT)) {
 				pos->string = array_definition->string;
 				g_string_assign(array_definition->string, "");
-				ret = array_rw(ppos, definition);
+				ret = bt_array_rw(ppos, definition);
 				pos->string = NULL;
 			}
 			fprintf(pos->fp, "\"%s\"", array_definition->string->str);
@@ -67,7 +77,7 @@ int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
 	}
 	field_nr_saved = pos->field_nr;
 	pos->field_nr = 0;
-	ret = array_rw(ppos, definition);
+	ret = bt_array_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
 		fprintf(pos->fp, " ]");