Add "encoding" for sequence and array of integers

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index ac064b809995ea72e06e84b85821292d6351e873..1ba00a67232d59f5fb76bac2a07d8daea2e01984 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -63,8 +63,8 @@ rw_dispatch read_dispatch_table[] = {
        [ CTF_TYPE_STRING ] = ctf_string_read,
        [ CTF_TYPE_STRUCT ] = ctf_struct_rw,
        [ CTF_TYPE_VARIANT ] = ctf_variant_rw,
-       [ CTF_TYPE_ARRAY ] = ctf_array_rw,
-       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+       [ CTF_TYPE_ARRAY ] = ctf_array_read,
+       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_read,
 };
 
 static
@@ -75,8 +75,8 @@ rw_dispatch write_dispatch_table[] = {
        [ CTF_TYPE_STRING ] = ctf_string_write,
        [ CTF_TYPE_STRUCT ] = ctf_struct_rw,
        [ CTF_TYPE_VARIANT ] = ctf_variant_rw,
-       [ CTF_TYPE_ARRAY ] = ctf_array_rw,
-       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+       [ CTF_TYPE_ARRAY ] = ctf_array_write,
+       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_write,
 };
 
 static
@@ -465,11 +465,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                }
                toread -= readlen;
                if (!toread) {
-                       ret = -EOF;
-                       break;
-               }
-               if (feof(in)) {
-                       ret = -EINVAL;
+                       ret = 0;        /* continue reading next packet */
                        break;
                }
        }
@@ -491,10 +487,11 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 
        for (;;) {
                ret = ctf_open_trace_metadata_packet_read(td, in, out);
-               if (ret == -EOF) {
-                       ret = 0;
+               if (ret) {
                        break;
-               } else if (ret) {
+               }
+               if (feof(in)) {
+                       ret = 0;
                        break;
                }
        }