Clean-up: sessiond: cmd_enable_channel_internal

[lttng-tools.git] / src / bin / lttng-sessiond / ust-consumer.h

diff --git a/src/bin/lttng-sessiond/ust-consumer.h b/src/bin/lttng-sessiond/ust-consumer.h
index b8bd655758130997c9bc917863f14935f1e5670b..63d8eb25ca8fb1e47bf32969527349e99530ba1b 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.h
+++ b/src/bin/lttng-sessiond/ust-consumer.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _UST_CONSUMER_H
@@ -21,13 +11,14 @@
 #include "consumer.h"
 #include "ust-app.h"
 #include <stdint.h>
+#include <common/trace-chunk.h>
 
 int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
                struct ust_app_channel *ua_chan,
                struct consumer_output *consumer,
                struct consumer_socket *socket,
                struct ust_registry_session *registry,
-               uint64_t trace_archive_id);
+               struct lttng_trace_chunk *trace_chunk);
 
 int ust_consumer_get_channel(struct consumer_socket *socket,
                struct ust_app_channel *ua_chan);
@@ -41,11 +32,12 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
 int ust_consumer_send_channel_to_ust(struct ust_app *app,
                struct ust_app_session *ua_sess, struct ust_app_channel *channel);
 
-#if HAVE_LIBLTTNG_UST_CTL
+#ifdef HAVE_LIBLTTNG_UST_CTL
 int ust_consumer_metadata_request(struct consumer_socket *sock);
 #else
 static inline
-int ust_consumer_metadata_request(struct consumer_socket *sock)
+int ust_consumer_metadata_request(
+               struct consumer_socket *sock __attribute__((unused)))
 {
        return -ENOSYS;
 }