X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=b37e6c5abaac6cec005a4a37fbf505f64b6bde2d;hb=245751d8d99ca5322076734d6b425f51efbf708a;hp=893122905bd44ca75b9fa3836cdf9098e142dfff;hpb=4fc83d948cea6b10484e65f004a6c167e71ac440;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 893122905..b37e6c5ab 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;
 	}
 
@@ -1202,26 +1202,6 @@ end:
 	return home_dir;
 }
 
-/*
- * Obtain the value of LTTNG_KMOD_PROBES environment variable, if exists.
- * Otherwise returns NULL.
- */
-LTTNG_HIDDEN
-char *utils_get_kmod_probes_list(void)
-{
-	return lttng_secure_getenv(DEFAULT_LTTNG_KMOD_PROBES);
-}
-
-/*
- * Obtain the value of LTTNG_EXTRA_KMOD_PROBES environment variable, if
- * exists. Otherwise returns NULL.
- */
-LTTNG_HIDDEN
-char *utils_get_extra_kmod_probes_list(void)
-{
-	return lttng_secure_getenv(DEFAULT_LTTNG_EXTRA_KMOD_PROBES);
-}
-
 /*
  * With the given format, fill dst with the time of len maximum siz.
  *
@@ -1402,15 +1382,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: