Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / src / common / fd-tracker / utils.cpp

diff --git a/src/common/fd-tracker/utils.cpp b/src/common/fd-tracker/utils.cpp
index dfe2e188be8af19cdf5ba5bd4138782ba667c8b9..d4a7329282651b714b0937f3889b42ab9de82e40 100644 (file)
--- a/src/common/fd-tracker/utils.cpp
+++ b/src/common/fd-tracker/utils.cpp
@@ -5,29 +5,29 @@
  *
  */
 
-#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]);