X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=70bd140672e8ddb7aa5d4c3c39835148aee85ec9;hp=cbad61144b1d1ec391cf1649a85672751d1311be;hb=3e25d926e1c03011c68430e3a358d1e9a10ca9ab;hpb=a3a86f35682d8dd69a617ded2777092de51fcf8c

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index cbad61144..70bd14067 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -407,9 +407,7 @@ error_shm_open:
 	return -1;
 }
 
-static int open_ust_stream_fd(struct lttng_consumer_channel *channel,
-		struct ustctl_consumer_channel_attr *attr,
-		int cpu)
+static int open_ust_stream_fd(struct lttng_consumer_channel *channel, int cpu)
 {
 	char shm_path[PATH_MAX];
 	int ret;
@@ -464,7 +462,7 @@ static int create_ust_channel(struct lttng_consumer_channel *channel,
 		goto error_alloc;
 	}
 	for (i = 0; i < nr_stream_fds; i++) {
-		stream_fds[i] = open_ust_stream_fd(channel, attr, i);
+		stream_fds[i] = open_ust_stream_fd(channel, i);
 		if (stream_fds[i] < 0) {
 			ret = -1;
 			goto error_open;
@@ -641,7 +639,7 @@ error:
  * Return 0 on success or else, a negative value is returned and the channel
  * MUST be destroyed by consumer_del_channel().
  */
-static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_channel *channel,
 		struct ustctl_consumer_channel_attr *attr)
 {
@@ -1494,7 +1492,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		health_code_update();
 
-		ret = ask_channel(ctx, sock, channel, &attr);
+		ret = ask_channel(ctx, channel, &attr);
 		if (ret < 0) {
 			goto end_channel_error;
 		}
@@ -3120,7 +3118,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 	request.key = channel->key;
 
 	DBG("Sending metadata request to sessiond, session id %" PRIu64
-			", per-pid %" PRIu64 ", app UID %u and channek key %" PRIu64,
+			", per-pid %" PRIu64 ", app UID %u and channel key %" PRIu64,
 			request.session_id, request.session_id_per_pid, request.uid,
 			request.key);