X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.cpp;h=9c873aec5b6c1e028806e478f2e16e398a8d2249;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=ecc4c3ea730513a16845dc42dd1aacecc798fb27;hpb=eb2827a4f0ccc637bf1d42edebf2607dbea80428;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp
index ecc4c3ea7..9c873aec5 100644
--- a/src/bin/lttng-sessiond/rotation-thread.cpp
+++ b/src/bin/lttng-sessiond/rotation-thread.cpp
@@ -215,7 +215,10 @@ void rotation_thread_enqueue_job(struct rotation_thread_timer_queue *queue,
 		 * the job will be processed when the rotation_thread catches
 		 * up.
 		 */
+		DIAGNOSTIC_PUSH
+		DIAGNOSTIC_IGNORE_LOGICAL_OP
 		if (errno == EAGAIN || errno == EWOULDBLOCK) {
+		DIAGNOSTIC_POP
 			/*
 			 * Not an error, but would be surprising and indicate
 			 * that the rotation thread can't keep up with the
@@ -561,7 +564,7 @@ int run_job(struct rotation_thread_job *job, struct ltt_session *session,
 
 static
 int handle_job_queue(struct rotation_thread_handle *handle,
-		struct rotation_thread *state,
+		struct rotation_thread *state __attribute__((unused)),
 		struct rotation_thread_timer_queue *queue)
 {
 	int ret = 0;
@@ -585,7 +588,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 		session = job->session;
 		if (!session) {
 			DBG("Session \"%s\" not found",
-					session->name);
+					session->name != NULL ? session->name : "");
 			/*
 			 * This is a non-fatal error, and we cannot report it to
 			 * the user (timer), so just print the error and
@@ -707,9 +710,9 @@ end:
 }
 
 static
-int handle_notification_channel(int fd,
+int handle_notification_channel(int fd __attribute__((unused)),
 		struct rotation_thread_handle *handle,
-		struct rotation_thread *state)
+		struct rotation_thread *state __attribute__((unused)))
 {
 	int ret;
 	bool notification_pending;