Change -EOF for EOF (it is worth -1), fix assertion

[babeltrace.git] / converter / babeltrace-lib.c

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 5be268ccf4371b22e94a2e28e3d1898ecc009835..76df6edee2f8f1f85ba1cb70ec7bd4964bc7b278 100644 (file)
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -34,14 +34,19 @@ int convert_event(struct ctf_text_stream_pos *sout,
        struct ctf_event *event_class;
        uint64_t id = 0;
        int len_index;
+       int ret;
+
+       if (sin->pos.offset == EOF)
+               return EOF;
 
-       if (sin->pos.offset == -EOF)
-               return -EOF;
+       /* Hide event payload struct brackets */
+       sout->depth = -1;
 
        /* Read and print event header */
        if (stream_class->event_header) {
-               generic_rw(&sin->pos.parent, &stream_class->event_header->p);
-
+               ret = generic_rw(&sin->pos.parent, &stream_class->event_header->p);
+               if (ret)
+                       return ret;
                /* lookup event id */
                len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
                                g_quark_from_static_string("id"));
@@ -56,13 +61,19 @@ int convert_event(struct ctf_text_stream_pos *sout,
                        id = defint->value._unsigned;   /* set id */
                }
 
-               generic_rw(&sout->parent, &stream_class->event_header->p);
+               ret = generic_rw(&sout->parent, &stream_class->event_header->p);
+               if (ret)
+                       return ret;
        }
 
        /* Read and print stream-declared event context */
        if (stream_class->event_context) {
-               generic_rw(&sin->pos.parent, &stream_class->event_context->p);
-               generic_rw(&sout->parent, &stream_class->event_context->p);
+               ret = generic_rw(&sin->pos.parent, &stream_class->event_context->p);
+               if (ret)
+                       return ret;
+               ret = generic_rw(&sout->parent, &stream_class->event_context->p);
+               if (ret)
+                       return ret;
        }
 
        if (id >= stream_class->events_by_id->len) {
@@ -77,14 +88,22 @@ int convert_event(struct ctf_text_stream_pos *sout,
 
        /* Read and print event-declared event context */
        if (event_class->context) {
-               generic_rw(&sin->pos.parent, &event_class->context->p);
-               generic_rw(&sout->parent, &event_class->context->p);
+               ret = generic_rw(&sin->pos.parent, &event_class->context->p);
+               if (ret)
+                       return ret;
+               ret = generic_rw(&sout->parent, &event_class->context->p);
+               if (ret)
+                       return ret;
        }
 
        /* Read and print event payload */
        if (event_class->fields) {
-               generic_rw(&sin->pos.parent, &event_class->fields->p);
-               generic_rw(&sout->parent, &event_class->fields->p);
+               ret = generic_rw(&sin->pos.parent, &event_class->fields->p);
+               if (ret)
+                       return ret;
+               ret = generic_rw(&sout->parent, &event_class->fields->p);
+               if (ret)
+                       return ret;
        }
 
        return 0;
@@ -100,7 +119,7 @@ int convert_stream(struct ctf_text_stream_pos *sout,
        /* TODO: order events by timestamps across streams */
        for (;;) {
                ret = convert_event(sout, sin);
-               if (ret == -EOF)
+               if (ret == EOF)
                        break;
                else if (ret) {
                        fprintf(stdout, "[error] Printing event failed.\n");