X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=07d79adee6fa929642d17b46fe080a90e3708656;hp=bc3c56f347a05b879c47b4a7a6d71cc31ef18e22;hb=e56e5792ea1543cf5b506e343076820ef5863647;hpb=ac497a37018f3c253d2e50397294f58d33f7f24f

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index bc3c56f34..07d79adee 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -50,7 +50,7 @@
 #include <common/uri.h>
 #include <common/utils.h>
 #include <common/align.h>
-#include <common/config/session-config.h>
+#include <common/ini-config/ini-config.h>
 #include <common/dynamic-buffer.h>
 #include <common/buffer-view.h>
 #include <common/string-utils/format.h>
@@ -96,6 +96,11 @@ char *opt_output_path, *opt_working_directory;
 static int opt_daemon, opt_background, opt_print_version, opt_allow_clear = 1;
 enum relay_group_output_by opt_group_output_by = RELAYD_GROUP_OUTPUT_BY_UNKNOWN;
 
+/* Argument variables */
+int lttng_opt_quiet;    /* not static in error.h */
+int lttng_opt_verbose;  /* not static in error.h */
+int lttng_opt_mi;       /* not static in error.h */
+
 /*
  * We need to wait for listener and live listener threads, as well as
  * health check thread, before being ready to signal readiness.
@@ -3115,7 +3120,7 @@ static int relay_trace_chunk_exists(const struct lttcomm_relayd_hdr *recv_hdr,
 	bool chunk_exists;
 
 	if (!session || !conn->version_check_done) {
-		ERR("Trying to check for the existance of a trace chunk before version check");
+		ERR("Trying to check for the presence of a trace chunk before version check");
 		ret = -1;
 		goto end_no_reply;
 	}
@@ -3629,7 +3634,7 @@ static enum relay_connection_status relay_process_data_receive_payload(
 	 *   - the on-stack data buffer
 	 */
 	while (left_to_receive > 0 && !partial_recv) {
-		size_t recv_size = std::min(left_to_receive, chunk_size);
+		size_t recv_size = std::min<uint64_t>(left_to_receive, chunk_size);
 		struct lttng_buffer_view packet_chunk;
 
 		ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,