X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fdestroy.c;h=3b02a53eee41fe9eea8e8c1b2472f640404db86b;hb=35346445460dfe7ba5bbcfdbe279c07c1ee3219b;hp=9519403ad1c68e26a85a913e7714dd536a2f20fc;hpb=f3ed775ef4842019b396f06095b053c3a70bc3c8;p=lttng-tools.git

diff --git a/lttng/commands/destroy.c b/lttng/commands/destroy.c
index 9519403ad..3b02a53ee 100644
--- a/lttng/commands/destroy.c
+++ b/lttng/commands/destroy.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,11 +25,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "config.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_session_name;
+static struct lttng_handle *handle;
 
 enum {
 	OPT_HELP = 1,
@@ -76,12 +77,18 @@ static int destroy_session()
 		session_name = opt_session_name;
 	}
 
-	ret = lttng_destroy_session(session_name);
+	handle = lttng_create_handle(session_name, NULL);
+	if (handle == NULL) {
+		ret = -1;
+		goto error;
+	}
+
+	ret = lttng_destroy_session(handle);
 	if (ret < 0) {
 		goto free_name;
 	}
 
-	path = get_config_file_path();
+	path = config_get_default_path();
 	if (path == NULL) {
 		ret = CMD_FATAL;
 		goto free_name;
@@ -94,12 +101,15 @@ static int destroy_session()
 		MSG("Session %s destroyed", session_name);
 	}
 
-	free(path);
 	ret = CMD_SUCCESS;
 
 free_name:
-	free(session_name);
+	if (opt_session_name == NULL) {
+		free(session_name);
+	}
 error:
+	lttng_destroy_handle(handle);
+
 	return ret;
 }