From: David Goulet <dgoulet@efficios.com>
Date: Tue, 3 Dec 2013 16:35:31 +0000 (-0500)
Subject: Fix: bad logical check of error codes
X-Git-Tag: v2.4.0-rc2~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a2ba1ab0fbd794f06d5ba9afac6b3749dace34e4;p=lttng-tools.git

Fix: bad logical check of error codes

Fixes #701

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

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 8dedb8730..ab08ac0e4 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -3148,7 +3148,7 @@ int ust_app_list_events(struct lttng_event **events)
 			/* Handle ustctl error. */
 			if (ret < 0) {
 				free(tmp_event);
-				if (ret != -LTTNG_UST_ERR_EXITING || ret != -EPIPE) {
+				if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
 					ERR("UST app tp list get failed for app %d with ret %d",
 							app->sock, ret);
 				} else {
@@ -3248,7 +3248,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 			/* Handle ustctl error. */
 			if (ret < 0) {
 				free(tmp_event);
-				if (ret != -LTTNG_UST_ERR_EXITING || ret != -EPIPE) {
+				if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
 					ERR("UST app tp list field failed for app %d with ret %d",
 							app->sock, ret);
 				} else {