From 94cc2fd1d4c93bf52c9142999ad0355ad7bc7323 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 28 May 2013 15:05:04 -0400 Subject: [PATCH] Fix: remove dead code Signed-off-by: David Goulet --- src/bin/lttng-sessiond/main.c | 6 ------ src/common/compat/compat-epoll.c | 2 -- src/common/ust-consumer/ust-consumer.c | 4 ---- 3 files changed, 12 deletions(-) diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index f6e7094bf..4470afc5e 100644 --- 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 40451b3d2..f014a0d78 100644 --- 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 652207297..6acaacd63 100644 --- 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) { -- 2.34.1