Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng-relayd / cmd-2-1.c

diff --git a/src/bin/lttng-relayd/cmd-2-1.c b/src/bin/lttng-relayd/cmd-2-1.c
deleted file mode 100644 (file)
index 5e2ed35..0000000
--- a/src/bin/lttng-relayd/cmd-2-1.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
- * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
- * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * SPDX-License-Identifier: GPL-2.0-only
- *
- */
-
-#define _LGPL_SOURCE
-#include <assert.h>
-
-#include <common/common.h>
-#include <common/sessiond-comm/relayd.h>
-#include <common/compat/string.h>
-#include <lttng/constant.h>
-
-#include "cmd-2-1.h"
-#include "utils.h"
-
-/*
- * cmd_recv_stream_2_1 allocates path_name and channel_name.
- */
-int cmd_recv_stream_2_1(const struct lttng_buffer_view *payload,
-               char **ret_path_name, char **ret_channel_name)
-{
-       int ret;
-       struct lttcomm_relayd_add_stream stream_info;
-       char *path_name = NULL;
-       char *channel_name = NULL;
-       size_t len;
-
-       if (payload->size < sizeof(stream_info)) {
-               ERR("Unexpected payload size in \"cmd_recv_stream_2_1\": expected >= %zu bytes, got %zu bytes",
-                               sizeof(stream_info), payload->size);
-               ret = -1;
-               goto error;
-       }
-       memcpy(&stream_info, payload->data, sizeof(stream_info));
-
-       len = lttng_strnlen(stream_info.pathname, sizeof(stream_info.pathname));
-       /* Ensure that NULL-terminated and fits in local filename length. */
-       if (len == sizeof(stream_info.pathname) || len >= LTTNG_NAME_MAX) {
-               ret = -ENAMETOOLONG;
-               ERR("Path name too long");
-               goto error;
-       }
-       path_name = strdup(stream_info.pathname);
-       if (!path_name) {
-               PERROR("Path name allocation");
-               ret = -ENOMEM;
-               goto error;
-       }
-       len = lttng_strnlen(stream_info.channel_name, sizeof(stream_info.channel_name));
-       if (len == sizeof(stream_info.channel_name) || len >= DEFAULT_STREAM_NAME_LEN) {
-               ret = -ENAMETOOLONG;
-               ERR("Channel name too long");
-               goto error;
-       }
-       channel_name = strdup(stream_info.channel_name);
-       if (!channel_name) {
-               ret = -errno;
-               PERROR("Channel name allocation");
-               goto error;
-       }
-
-       *ret_path_name = path_name;
-       *ret_channel_name = channel_name;
-       return 0;
-error:
-       free(path_name);
-       free(channel_name);
-       return ret;
-}