X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=24c3b8ca146ff1fafe8de8da3dd059c7f947f415;hb=b61e1dca934c1cda7632d154c243dcf56aabac60;hp=16d2f817ad8a1b21d99228a67e5bba25e0d1f3fa;hpb=b07e7ef09b90a6bbb055f49bb2a6586dd45e73c9;p=lttng-tools.git diff --git a/src/common/utils.c b/src/common/utils.c index 16d2f817a..24c3b8ca1 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -528,7 +528,7 @@ int utils_create_lock_file(const char *filepath) S_IRGRP | S_IWGRP); if (fd < 0) { PERROR("open lock file %s", filepath); - ret = -1; + fd = -1; goto error; } @@ -1335,15 +1335,17 @@ LTTNG_HIDDEN int utils_truncate_stream_file(int fd, off_t length) { int ret; + off_t lseek_ret; ret = ftruncate(fd, length); if (ret < 0) { PERROR("ftruncate"); goto end; } - ret = lseek(fd, length, SEEK_SET); - if (ret < 0) { + lseek_ret = lseek(fd, length, SEEK_SET); + if (lseek_ret < 0) { PERROR("lseek"); + ret = -1; goto end; } end: