*
* 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
*
* 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>
-void 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 bt_declaration *elem = array_declaration->elem;
+ int field_nr_saved;
+ int ret = 0;
+
+ if (!print_field(definition))
+ return 0;
+
+ if (!pos->dummy) {
+ 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)));
+ }
+
+ if (elem->id == CTF_TYPE_INTEGER) {
+ struct declaration_integer *integer_declaration =
+ container_of(elem, struct declaration_integer, p);
+
+ if (integer_declaration->encoding == CTF_STRING_UTF8
+ || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+ if (!(integer_declaration->len == CHAR_BIT
+ && integer_declaration->p.alignment == CHAR_BIT)) {
+ pos->string = array_definition->string;
+ g_string_assign(array_definition->string, "");
+ ret = bt_array_rw(ppos, definition);
+ pos->string = NULL;
+ }
+ fprintf(pos->fp, "\"%s\"", array_definition->string->str);
+ return ret;
+ }
+ }
if (!pos->dummy) {
- print_pos_tabs(pos);
- fprintf(pos->fp, "[\n");
+ fprintf(pos->fp, "[");
pos->depth++;
}
- array_rw(ppos, definition);
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
+ ret = bt_array_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
- print_pos_tabs(pos);
- fprintf(pos->fp, "]\n");
+ fprintf(pos->fp, " ]");
}
+ pos->field_nr = field_nr_saved;
+ return ret;
}