X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=d303e8b66ec240f590cda13b621dc0a6918cecf4;hp=2dc13da09ca5f125b0b71d17b48a3995d5ce7269;hb=acfb63a8ba86cb7d89cfeea515abceb89f2907e9;hpb=be355079dc40848a2b654b1f0871dfa99a4876de

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 2dc13da09..d303e8b66 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1342,7 +1342,7 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
 	case LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE:
 		break;
 	default:
-		/* Error occured. */
+		/* Error occurred. */
 		ERR("Failed to generate exclusions from trigger while allocating an event notifier rule");
 		goto error_put_trigger;
 	}
@@ -1974,8 +1974,10 @@ static int send_channel_pid_to_ust(struct ust_app *app,
 			WARN("Communication with application %d timed out on send_stream for stream \"%s\" of channel \"%s\" of session \"%" PRIu64 "\".",
 					app->pid, stream->name, ua_chan->name,
 					ua_sess->tracing_id);
-			/* Treat this the same way as an application that is
-			 * exiting. */
+			/*
+			 * Treat this the same way as an application that is
+			 * exiting.
+			 */
 			ret = -ENOTCONN;
 		} else if (ret < 0) {
 			goto error;
@@ -6349,7 +6351,7 @@ static int reply_ust_register_channel(int sock, int cobjd,
 	if (!app) {
 		DBG("Application socket %d is being torn down. Abort event notify",
 				sock);
-		ret = 0;
+		ret = -1;
 		goto error_rcu_unlock;
 	}
 
@@ -6470,7 +6472,7 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, char *name,
 	if (!app) {
 		DBG("Application socket %d is being torn down. Abort event notify",
 				sock);
-		ret = 0;
+		ret = -1;
 		goto error_rcu_unlock;
 	}
 
@@ -6576,6 +6578,7 @@ static int add_enum_ust_registry(int sock, int sobjd, char *name,
 		DBG("Application socket %d is being torn down. Aborting enum registration",
 				sock);
 		free(entries);
+		ret = -1;
 		goto error_rcu_unlock;
 	}
 
@@ -6583,14 +6586,14 @@ static int add_enum_ust_registry(int sock, int sobjd, char *name,
 	ua_sess = find_session_by_objd(app, sobjd);
 	if (!ua_sess) {
 		/* Return an error since this is not an error */
-		DBG("Application session is being torn down (session not found Aborting enum registration.");
+		DBG("Application session is being torn down (session not found). Aborting enum registration.");
 		free(entries);
 		goto error_rcu_unlock;
 	}
 
 	registry = get_session_registry(ua_sess);
 	if (!registry) {
-		DBG("Application session is being torn down (registry not found Aborting enum registration.");
+		DBG("Application session is being torn down (registry not found). Aborting enum registration.");
 		free(entries);
 		goto error_rcu_unlock;
 	}