From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 10 Nov 2011 17:15:09 +0000 (-0500)
Subject: Clean unused vars. warnings
X-Git-Tag: v1.9.1~115
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fe38d4afd3750c37dda6dbd98f5b72f86fd796b9;p=lttng-ust.git

Clean unused vars. warnings

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index ccdfcfad..cddfee90 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -325,7 +325,6 @@ void lttng_metadata_create_events(int channel_objd)
 		.name = "lttng_metadata",
 	};
 	struct ltt_event *event;
-	int ret;
 
 	/*
 	 * We tolerate no failure path after event creation. It will stay
@@ -333,7 +332,6 @@ void lttng_metadata_create_events(int channel_objd)
 	 */
 	event = ltt_event_create(channel, &metadata_params, NULL);
 	if (!event) {
-		ret = -EINVAL;
 		goto create_error;
 	}
 	return;
@@ -355,11 +353,6 @@ int lttng_abi_create_channel(int session_objd,
 	int ret = 0;
 	struct ltt_channel chan_priv_init;
 
-	chan_objd = objd_alloc(NULL, &lttng_channel_ops);
-	if (chan_objd < 0) {
-		ret = chan_objd;
-		goto objd_error;
-	}
 	switch (channel_type) {
 	case PER_CPU_CHANNEL:
 		if (chan_param->output == LTTNG_UST_MMAP) {
@@ -379,7 +372,12 @@ int lttng_abi_create_channel(int session_objd,
 		break;
 	default:
 		transport_name = "<unknown>";
-		break;
+		return -EINVAL;
+	}
+	chan_objd = objd_alloc(NULL, ops);
+	if (chan_objd < 0) {
+		ret = chan_objd;
+		goto objd_error;
 	}
 	memset(&chan_priv_init, 0, sizeof(chan_priv_init));
 	/* Copy of session UUID for consumer (availability through shm) */
diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 56608eca..f8c106c6 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -175,7 +175,6 @@ int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
 	const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config;
 	struct channel *chan = caa_container_of(chanb, struct channel, backend);
 	void *priv = channel_get_private(chan);
-	unsigned int num_subbuf;
 	size_t subbuf_header_size;
 	u64 tsc;
 	int ret;
@@ -207,9 +206,6 @@ int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
 		goto free_commit;
 	}
 
-	num_subbuf = chan->backend.num_subbuf;
-	//init_waitqueue_head(&buf->read_wait);
-
 	/*
 	 * Write the subbuffer header for first subbuffer so we know the total
 	 * duration of data gathering.