*
* 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
int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
{
+ struct 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);
+ uint64_t len = struct_declaration_len(struct_declaration);
+ int field_nr_saved;
int ret;
+ if (!print_field(definition))
+ return 0;
+
if (!pos->dummy) {
if (pos->depth >= 0) {
- if (definition->index != 0 && definition->index != INT_MAX)
+ if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
- if (definition->index != INT_MAX)
+ if (pos->print_names || len > 1)
fprintf(pos->fp, " ");
if (pos->print_names && definition->name != 0)
fprintf(pos->fp, "%s = ",
g_quark_to_string(definition->name));
- fprintf(pos->fp, "{");
+ if (pos->print_names || len > 1)
+ fprintf(pos->fp, "{");
}
pos->depth++;
}
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
ret = struct_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
- if (pos->depth >= 0) {
+ if (pos->depth >= 0 && (pos->print_names || len > 1)) {
fprintf(pos->fp, " }");
}
}
+ pos->field_nr = field_nr_saved;
return ret;
}