X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Futils.c;h=b3df040c2088b22fce9d5cd10b3b05f8dfc02634;hb=a8c3ad3e850d45026f22ecdc7ea963b7e923bd08;hp=cd4418ed28895ae9438eb73f29c5598ebdd67da9;hpb=c3e9c4c6febdea6b999db5ddc150782f3da5f78a;p=lttng-tools.git

diff --git a/src/common/fd-tracker/utils.c b/src/common/fd-tracker/utils.c
index cd4418ed2..b3df040c2 100644
--- a/src/common/fd-tracker/utils.c
+++ b/src/common/fd-tracker/utils.c
@@ -15,27 +15,18 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <common/fd-tracker/utils.h>
 #include <common/utils.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
-static
-int open_pipe_cloexec(void *data, int *fds)
+static int open_pipe_cloexec(void *data, int *fds)
 {
-	int ret;
-
-	ret = utils_create_pipe_cloexec(fds);
-	if (ret < 0) {
-		goto end;
-	}
-end:
-	return ret;
+	return utils_create_pipe_cloexec(fds);
 }
 
-static
-int close_pipe(void *data, int *pipe)
+static int close_pipe(void *data, int *pipe)
 {
 	utils_close_pipe(pipe);
 	pipe[0] = pipe[1] = -1;
@@ -47,8 +38,8 @@ int fd_tracker_util_close_fd(void *unused, int *fd)
 	return close(*fd);
 }
 
-int fd_tracker_util_pipe_open_cloexec(struct fd_tracker *tracker,
-		const char *name, int *pipe)
+int fd_tracker_util_pipe_open_cloexec(
+		struct fd_tracker *tracker, const char *name, int *pipe)
 {
 	int ret;
 	const char *name_prefix;
@@ -64,7 +55,7 @@ int fd_tracker_util_pipe_open_cloexec(struct fd_tracker *tracker,
 		goto end;
 	}
 
-        ret = fd_tracker_open_unsuspendable_fd(tracker, pipe,
+	ret = fd_tracker_open_unsuspendable_fd(tracker, pipe,
 			(const char **) names, 2, open_pipe_cloexec, NULL);
 	free(names[0]);
 	free(names[1]);
@@ -74,6 +65,6 @@ end:
 
 int fd_tracker_util_pipe_close(struct fd_tracker *tracker, int *pipe)
 {
-        return fd_tracker_close_unsuspendable_fd(tracker,
-			pipe, 2, close_pipe, NULL);
+	return fd_tracker_close_unsuspendable_fd(
+			tracker, pipe, 2, close_pipe, NULL);
 }