Fix: remove dead code

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f6e7094bfca08947c3cddb5d1693818a350ee5dc..4470afc5e8dd1cf51428f9b5ce22d5ce2e5c217f 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3276,12 +3276,6 @@ error:
                        PERROR("close");
                }
        }
-       if (new_sock >= 0) {
-               ret = close(new_sock);
-               if (ret) {
-                       PERROR("close");
-               }
-       }
 
        lttng_poll_clean(&events);
 

diff --git a/src/common/compat/compat-epoll.c b/src/common/compat/compat-epoll.c
index 40451b3d21286106430c1322209b21d9fef9579f..f014a0d783d434f57fc95a5c17e126f62946e74e 100644 (file)
--- a/src/common/compat/compat-epoll.c
+++ b/src/common/compat/compat-epoll.c
@@ -169,8 +169,6 @@ int compat_epoll_del(struct lttng_poll_event *events, int fd)
                        PERROR("epoll_ctl DEL fatal");
                        goto error;
                }
-               PERROR("epoll_ctl del");
-               goto error;
        }
 
        events->nb_fd--;

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 65220729766d4ad56c6a5c861e9b8d8f6af84927..6acaacd63c942d1092ad9cdc056713f28a704462 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -491,10 +491,6 @@ static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
 
        channel->wait_fd = ustctl_channel_get_wait_fd(channel->uchan);
 
-       if (ret < 0) {
-               goto error;
-       }
-
        /* Open all streams for this channel. */
        ret = create_ust_streams(channel, ctx);
        if (ret < 0) {