X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=fae1bfd4bcabdd9ba90ee3600733264e581ec7dc;hp=c94ec701c869f2df3bf61e2845409d3c46697131;hb=cb523e0290a439cf57fa7823ffa78803500ba4c3;hpb=0b0ac4a97d325a6938992f5c04987d5d48167a21 diff --git a/src/common/index/index.c b/src/common/index/index.c index c94ec701c..fae1bfd4b 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) { @@ -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; @@ -223,11 +222,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 +266,6 @@ error_close: PERROR("close read fd %d", read_fd); } } - ret = -1; error: free(index_file);