X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-2.cpp;h=dcdd1bac14cb9f14057fb0fb8a8119cad6fa439b;hb=0359d56c6cbb7a41c36ba6c387acb9dd89c54628;hp=3d9af63a313f5f2a9ff6bf9a6f451d62dcf25578;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/cmd-2-2.cpp b/src/bin/lttng-relayd/cmd-2-2.cpp index 3d9af63a3..dcdd1bac1 100644 --- a/src/bin/lttng-relayd/cmd-2-2.cpp +++ b/src/bin/lttng-relayd/cmd-2-2.cpp @@ -9,33 +9,36 @@ #define _LGPL_SOURCE -#include -#include +#include "cmd-2-1.hpp" +#include "cmd-2-2.hpp" +#include "utils.hpp" +#include #include #include -#include +#include -#include "cmd-2-2.hpp" -#include "cmd-2-1.hpp" -#include "utils.hpp" +#include /* * cmd_recv_stream_2_2 allocates path_name and channel_name. */ int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload, - char **ret_path_name, char **ret_channel_name, - uint64_t *tracefile_size, uint64_t *tracefile_count) + char **ret_path_name, + char **ret_channel_name, + uint64_t *tracefile_size, + uint64_t *tracefile_count) { int ret; struct lttcomm_relayd_add_stream_2_2 stream_info; - char *path_name = NULL; - char *channel_name = NULL; + char *path_name = nullptr; + char *channel_name = nullptr; size_t len; if (payload->size < sizeof(stream_info)) { ERR("Unexpected payload size in \"cmd_recv_stream_2_2\": expected >= %zu bytes, got %zu bytes", - sizeof(stream_info), payload->size); + sizeof(stream_info), + payload->size); ret = -1; goto error; }