Clean unused vars. warnings

[lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 4b8a8e71d9e5b4548f8e3e3d2c0e7e676e514c96..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) */
@@ -523,10 +521,13 @@ static
 long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg)
 {
        struct ltt_tracepoint_list *list = objd_private(objd);
+       char *str = (char *) arg;
 
        switch (cmd) {
        case LTTNG_UST_TRACEPOINT_LIST_GET:
-               ltt_tracepoint_list_get(list, (char *) arg);
+               ltt_tracepoint_list_get(list, str);
+               if (str[0] == '\0')
+                       return -ENOENT;
                return 0;
        default:
                return -EINVAL;