projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update pretty print output
[babeltrace.git]
/
formats
/
ctf-text
/
types
/
struct.c
diff --git
a/formats/ctf-text/types/struct.c
b/formats/ctf-text/types/struct.c
index 9f63c7bd517543683d33efd4ac728c98b4c43f67..7dd17e04111db0ee6ccfbcf735746abce9209640 100644
(file)
--- a/
formats/ctf-text/types/struct.c
+++ b/
formats/ctf-text/types/struct.c
@@
-21,28
+21,36
@@
int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
{
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);
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 (!pos->dummy) {
if (pos->depth >= 0) {
int ret;
if (!pos->dummy) {
if (pos->depth >= 0) {
- if (
definition->index != 0 && definition->index != INT_MAX
)
+ if (
pos->field_nr++ != 0
)
fprintf(pos->fp, ",");
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));
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++;
}
}
pos->depth++;
}
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
ret = struct_rw(ppos, definition);
if (!pos->dummy) {
pos->depth--;
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, " }");
}
}
fprintf(pos->fp, " }");
}
}
+ pos->field_nr = field_nr_saved;
return ret;
}
return ret;
}
This page took
0.023946 seconds
and
4
git commands to generate.