Cleanup warnings

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

diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c
index 0c0d6bb726f9c62804f9f17ee7f726bd5627bf93..6eb74ed8170d2b5ae1bdcd2c63a7fc57dc0af14e 100644 (file)
--- a/libust/lttng-ust-abi.c
+++ b/libust/lttng-ust-abi.c
@@ -177,16 +177,8 @@ void objd_table_destroy(void)
 {
        int i;
 
-       for (i = 0; i < objd_table.allocated_len; i++) {
-               struct obj *obj = _objd_get(i);
-               const struct objd_ops *ops;
-
-               if (!obj)
-                       continue;
-               ops = obj->u.s.ops;
-               if (ops->release)
-                       ops->release(i);
-       }
+       for (i = 0; i < objd_table.allocated_len; i++)
+               (void) objd_unref(i);
        free(objd_table.array);
        objd_table.array = NULL;
        objd_table.len = 0;
@@ -408,7 +400,10 @@ int lttng_abi_create_channel(int session_objd,
                                  chan_param->subbuf_size,
                                  chan_param->num_subbuf,
                                  chan_param->switch_timer_interval,
-                                 chan_param->read_timer_interval);
+                                 chan_param->read_timer_interval,
+                                 &chan_param->shm_fd,
+                                 &chan_param->wait_fd,
+                                 &chan_param->memory_map_size);
        if (!chan) {
                ret = -EINVAL;
                goto chan_error;
@@ -732,7 +727,7 @@ static const struct objd_ops lttng_metadata_ops = {
 static
 long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
 {
-       struct stream_priv_data *priv = objd_private(objd);
+       //struct stream_priv_data *priv = objd_private(objd);
 
        switch (cmd) {
        default:
@@ -751,6 +746,7 @@ int lttng_rb_release(int objd)
                buf = priv->buf;
                channel = priv->ltt_chan;
                free(priv);
+               channel->ops->buffer_read_close(buf, channel->handle);
 
                return objd_unref(channel->objd);
        }