X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Futils.cpp;h=d4a7329282651b714b0937f3889b42ab9de82e40;hb=f4d2c26adb8b6d18a62ca6d35e3a0529ff8a87b5;hp=be6c65df6aed6e0c836ca7d075342618a46a5687;hpb=e032c6fd0419a73188f7143b18625b43a8d8f7c3;p=lttng-tools.git

diff --git a/src/common/fd-tracker/utils.cpp b/src/common/fd-tracker/utils.cpp
index be6c65df6..d4a732928 100644
--- a/src/common/fd-tracker/utils.cpp
+++ b/src/common/fd-tracker/utils.cpp
@@ -1,33 +1,33 @@
 /*
  * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * SPDX-License-Identifier: GPL-2.0-only
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  */
 
-#include <common/error.h>
-#include <common/fd-tracker/utils.h>
-#include <common/utils.h>
+#include <common/error.hpp>
+#include <common/fd-tracker/utils.hpp>
+#include <common/utils.hpp>
 #include <lttng/constant.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 static
-int open_pipe_cloexec(void *data, int *fds)
+int open_pipe_cloexec(void *data __attribute__((unused)), int *fds)
 {
 	return utils_create_pipe_cloexec(fds);
 }
 
 static
-int close_pipe(void *data, int *pipe)
+int close_pipe(void *data __attribute__((unused)), int *pipe)
 {
 	utils_close_pipe(pipe);
 	pipe[0] = pipe[1] = -1;
 	return 0;
 }
 
-int fd_tracker_util_close_fd(void *unused, int *fd)
+int fd_tracker_util_close_fd(void *unused __attribute__((unused)), int *fd)
 {
 	return close(*fd);
 }
@@ -63,11 +63,13 @@ int fd_tracker_util_pipe_close(struct fd_tracker *tracker, int *pipe)
 			tracker, pipe, 2, close_pipe, NULL);
 }
 
+namespace {
 struct open_directory_handle_args {
 	const struct lttng_directory_handle *in_handle;
 	struct lttng_directory_handle *ret_handle;
 	const char *path;
 };
+} /* namespace */
 
 static
 int open_directory_handle(void *_args, int *out_fds)
@@ -111,7 +113,7 @@ end:
 
 #ifdef HAVE_DIRFD
 static
-int fd_close(void *unused, int *in_fds)
+int fd_close(void *unused __attribute__((unused)), int *in_fds)
 {
 	const int ret = close(in_fds[0]);