X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=e825d9c3e7dfa01ac5ca31399eb3b469ea17b07c;hb=a4eb26f0f09cd6d031166329a7d5d7b5d40408a6;hp=eed1fe5c5878fc15679009c64b18e0788adf0cf9;hpb=64da6b6e78ec1273564d498e94d4dd008ecc5d29;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index eed1fe5c5..e825d9c3e 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
  * SPDX-License-Identifier: GPL-2.0-only
  *
@@ -87,10 +87,13 @@ static int destroy_session(struct lttng_session *session)
 			 * availability.
 			 */
 			if (ret) {
-				_MSG("Destroying session %s", session->name);
-				newline_needed = true;
-				printed_destroy_msg = true;
-				fflush(stdout);
+				if (!printed_destroy_msg) {
+					_MSG("Destroying session %s",
+							session->name);
+					newline_needed = true;
+					printed_destroy_msg = true;
+					fflush(stdout);
+				}
 
 				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US);
 				_MSG(".");
@@ -269,7 +272,7 @@ int cmd_destroy(int argc, const char **argv)
 	char *session_name = NULL;
 	const char *leftover = NULL;
 
-	struct lttng_session *sessions;
+	struct lttng_session *sessions = NULL;
 	int count;
 	int found;
 
@@ -420,6 +423,8 @@ end:
 		free(session_name);
 	}
 
+	free(sessions);
+
 	/* Overwrite ret if an error occurred during destroy_session/all */
 	ret = command_ret ? command_ret : ret;