Fix: relayd: handling of lttng_read errors >= 0

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

diff --git a/src/common/index/index.c b/src/common/index/index.c
index c94ec701c869f2df3bf61e2845409d3c46697131..9bfb56fa0b7a6a3c9c475e028473c297a9e5779a 100644 (file)
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -96,7 +96,6 @@ struct lttng_index_file *lttng_index_file_create(char *path_name,
        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 +171,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:
@@ -223,11 +226,7 @@ struct lttng_index_file *lttng_index_file_open(const char *path_name,
        DBG("Index opening file %s in read only", fullpath);
        read_fd = open(fullpath, O_RDONLY);
        if (read_fd < 0) {
-               if (errno == ENOENT) {
-                       ret = -ENOENT;
-               } else {
-                       PERROR("opening index in read-only");
-               }
+               PERROR("opening index in read-only");
                goto error;
        }
 
@@ -271,7 +270,6 @@ error_close:
                        PERROR("close read fd %d", read_fd);
                }
        }
-       ret = -1;
 
 error:
        free(index_file);