From fee30cf85f3b58b329d669db781cd7aac22f7785 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 25 Jul 2017 10:54:48 -0400 Subject: [PATCH] Cleanup: remove dead assignment MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/common/config/session-config.c | 1 - src/common/consumer/consumer.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index 9f8640359..783a74a3f 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -3002,7 +3002,6 @@ static int validate_path_creds(const char *path) if (errno != ENOENT) { PERROR("stat"); } - ret = -LTTNG_ERR_INVALID; goto valid; } diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c index 9834322cf..ccf9b4038 100644 --- a/src/common/consumer/consumer.c +++ b/src/common/consumer/consumer.c @@ -3382,7 +3382,6 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, /* Not found. Allocate one. */ relayd = consumer_allocate_relayd_sock_pair(net_seq_idx); if (relayd == NULL) { - ret = -ENOMEM; ret_code = LTTCOMM_CONSUMERD_ENOMEM; goto error; } else { @@ -3415,14 +3414,12 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, if (ret) { /* Needing to exit in the middle of a command: error. */ lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_POLL_ERROR); - ret = -EINTR; goto error_nosignal; } /* Get relayd socket from session daemon */ ret = lttcomm_recv_fds_unix_sock(sock, &fd, 1); if (ret != sizeof(fd)) { - ret = -1; fd = -1; /* Just in case it gets set with an invalid value. */ /* @@ -3496,7 +3493,6 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, break; default: ERR("Unknown relayd socket type (%d)", sock_type); - ret = -1; ret_code = LTTCOMM_CONSUMERD_FATAL; goto error; } -- 2.34.1