From 0f4aa1a88a318046475c7caa0f72438db044d9c0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Fri, 22 Mar 2024 12:24:57 -0400
Subject: [PATCH] Clean-up: apply suggested clang-tidy fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I926b96120d8c77b3c0d8efc3fcdf1d11d2314e8a
---
 src/bin/lttng-relayd/live.hpp                 |  4 ++--
 src/bin/lttng-relayd/lttng-relayd.hpp         | 10 +++++-----
 src/bin/lttng-relayd/session.hpp              |  2 +-
 .../lttng-relayd/sessiond-trace-chunks.hpp    |  2 +-
 src/bin/lttng-relayd/stream.hpp               |  2 +-
 src/bin/lttng-relayd/viewer-session.hpp       |  2 +-
 src/bin/lttng-relayd/viewer-stream.hpp        |  2 +-
 src/bin/lttng-sessiond/agent-thread.hpp       |  4 ++--
 src/bin/lttng-sessiond/agent.hpp              | 10 +++++-----
 src/bin/lttng-sessiond/buffer-registry.hpp    |  6 +++---
 src/bin/lttng-sessiond/client.hpp             |  2 +-
 src/bin/lttng-sessiond/cmd.hpp                |  4 ++--
 .../ctf2-trace-class-visitor.hpp              | 10 +++++-----
 .../event-notifier-error-accounting.hpp       |  2 +-
 src/bin/lttng-sessiond/fd-limit.hpp           |  2 +-
 src/bin/lttng-sessiond/kernel.hpp             | 20 +++++++++----------
 src/bin/lttng-sessiond/lttng-sessiond.hpp     | 10 +++++-----
 src/bin/lttng-sessiond/modprobe.hpp           | 10 +++++-----
 src/bin/lttng-sessiond/rotation-thread.hpp    |  2 +-
 src/bin/lttng-sessiond/timer.hpp              |  2 +-
 .../tsdl-trace-class-visitor.hpp              |  8 ++++----
 src/bin/lttng-sessiond/ust-ctl-internal.hpp   |  6 +++---
 .../ust-registry-session-pid.hpp              |  6 +++---
 .../ust-registry-session-uid.hpp              |  6 +++---
 src/bin/lttng-sessiond/utils.hpp              |  2 +-
 src/bin/lttng/conf.hpp                        |  2 +-
 src/bin/lttng/utils.hpp                       | 10 +++++-----
 src/common/fd-tracker/inode.hpp               |  2 +-
 src/lib/lttng-ctl/lttng-ctl-helper.hpp        | 11 +++++-----
 29 files changed, 81 insertions(+), 80 deletions(-)

diff --git a/src/bin/lttng-relayd/live.hpp b/src/bin/lttng-relayd/live.hpp
index 67fb58a14..53f67d30e 100644
--- a/src/bin/lttng-relayd/live.hpp
+++ b/src/bin/lttng-relayd/live.hpp
@@ -15,7 +15,7 @@
 #include <common/uri.hpp>
 
 int relayd_live_create(struct lttng_uri *live_uri);
-int relayd_live_stop(void);
-int relayd_live_join(void);
+int relayd_live_stop();
+int relayd_live_join();
 
 #endif /* LTTNG_RELAYD_LIVE_H */
diff --git a/src/bin/lttng-relayd/lttng-relayd.hpp b/src/bin/lttng-relayd/lttng-relayd.hpp
index ac7d0c691..bf86575f5 100644
--- a/src/bin/lttng-relayd/lttng-relayd.hpp
+++ b/src/bin/lttng-relayd/lttng-relayd.hpp
@@ -52,12 +52,12 @@ extern enum relay_group_output_by opt_group_output_by;
 
 extern struct fd_tracker *the_fd_tracker;
 
-void lttng_relay_notify_ready(void);
-int lttng_relay_stop_threads(void);
+void lttng_relay_notify_ready();
+int lttng_relay_stop_threads();
 
-int relayd_init_thread_quit_pipe(void);
-int relayd_notify_thread_quit_pipe(void);
-void relayd_close_thread_quit_pipe(void);
+int relayd_init_thread_quit_pipe();
+int relayd_notify_thread_quit_pipe();
+void relayd_close_thread_quit_pipe();
 bool relayd_is_thread_quit_pipe(const int fd);
 
 int create_named_thread_poll_set(struct lttng_poll_event *events, int size, const char *name);
diff --git a/src/bin/lttng-relayd/session.hpp b/src/bin/lttng-relayd/session.hpp
index b50c68526..2a6c130dd 100644
--- a/src/bin/lttng-relayd/session.hpp
+++ b/src/bin/lttng-relayd/session.hpp
@@ -160,6 +160,6 @@ int session_abort(struct relay_session *session);
 
 bool session_has_ongoing_rotation(const struct relay_session *session);
 
-void print_sessions(void);
+void print_sessions();
 
 #endif /* _SESSION_H */
diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.hpp b/src/bin/lttng-relayd/sessiond-trace-chunks.hpp
index c290f9d0f..5b9f00a7e 100644
--- a/src/bin/lttng-relayd/sessiond-trace-chunks.hpp
+++ b/src/bin/lttng-relayd/sessiond-trace-chunks.hpp
@@ -26,7 +26,7 @@
  */
 struct sessiond_trace_chunk_registry;
 
-struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry_create(void);
+struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry_create();
 
 void sessiond_trace_chunk_registry_destroy(struct sessiond_trace_chunk_registry *sessiond_registry);
 
diff --git a/src/bin/lttng-relayd/stream.hpp b/src/bin/lttng-relayd/stream.hpp
index a616e425a..40d840398 100644
--- a/src/bin/lttng-relayd/stream.hpp
+++ b/src/bin/lttng-relayd/stream.hpp
@@ -216,6 +216,6 @@ int stream_complete_packet(struct relay_stream *stream,
 int stream_add_index(struct relay_stream *stream, const struct lttcomm_relayd_index *index_info);
 int stream_reset_file(struct relay_stream *stream);
 
-void print_relay_streams(void);
+void print_relay_streams();
 
 #endif /* _STREAM_H */
diff --git a/src/bin/lttng-relayd/viewer-session.hpp b/src/bin/lttng-relayd/viewer-session.hpp
index 301b8ffc7..3dfa3acea 100644
--- a/src/bin/lttng-relayd/viewer-session.hpp
+++ b/src/bin/lttng-relayd/viewer-session.hpp
@@ -61,7 +61,7 @@ struct relay_viewer_session {
 	struct lttng_trace_chunk *current_trace_chunk;
 };
 
-struct relay_viewer_session *viewer_session_create(void);
+struct relay_viewer_session *viewer_session_create();
 void viewer_session_destroy(struct relay_viewer_session *vsession);
 void viewer_session_close(struct relay_viewer_session *vsession);
 
diff --git a/src/bin/lttng-relayd/viewer-stream.hpp b/src/bin/lttng-relayd/viewer-stream.hpp
index 2886420f4..ea6292b2c 100644
--- a/src/bin/lttng-relayd/viewer-stream.hpp
+++ b/src/bin/lttng-relayd/viewer-stream.hpp
@@ -86,7 +86,7 @@ bool viewer_stream_get(struct relay_viewer_stream *vstream);
 void viewer_stream_put(struct relay_viewer_stream *vstream);
 int viewer_stream_rotate(struct relay_viewer_stream *vstream);
 bool viewer_stream_is_tracefile_seq_readable(struct relay_viewer_stream *vstream, uint64_t seq);
-void print_viewer_streams(void);
+void print_viewer_streams();
 void viewer_stream_close_files(struct relay_viewer_stream *vstream);
 void viewer_stream_sync_tracefile_array_tail(struct relay_viewer_stream *vstream);
 
diff --git a/src/bin/lttng-sessiond/agent-thread.hpp b/src/bin/lttng-sessiond/agent-thread.hpp
index 86d0a9b88..0d56588ea 100644
--- a/src/bin/lttng-sessiond/agent-thread.hpp
+++ b/src/bin/lttng-sessiond/agent-thread.hpp
@@ -12,8 +12,8 @@
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
-bool launch_agent_management_thread(void);
-bool agent_tracing_is_enabled(void);
+bool launch_agent_management_thread();
+bool agent_tracing_is_enabled();
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
diff --git a/src/bin/lttng-sessiond/agent.hpp b/src/bin/lttng-sessiond/agent.hpp
index 388543f66..258517b5d 100644
--- a/src/bin/lttng-sessiond/agent.hpp
+++ b/src/bin/lttng-sessiond/agent.hpp
@@ -104,7 +104,7 @@ struct agent_event {
 	struct lttng_event_exclusion *exclusion;
 };
 
-#define AGENT_EVENT_IS_ENABLED(agent_event) (!!agent_event->enabled_count)
+#define AGENT_EVENT_IS_ENABLED(agent_event) (!!(agent_event)->enabled_count)
 
 /*
  * Agent object containing events enabled/disabled for a given domain in a
@@ -134,9 +134,9 @@ struct agent {
 };
 
 /* Allocate agent apps hash table */
-int agent_app_ht_alloc(void);
+int agent_app_ht_alloc();
 /* Clean-up agent apps hash table */
-void agent_app_ht_clean(void);
+void agent_app_ht_clean();
 
 /* Initialize an already allocated agent domain. */
 int agent_init(struct agent *agt);
@@ -187,7 +187,7 @@ struct agent_event *agent_find_event_by_trigger(const struct lttng_trigger *trig
 
 /* Global event notifier per-domain agents. */
 struct agent *agent_find_by_event_notifier_domain(enum lttng_domain_type domain_type);
-void agent_by_event_notifier_domain_ht_destroy(void);
-int agent_by_event_notifier_domain_ht_create(void);
+void agent_by_event_notifier_domain_ht_destroy();
+int agent_by_event_notifier_domain_ht_create();
 
 #endif /* LTTNG_SESSIOND_AGENT_H */
diff --git a/src/bin/lttng-sessiond/buffer-registry.hpp b/src/bin/lttng-sessiond/buffer-registry.hpp
index 35f7960e9..2bdc58367 100644
--- a/src/bin/lttng-sessiond/buffer-registry.hpp
+++ b/src/bin/lttng-sessiond/buffer-registry.hpp
@@ -101,7 +101,7 @@ struct buffer_reg_pid {
 };
 
 /* Buffer registry per UID. */
-void buffer_reg_init_uid_registry(void);
+void buffer_reg_init_uid_registry();
 int buffer_reg_uid_create(uint64_t session_id,
 			  uint32_t bits_per_long,
 			  uid_t uid,
@@ -115,7 +115,7 @@ void buffer_reg_uid_remove(struct buffer_reg_uid *regp);
 void buffer_reg_uid_destroy(struct buffer_reg_uid *regp, struct consumer_output *consumer);
 
 /* Buffer registry per PID. */
-void buffer_reg_init_pid_registry(void);
+void buffer_reg_init_pid_registry();
 int buffer_reg_pid_create(uint64_t session_id,
 			  struct buffer_reg_pid **regp,
 			  const char *root_shm_path,
@@ -138,7 +138,7 @@ void buffer_reg_stream_add(struct buffer_reg_stream *stream, struct buffer_reg_c
 void buffer_reg_stream_destroy(struct buffer_reg_stream *regp, enum lttng_domain_type domain);
 
 /* Global registry. */
-void buffer_reg_destroy_registries(void);
+void buffer_reg_destroy_registries();
 
 int buffer_reg_uid_consumer_channel_key(struct cds_list_head *buffer_reg_uid_list,
 					uint64_t chan_key,
diff --git a/src/bin/lttng-sessiond/client.hpp b/src/bin/lttng-sessiond/client.hpp
index 49a454dfb..a8d0adc12 100644
--- a/src/bin/lttng-sessiond/client.hpp
+++ b/src/bin/lttng-sessiond/client.hpp
@@ -12,6 +12,6 @@
 
 #include "thread.hpp"
 
-struct lttng_thread *launch_client_thread(void);
+struct lttng_thread *launch_client_thread();
 
 #endif /* CLIENT_SESSIOND_H */
diff --git a/src/bin/lttng-sessiond/cmd.hpp b/src/bin/lttng-sessiond/cmd.hpp
index 0039caf96..a470a0881 100644
--- a/src/bin/lttng-sessiond/cmd.hpp
+++ b/src/bin/lttng-sessiond/cmd.hpp
@@ -38,7 +38,7 @@ struct cmd_completion_handler {
  * Init the command subsystem. Must be called before using any of the functions
  * above. This is called in the main() of the session daemon.
  */
-void cmd_init(void);
+void cmd_init();
 
 /* Session commands */
 enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx,
@@ -183,7 +183,7 @@ int cmd_rotation_set_schedule(struct ltt_session *session,
 			      enum lttng_rotation_schedule_type schedule_type,
 			      uint64_t value);
 
-const struct cmd_completion_handler *cmd_pop_completion_handler(void);
+const struct cmd_completion_handler *cmd_pop_completion_handler();
 int start_kernel_session(struct ltt_kernel_session *ksess);
 int stop_kernel_session(struct ltt_kernel_session *ksess);
 
diff --git a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
index a46cc8bcb..d48442360 100644
--- a/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
+++ b/src/bin/lttng-sessiond/ctf2-trace-class-visitor.hpp
@@ -25,12 +25,12 @@ using append_metadata_fragment_function = std::function<void(const std::string&
 
 class trace_class_visitor : public lttng::sessiond::trace::trace_class_visitor {
 public:
-	trace_class_visitor(append_metadata_fragment_function append_metadata);
+	explicit trace_class_visitor(append_metadata_fragment_function append_metadata);
 
-	virtual void visit(const lttng::sessiond::trace::trace_class& trace_class) override final;
-	virtual void visit(const lttng::sessiond::trace::clock_class& clock_class) override final;
-	virtual void visit(const lttng::sessiond::trace::stream_class& stream_class) override final;
-	virtual void visit(const lttng::sessiond::trace::event_class& event_class) override final;
+	void visit(const lttng::sessiond::trace::trace_class& trace_class) final;
+	void visit(const lttng::sessiond::trace::clock_class& clock_class) final;
+	void visit(const lttng::sessiond::trace::stream_class& stream_class) final;
+	void visit(const lttng::sessiond::trace::event_class& event_class) final;
 
 private:
 	void append_metadata_fragment(const nlohmann::json& fragment) const;
diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp b/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp
index e1d445333..79a9f515c 100644
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.hpp
@@ -82,6 +82,6 @@ event_notifier_error_accounting_get_count(const struct lttng_trigger *trigger, u
 
 void event_notifier_error_accounting_unregister_event_notifier(const struct lttng_trigger *trigger);
 
-void event_notifier_error_accounting_fini(void);
+void event_notifier_error_accounting_fini();
 
 #endif /* _EVENT_NOTIFIER_ERROR_ACCOUNTING_H */
diff --git a/src/bin/lttng-sessiond/fd-limit.hpp b/src/bin/lttng-sessiond/fd-limit.hpp
index 8666cdc00..516129962 100644
--- a/src/bin/lttng-sessiond/fd-limit.hpp
+++ b/src/bin/lttng-sessiond/fd-limit.hpp
@@ -15,6 +15,6 @@ enum lttng_fd_type {
 
 int lttng_fd_get(enum lttng_fd_type type, unsigned int nr);
 void lttng_fd_put(enum lttng_fd_type type, unsigned int nr);
-void lttng_fd_init(void);
+void lttng_fd_init();
 
 #endif /* _LTTNG_FD_LIMIT_H */
diff --git a/src/bin/lttng-sessiond/kernel.hpp b/src/bin/lttng-sessiond/kernel.hpp
index bbcbcf9a4..6cb89a19f 100644
--- a/src/bin/lttng-sessiond/kernel.hpp
+++ b/src/bin/lttng-sessiond/kernel.hpp
@@ -57,7 +57,7 @@ int kernel_metadata_flush_buffer(int fd);
 int kernel_start_session(struct ltt_kernel_session *session);
 int kernel_stop_session(struct ltt_kernel_session *session);
 ssize_t kernel_list_events(struct lttng_event **event_list);
-void kernel_wait_quiescent(void);
+void kernel_wait_quiescent();
 int kernel_validate_version(struct lttng_kernel_abi_tracer_version *kernel_tracer_version,
 			    struct lttng_kernel_abi_tracer_abi_version *kernel_tracer_abi_version);
 void kernel_destroy_session(struct ltt_kernel_session *ksess);
@@ -70,15 +70,15 @@ int kernel_syscall_mask(int chan_fd, char **syscall_mask, uint32_t *nr_bits);
 enum lttng_error_code kernel_rotate_session(struct ltt_session *session);
 enum lttng_error_code kernel_clear_session(struct ltt_session *session);
 
-int init_kernel_workarounds(void);
-int kernel_supports_ring_buffer_snapshot_sample_positions(void);
-int kernel_supports_ring_buffer_packet_sequence_number(void);
-int kernel_supports_event_notifiers(void);
-enum lttng_kernel_tracer_status get_kernel_tracer_status(void);
+int init_kernel_workarounds();
+int kernel_supports_ring_buffer_snapshot_sample_positions();
+int kernel_supports_ring_buffer_packet_sequence_number();
+int kernel_supports_event_notifiers();
+enum lttng_kernel_tracer_status get_kernel_tracer_status();
 void set_kernel_tracer_status_from_modules_ret(int);
-int init_kernel_tracer(void);
-void cleanup_kernel_tracer(void);
-bool kernel_tracer_is_initialized(void);
+int init_kernel_tracer();
+void cleanup_kernel_tracer();
+bool kernel_tracer_is_initialized();
 
 enum lttng_error_code kernel_create_channel_subdirectories(const struct ltt_kernel_session *ksess);
 
@@ -91,6 +91,6 @@ enum lttng_error_code kernel_register_event_notifier(struct lttng_trigger *trigg
 						     const struct lttng_credentials *cmd_creds);
 enum lttng_error_code kernel_unregister_event_notifier(const struct lttng_trigger *trigger);
 
-int kernel_get_notification_fd(void);
+int kernel_get_notification_fd();
 
 #endif /* _LTT_KERNEL_CTL_H */
diff --git a/src/bin/lttng-sessiond/lttng-sessiond.hpp b/src/bin/lttng-sessiond/lttng-sessiond.hpp
index c8e03e7e9..a10586bb8 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.hpp
+++ b/src/bin/lttng-sessiond/lttng-sessiond.hpp
@@ -144,16 +144,16 @@ extern struct consumer_data the_ustconsumer32_data;
 extern struct consumer_data the_ustconsumer64_data;
 extern struct consumer_data the_kconsumer_data;
 
-int sessiond_init_main_quit_pipe(void);
+int sessiond_init_main_quit_pipe();
 int sessiond_wait_for_main_quit_pipe(int timeout_ms);
-int sessiond_notify_main_quit_pipe(void);
-void sessiond_close_main_quit_pipe(void);
+int sessiond_notify_main_quit_pipe();
+void sessiond_close_main_quit_pipe();
 
 int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-void sessiond_signal_parents(void);
+void sessiond_signal_parents();
 
 void sessiond_set_client_thread_state(bool running);
-void sessiond_wait_client_thread_stopped(void);
+void sessiond_wait_client_thread_stopped();
 
 void *thread_manage_consumer(void *data);
 
diff --git a/src/bin/lttng-sessiond/modprobe.hpp b/src/bin/lttng-sessiond/modprobe.hpp
index f0ad01c9c..a006d009f 100644
--- a/src/bin/lttng-sessiond/modprobe.hpp
+++ b/src/bin/lttng-sessiond/modprobe.hpp
@@ -8,10 +8,10 @@
 #ifndef _MODPROBE_H
 #define _MODPROBE_H
 
-void modprobe_remove_lttng_all(void);
-void modprobe_remove_lttng_control(void);
-void modprobe_remove_lttng_data(void);
-int modprobe_lttng_control(void);
-int modprobe_lttng_data(void);
+void modprobe_remove_lttng_all();
+void modprobe_remove_lttng_control();
+void modprobe_remove_lttng_data();
+int modprobe_lttng_control();
+int modprobe_lttng_data();
 
 #endif /* _MODPROBE_H */
diff --git a/src/bin/lttng-sessiond/rotation-thread.hpp b/src/bin/lttng-sessiond/rotation-thread.hpp
index 77564a168..5e9b9d75e 100644
--- a/src/bin/lttng-sessiond/rotation-thread.hpp
+++ b/src/bin/lttng-sessiond/rotation-thread.hpp
@@ -81,7 +81,7 @@ private:
 	lttng_poll_event _events;
 };
 
-struct rotation_thread_timer_queue *rotation_thread_timer_queue_create(void);
+struct rotation_thread_timer_queue *rotation_thread_timer_queue_create();
 void rotation_thread_timer_queue_destroy(struct rotation_thread_timer_queue *queue);
 void rotation_thread_enqueue_job(struct rotation_thread_timer_queue *queue,
 				 enum rotation_thread_job_type job_type,
diff --git a/src/bin/lttng-sessiond/timer.hpp b/src/bin/lttng-sessiond/timer.hpp
index 142982f8b..c291ae6d2 100644
--- a/src/bin/lttng-sessiond/timer.hpp
+++ b/src/bin/lttng-sessiond/timer.hpp
@@ -19,7 +19,7 @@ struct timer_thread_parameters {
 	lttng::sessiond::rotation_thread_timer_queue *rotation_thread_job_queue;
 };
 
-int timer_signal_init(void);
+int timer_signal_init();
 
 /* Start a session's rotation pending check timer (one-shot mode). */
 int timer_session_rotation_pending_check_start(struct ltt_session *session,
diff --git a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.hpp b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.hpp
index 0c3ceb1fd..c15ee8f45 100644
--- a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.hpp
+++ b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.hpp
@@ -58,10 +58,10 @@ public:
 	trace_class_visitor(const lttng::sessiond::trace::abi& trace_abi,
 			    append_metadata_fragment_function append_metadata);
 
-	virtual void visit(const lttng::sessiond::trace::trace_class& trace_class) override final;
-	virtual void visit(const lttng::sessiond::trace::clock_class& clock_class) override final;
-	virtual void visit(const lttng::sessiond::trace::stream_class& stream_class) override final;
-	virtual void visit(const lttng::sessiond::trace::event_class& event_class) override final;
+	void visit(const lttng::sessiond::trace::trace_class& trace_class) final;
+	void visit(const lttng::sessiond::trace::clock_class& clock_class) final;
+	void visit(const lttng::sessiond::trace::stream_class& stream_class) final;
+	void visit(const lttng::sessiond::trace::event_class& event_class) final;
 
 private:
 	/* Coherent (parseable) fragments must be appended. */
diff --git a/src/bin/lttng-sessiond/ust-ctl-internal.hpp b/src/bin/lttng-sessiond/ust-ctl-internal.hpp
index 661c94725..79b863ce2 100644
--- a/src/bin/lttng-sessiond/ust-ctl-internal.hpp
+++ b/src/bin/lttng-sessiond/ust-ctl-internal.hpp
@@ -181,7 +181,7 @@ struct lttng_ust_ctl_consumer_channel;
 struct lttng_ust_ctl_consumer_stream;
 struct lttng_ust_ctl_consumer_channel_attr;
 
-int lttng_ust_ctl_get_nr_stream_per_channel(void);
+int lttng_ust_ctl_get_nr_stream_per_channel();
 
 struct lttng_ust_ctl_consumer_channel *lttng_ust_ctl_create_channel(
 	struct lttng_ust_ctl_consumer_channel_attr *attr, const int *stream_fds, int nr_stream_fds);
@@ -287,7 +287,7 @@ int lttng_ust_ctl_get_instance_id(struct lttng_ust_ctl_consumer_stream *stream,
 int lttng_ust_ctl_get_current_timestamp(struct lttng_ust_ctl_consumer_stream *stream, uint64_t *ts);
 
 /* returns whether UST has perf counters support. */
-int lttng_ust_ctl_has_perf_counters(void);
+int lttng_ust_ctl_has_perf_counters();
 
 /* Regenerate the statedump. */
 int lttng_ust_ctl_regenerate_statedump(int sock, int handle);
@@ -591,7 +591,7 @@ enum lttng_ust_ctl_counter_alloc {
 
 struct lttng_ust_ctl_daemon_counter;
 
-int lttng_ust_ctl_get_nr_cpu_per_counter(void);
+int lttng_ust_ctl_get_nr_cpu_per_counter();
 
 struct lttng_ust_ctl_counter_dimension {
 	uint64_t size;
diff --git a/src/bin/lttng-sessiond/ust-registry-session-pid.hpp b/src/bin/lttng-sessiond/ust-registry-session-pid.hpp
index 4cd9911d4..4bdbe4a73 100644
--- a/src/bin/lttng-sessiond/ust-registry-session-pid.hpp
+++ b/src/bin/lttng-sessiond/ust-registry-session-pid.hpp
@@ -34,9 +34,9 @@ public:
 				 gid_t egid,
 				 uint64_t tracing_id);
 
-	virtual lttng_buffer_type buffering_scheme() const noexcept override final;
-	virtual void accept(lttng::sessiond::trace::trace_class_environment_visitor&
-				    environment_visitor) const override final;
+	lttng_buffer_type buffering_scheme() const noexcept final;
+	void accept(lttng::sessiond::trace::trace_class_environment_visitor& environment_visitor)
+		const final;
 
 private:
 	const unsigned int _tracer_patch_level_version;
diff --git a/src/bin/lttng-sessiond/ust-registry-session-uid.hpp b/src/bin/lttng-sessiond/ust-registry-session-uid.hpp
index 69dc68c25..d7de5ebfb 100644
--- a/src/bin/lttng-sessiond/ust-registry-session-uid.hpp
+++ b/src/bin/lttng-sessiond/ust-registry-session-uid.hpp
@@ -32,9 +32,9 @@ public:
 				 uint64_t tracing_id,
 				 uid_t tracing_uid);
 
-	virtual lttng_buffer_type buffering_scheme() const noexcept override final;
-	virtual void accept(lttng::sessiond::trace::trace_class_environment_visitor&
-				    environment_visitor) const override final;
+	lttng_buffer_type buffering_scheme() const noexcept final;
+	void accept(lttng::sessiond::trace::trace_class_environment_visitor& environment_visitor)
+		const final;
 
 private:
 	const uid_t _tracing_uid;
diff --git a/src/bin/lttng-sessiond/utils.hpp b/src/bin/lttng-sessiond/utils.hpp
index 9ad48e106..83117f426 100644
--- a/src/bin/lttng-sessiond/utils.hpp
+++ b/src/bin/lttng-sessiond/utils.hpp
@@ -12,7 +12,7 @@ struct lttng_ht;
 struct ltt_session;
 struct consumer_output;
 
-const char *get_home_dir(void);
+const char *get_home_dir();
 int notify_thread_pipe(int wpipe);
 int loglevels_match(int a_loglevel_type,
 		    int a_loglevel_value,
diff --git a/src/bin/lttng/conf.hpp b/src/bin/lttng/conf.hpp
index e1260c772..cda2763a3 100644
--- a/src/bin/lttng/conf.hpp
+++ b/src/bin/lttng/conf.hpp
@@ -11,7 +11,7 @@
 #define CONFIG_FILENAME ".lttngrc"
 
 void config_destroy(const char *path);
-void config_destroy_default(void);
+void config_destroy_default();
 int config_exists(const char *path);
 int config_init(const char *path);
 int config_add_session_name(const char *path, const char *name);
diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index d790e74d4..dc9c23e29 100644
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -57,7 +57,7 @@ public:
 	{
 	}
 
-	session_storage(session_storage&& original) :
+	session_storage(session_storage&& original) noexcept :
 		_array(std::move(original._array)), _count(original._count)
 	{
 	}
@@ -104,7 +104,7 @@ public:
 	{
 	}
 
-	session_list(session_list&& original) :
+	session_list(session_list&& original) noexcept :
 		lttng::utils::random_access_container_wrapper<details::session_storage,
 							      lttng_session&,
 							      details::session_list_operations>(
@@ -138,8 +138,8 @@ lttng::cli::session_list list_sessions(const struct session_spec& spec);
 } /* namespace cli */
 } /* namespace lttng */
 
-char *get_session_name(void);
-char *get_session_name_quiet(void);
+char *get_session_name();
+char *get_session_name_quiet();
 void list_commands(struct cmd_struct *commands, FILE *ofp);
 void list_cmd_options(FILE *ofp, struct poptOption *options);
 void list_cmd_options_argpar(FILE *ofp, const struct argpar_opt_descr *options);
@@ -167,7 +167,7 @@ const char *get_event_type_str(enum lttng_event_type event_type);
 int print_missing_or_multiple_domains(unsigned int domain_count, bool include_agent_domains);
 
 int spawn_relayd(const char *pathname, int port);
-int check_relayd(void);
+int check_relayd();
 void print_session_stats(const char *session_name);
 int get_session_stats_str(const char *session_name, char **str);
 int show_cmd_help(const char *cmd_name, const char *help_msg);
diff --git a/src/common/fd-tracker/inode.hpp b/src/common/fd-tracker/inode.hpp
index 7f4f6fb59..4206117d8 100644
--- a/src/common/fd-tracker/inode.hpp
+++ b/src/common/fd-tracker/inode.hpp
@@ -30,7 +30,7 @@ struct lttng_unlinked_file_pool *lttng_unlinked_file_pool_create(const char *pat
 void lttng_unlinked_file_pool_destroy(struct lttng_unlinked_file_pool *pool);
 
 /* The inode registry is protected by the fd-tracker's lock. */
-struct lttng_inode_registry *lttng_inode_registry_create(void);
+struct lttng_inode_registry *lttng_inode_registry_create();
 
 struct lttng_inode *lttng_inode_registry_get_inode(struct lttng_inode_registry *registry,
 						   struct lttng_directory_handle *handle,
diff --git a/src/lib/lttng-ctl/lttng-ctl-helper.hpp b/src/lib/lttng-ctl/lttng-ctl-helper.hpp
index 843462e9f..b725dd06f 100644
--- a/src/lib/lttng-ctl/lttng-ctl-helper.hpp
+++ b/src/lib/lttng-ctl/lttng-ctl-helper.hpp
@@ -50,7 +50,7 @@ static inline int lttng_ctl_ask_sessiond_varlen_no_cmd_header(struct lttcomm_ses
 							      void **user_payload_buf)
 {
 	return lttng_ctl_ask_sessiond_fds_varlen(
-		lsm, NULL, 0, vardata, vardata_len, user_payload_buf, NULL, NULL);
+		lsm, nullptr, 0, vardata, vardata_len, user_payload_buf, nullptr, nullptr);
 }
 
 /*
@@ -61,18 +61,19 @@ static inline int lttng_ctl_ask_sessiond_fds_no_cmd_header(struct lttcomm_sessio
 							   size_t nb_fd,
 							   void **buf __attribute__((unused)))
 {
-	return lttng_ctl_ask_sessiond_fds_varlen(lsm, fds, nb_fd, NULL, 0, NULL, NULL, NULL);
+	return lttng_ctl_ask_sessiond_fds_varlen(
+		lsm, fds, nb_fd, nullptr, 0, nullptr, nullptr, nullptr);
 }
 /*
  * Use this if no variable length data needs to be sent.
  */
 static inline int lttng_ctl_ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 {
-	return lttng_ctl_ask_sessiond_varlen_no_cmd_header(lsm, NULL, 0, buf);
+	return lttng_ctl_ask_sessiond_varlen_no_cmd_header(lsm, nullptr, 0, buf);
 }
 
-int lttng_check_tracing_group(void);
+int lttng_check_tracing_group();
 
-int connect_sessiond(void);
+int connect_sessiond();
 
 #endif /* LTTNG_CTL_HELPER_H */
-- 
2.34.1