X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=8b1665a06568de2bc90a4a90e61b40e35af4800c;hb=fb54cdbf2a8ff53e9dc11403a8aca643bbdde9c0;hp=e0562ed4e5448d2e184b288481fad0e80bb77b0b;hpb=5b98a7741b64765b34396a151b976f8f58ee3a5e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index e0562ed4e..8b1665a06 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <urcu/compiler.h>
+#include <lttng/ust-error.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -1580,7 +1581,7 @@ int ust_app_list_events(struct lttng_event **events)
 		}
 
 		while ((ret = ustctl_tracepoint_list_get(app->sock, handle,
-						&uiter)) != -ENOENT) {
+					&uiter)) != -LTTNG_UST_ERR_NOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
 				/* In case the realloc fails, we free the memory */
@@ -1658,7 +1659,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 		}
 
 		while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
-						&uiter)) != -ENOENT) {
+					&uiter)) != -LTTNG_UST_ERR_NOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
 				/* In case the realloc fails, we free the memory */
@@ -1983,6 +1984,7 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess,
 int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan)
 {
+	int ret = 0;
 	struct lttng_ht_iter iter;
 	struct ust_app *app;
 	struct ust_app_session *ua_sess;
@@ -2014,9 +2016,11 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		ua_sess = create_ust_app_session(usess, app);
 		if (ua_sess == NULL) {
 			/* The malloc() failed. */
+			ret = -1;
 			goto error;
 		} else if (ua_sess == (void *) -1UL) {
 			/* The application's socket is not valid. Contiuing */
+			ret = -1;
 			continue;
 		}
 
@@ -2024,16 +2028,15 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		ua_chan = create_ust_app_channel(ua_sess, uchan, app);
 		if (ua_chan == NULL) {
 			/* Major problem here and it's maybe the tracer or malloc() */
+			ret = -1;
 			goto error;
 		}
 	}
 
 	rcu_read_unlock();
 
-	return 0;
-
 error:
-	return -1;
+	return ret;
 }
 
 /*