From: David Goulet <dgoulet@efficios.com>
Date: Mon, 25 Nov 2013 19:15:51 +0000 (-0500)
Subject: Fix: comparison of unsigned enum expression >= 0
X-Git-Tag: v2.3.2~30
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=97813c5867b167ae74015a9703744e17e2a7f029;p=lttng-tools.git

Fix: comparison of unsigned enum expression >= 0

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

Conflicts:
	src/common/ust-consumer/ust-consumer.c
---

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 6be3ed976..e92e71097 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1964,14 +1964,14 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 		goto end;
 	}
 
-	ret_code = lttng_ustconsumer_recv_metadata(ctx->consumer_metadata_socket,
+	ret = lttng_ustconsumer_recv_metadata(ctx->consumer_metadata_socket,
 			key, offset, len, channel, timer);
-	if (ret_code >= 0) {
+	if (ret >= 0) {
 		/*
 		 * Only send the status msg if the sessiond is alive meaning a positive
 		 * ret code.
 		 */
-		(void) consumer_send_status_msg(ctx->consumer_metadata_socket, ret_code);
+		(void) consumer_send_status_msg(ctx->consumer_metadata_socket, ret);
 	}
 	ret = 0;