Fixes #532
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
int ctf_text_struct_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
{
int ctf_text_struct_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
{
- struct bt_declaration *declaration = definition->declaration;
- struct declaration_struct *struct_declaration =
- container_of(declaration, struct declaration_struct, p);
struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
- uint64_t len = bt_struct_declaration_len(struct_declaration);
int field_nr_saved;
int ret;
int field_nr_saved;
int ret;
if (pos->depth >= 0) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
if (pos->depth >= 0) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
- if (pos->print_names || len > 1)
- fprintf(pos->fp, " ");
if (pos->print_names && definition->name != 0)
fprintf(pos->fp, "%s = ",
rem_(g_quark_to_string(definition->name)));
if (pos->print_names && definition->name != 0)
fprintf(pos->fp, "%s = ",
rem_(g_quark_to_string(definition->name)));
- if (pos->print_names || len > 1)
- fprintf(pos->fp, "{");
ret = bt_struct_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
ret = bt_struct_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
- if (pos->depth >= 0 && (pos->print_names || len > 1)) {
fprintf(pos->fp, " }");
}
}
fprintf(pos->fp, " }");
}
}