X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Futils-poll.cpp;h=20e4ae872201d9ad538c70c3afb7c9fa9ec34b07;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=4949d8160f104bad611ed35f928a76fbb9141194;hpb=e032c6fd0419a73188f7143b18625b43a8d8f7c3;p=lttng-tools.git

diff --git a/src/common/fd-tracker/utils-poll.cpp b/src/common/fd-tracker/utils-poll.cpp
index 4949d8160..20e4ae872 100644
--- a/src/common/fd-tracker/utils-poll.cpp
+++ b/src/common/fd-tracker/utils-poll.cpp
@@ -5,17 +5,17 @@
  *
  */
 
-#include <common/compat/poll.h>
+#include "utils.hpp"
 
-#include "utils.h"
-
-#if HAVE_EPOLL
+#ifdef HAVE_EPOLL
 
+namespace {
 struct create_args {
 	struct lttng_poll_event *events;
 	int size;
 	int flags;
 };
+} /* namespace */
 
 static int open_epoll(void *data, int *out_fd)
 {
@@ -32,7 +32,7 @@ end:
 	return ret;
 }
 
-static int close_epoll(void *data, int *in_fd)
+static int close_epoll(void *data, int *in_fd __attribute__((unused)))
 {
 	/* Will close the epfd. */
 	lttng_poll_clean((struct lttng_poll_event *) data);
@@ -44,10 +44,10 @@ static int close_epoll(void *data, int *in_fd)
  * must be tracked.
  */
 int fd_tracker_util_poll_create(struct fd_tracker *tracker,
-		const char *name,
-		struct lttng_poll_event *events,
-		int size,
-		int flags)
+				const char *name,
+				struct lttng_poll_event *events,
+				int size,
+				int flags)
 {
 	int out_fd;
 	struct create_args create_args = {
@@ -57,14 +57,12 @@ int fd_tracker_util_poll_create(struct fd_tracker *tracker,
 	};
 
 	return fd_tracker_open_unsuspendable_fd(
-			tracker, &out_fd, &name, 1, open_epoll, &create_args);
+		tracker, &out_fd, &name, 1, open_epoll, &create_args);
 }
 
-int fd_tracker_util_poll_clean(
-		struct fd_tracker *tracker, struct lttng_poll_event *events)
+int fd_tracker_util_poll_clean(struct fd_tracker *tracker, struct lttng_poll_event *events)
 {
-	return fd_tracker_close_unsuspendable_fd(
-			tracker, &events->epfd, 1, close_epoll, events);
+	return fd_tracker_close_unsuspendable_fd(tracker, &events->epfd, 1, close_epoll, events);
 }
 
 #else /* HAVE_EPOLL */
@@ -73,17 +71,17 @@ int fd_tracker_util_poll_clean(
  * The epoll variant of the poll compat layer creates an unsuspendable fd which
  * must be tracked.
  */
-int fd_tracker_util_poll_create(struct fd_tracker *tracker,
-		const char *name,
-		struct lttng_poll_event *events,
-		int size,
-		int flags)
+int fd_tracker_util_poll_create(struct fd_tracker *tracker __attribute__((unused)),
+				const char *name __attribute__((unused)),
+				struct lttng_poll_event *events,
+				int size,
+				int flags __attribute__((unused)))
 {
 	return lttng_poll_create(events, size, flags);
 }
 
-int fd_tracker_util_poll_clean(
-		struct fd_tracker *tracker, struct lttng_poll_event *events)
+int fd_tracker_util_poll_clean(struct fd_tracker *tracker __attribute__((unused)),
+			       struct lttng_poll_event *events)
 {
 	lttng_poll_clean(events);
 	return 0;