From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 25 Jul 2017 14:54:48 +0000 (-0400)
Subject: Cleanup: remove dead assignment
X-Git-Tag: v2.11.0-rc1~494
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=fee30cf85f3b58b329d669db781cd7aac22f7785

Cleanup: remove dead assignment

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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;
 	}