common: split ini-config in its own convenience library

[lttng-tools.git] / src / bin / lttng-relayd / main.cpp

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index bc3c56f347a05b879c47b4a7a6d71cc31ef18e22..71690f1da90f0d3ecdd96a6a1834d798e532e302 100644 (file)
--- 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>
@@ -3115,7 +3115,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 +3629,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,