X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Farray.c;h=47eb1287a0f15dbac4604bc5bf5ecf21113839b1;hp=6dc84480c67e49eff8b0837ca81a040d13f9b4f7;hb=ecc54f11c258cad6b54d35da83e525d32c032397;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f

diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c
index 6dc84480..47eb1287 100644
--- a/formats/ctf-text/types/array.c
+++ b/formats/ctf-text/types/array.c
@@ -16,19 +16,27 @@
  *
  * 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 =
 		container_of(definition, struct definition_array, p);
 	struct declaration_array *array_declaration =
 		array_definition->declaration;
-	struct declaration *elem = array_declaration->elem;
+	struct bt_declaration *elem = array_declaration->elem;
 	int field_nr_saved;
 	int ret = 0;
 
@@ -41,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) {
@@ -55,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);
@@ -69,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, " ]");