Filter out redundant packet context fields unless in verbose mode

[babeltrace.git] / formats / ctf-text / types / variant.c

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 1787fb3e499d5c0921cc218e3dbccacf39d777e3..a21197aa1b3ad35bdac68c980fe2cf7c4bed0d88 100644 (file)
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -22,14 +22,17 @@
 int ctf_text_variant_write(struct stream_pos *ppos, struct 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) {
-                       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)
                                fprintf(pos->fp, "%s = ",
                                        g_quark_to_string(definition->name));
@@ -37,6 +40,8 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
                }
                pos->depth++;
        }
+       field_nr_saved = pos->field_nr;
+       pos->field_nr = 0;
        ret = variant_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
@@ -44,5 +49,6 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
                        fprintf(pos->fp, " }");
                }
        }
+       pos->field_nr = field_nr_saved;
        return ret;
 }