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 ccdfcfad83bb8f5ab3f7c611bb6178ed63ff179a..cddfee900e5a039d202f69e2e2ac921e4ce10af2 100644 (file)
--- 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 56608eca9e14af3b84e1f4d8426fb33a8e608165..f8c106c6eb12f372f723e98668fdd10cd3bce625 100644 (file)
--- 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.