projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ee73a0324c75467a7cd6706a6f9efa8b13b2659f..40ac0de199cd53bdcba43bb80bbd91253e63276e 100644
(file)
--- 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.
*/
*
* 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(c
onst c
har *path_name,
char *stream_name, int uid, int gid,
uint64_t size, uint64_t count, uint32_t major, uint32_t minor)
{
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");
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;
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);
}
ret = lttng_read(fd, element, len);
- if (ret <
len
) {
+ if (ret <
0
) {
PERROR("read index file");
goto error;
}
PERROR("read index file");
goto error;
}
+ if (ret < len) {
+ ERR("lttng_read expected %zu, returned %zd", len, ret);
+ goto error;
+ }
return 0;
error:
return 0;
error:
This page took
0.026527 seconds
and
4
git commands to generate.