Backport: Move index initialization to ctf-index.h

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

diff --git a/src/common/index/index.c b/src/common/index/index.c
index b481badb1d6556e2f6f1807264d33e81e6be41b2..f5f250a9f0393173b960871cf3c8dda5579cabc7 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(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");
@@ -128,12 +124,16 @@ error:
 int lttng_index_file_write(const struct lttng_index_file *index_file,
                const struct ctf_packet_index *element)
 {
+       int fd;
+       size_t len;
        ssize_t ret;
-       int fd = index_file->fd;
-       size_t len = index_file->element_len;
 
+       assert(index_file);
        assert(element);
 
+       fd = index_file->fd;
+       len = index_file->element_len;
+
        if (fd < 0) {
                goto error;
        }