Close stream and channel file descriptors as soon as passed to sessiond

[lttng-ust.git] / liblttng-ust-ctl / ustctl.c

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 5405418ccab632e204d1a2603413fa2a4a903a89..f7e13a1a06e8618823899e8a49286278d8f4ce5a 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -63,8 +63,6 @@ int ustctl_release_handle(int sock, int handle)
  */
 int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 {
-       struct ustcomm_ust_msg lum;
-       struct ustcomm_ust_reply lur;
        int ret;
 
        if (data->shm_fd >= 0) {
@@ -602,8 +600,8 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
        int cpu)
 {
        struct channel *chan = handle->shadow_chan;
-       int shm_fd, wait_fd;
-       uint64_t memory_map_size;
+       int *shm_fd, *wait_fd;
+       uint64_t *memory_map_size;
        struct lttng_ust_lib_ring_buffer *buf;
        int ret;