X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fdestroy.c;h=151686ff9061b157fa9b33aadd8c6924550e534b;hb=734f79bf717d87817623d382c59086dc9e8ef610;hp=9519403ad1c68e26a85a913e7714dd536a2f20fc;hpb=f3ed775ef4842019b396f06095b053c3a70bc3c8;p=lttng-tools.git

diff --git a/lttng/commands/destroy.c b/lttng/commands/destroy.c
index 9519403ad..151686ff9 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,9 +25,9 @@
 #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;
 
@@ -56,10 +56,8 @@ static void usage(FILE *ofp)
 }
 
 /*
- *  destroy_session
- *
- *  Destroy a session removing the config directory and unregistering to the
- *  session daemon.
+ * Destroy a session removing the config directory and unregistering to the
+ * session daemon.
  */
 static int destroy_session()
 {
@@ -81,7 +79,7 @@ static int destroy_session()
 		goto free_name;
 	}
 
-	path = get_config_file_path();
+	path = config_get_default_path();
 	if (path == NULL) {
 		ret = CMD_FATAL;
 		goto free_name;
@@ -94,19 +92,18 @@ 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:
 	return ret;
 }
 
 /*
- *  cmd_destroy
- *
- *  The 'destroy <options>' first level command
+ * The 'destroy <options>' first level command
  */
 int cmd_destroy(int argc, const char **argv)
 {