Move index initialization to ctf-index.h

[lttng-tools.git] / src / common / index / index.c

diff --git a/src/common/index/index.c b/src/common/index/index.c
index fae1bfd4bcabdd9ba90ee3600733264e581ec7dc..0935d702dccea0b2fd60ea4de2baa3babd9848f3 100644 (file)
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -88,11 +88,7 @@ struct lttng_index_file *lttng_index_file_create(const char *path_name,
        }
        fd = ret;
 
-       hdr.magic = htobe32(CTF_INDEX_MAGIC);
-       hdr.index_major = htobe32(major);
-       hdr.index_minor = htobe32(minor);
-       hdr.packet_index_len = htobe32(element_len);
-
+       ctf_packet_index_file_hdr_init(&hdr, major, minor);
        size_ret = lttng_write(fd, &hdr, sizeof(hdr));
        if (size_ret < sizeof(hdr)) {
                PERROR("write index header");
@@ -171,10 +167,14 @@ int lttng_index_file_read(const struct lttng_index_file *index_file,
        }
 
        ret = lttng_read(fd, element, len);
-       if (ret < len) {
+       if (ret < 0) {
                PERROR("read index file");
                goto error;
        }
+       if (ret < len) {
+               ERR("lttng_read expected %zu, returned %zd", len, ret);
+               goto error;
+       }
        return 0;
 
 error: