*
* Structure 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>
-int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
{
struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+ int field_nr_saved;
int ret;
+ if (!print_field(definition))
+ return 0;
+
if (!pos->dummy) {
if (pos->depth >= 0) {
- //print_pos_tabs(pos);
- if (definition->index != 0 && definition->index != INT_MAX)
+ if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
- if (definition->index != INT_MAX)
- fprintf(pos->fp, " ");
+ fprintf(pos->fp, " ");
if (pos->print_names && definition->name != 0)
fprintf(pos->fp, "%s = ",
- g_quark_to_string(definition->name));
+ rem_(g_quark_to_string(definition->name)));
fprintf(pos->fp, "{");
}
pos->depth++;
}
- ret = struct_rw(ppos, definition);
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
+ ret = bt_struct_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
if (pos->depth >= 0) {
- //print_pos_tabs(pos);
fprintf(pos->fp, " }");
}
}
+ pos->field_nr = field_nr_saved;
return ret;
}