X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=0935d702dccea0b2fd60ea4de2baa3babd9848f3;hb=71b4cdb4772eee93e11df518caeb5f8466156764;hp=ee73a0324c75467a7cd6706a6f9efa8b13b2659f;hpb=4a3a61c179ecf1338c71f0489c7a5a7d1bd41fe9;p=lttng-tools.git

diff --git a/src/common/index/index.c b/src/common/index/index.c
index ee73a0324..0935d702d 100644
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -35,7 +35,7 @@
  *
  * Return allocated struct lttng_index_file, NULL on error.
  */
-struct lttng_index_file *lttng_index_file_create(char *path_name,
+struct lttng_index_file *lttng_index_file_create(const char *path_name,
 		char *stream_name, int uid, int gid,
 		uint64_t size, uint64_t count, uint32_t major, uint32_t minor)
 {
@@ -88,15 +88,10 @@ 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");
-		ret = -1;
 		goto error;
 	}
 	index_file->fd = fd;
@@ -172,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: