X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.cpp;h=5e19d4189025181682d2040d503290cc9d0172cf;hb=303ac4ed4037e45da1976c0951358ec19c5364d0;hp=019906a208d1af7bc0673413f045d783bf3a2ae4;hpb=6e11909ebb204e4a0f9651dc6c58f74c8376a094;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/destroy.cpp b/src/bin/lttng/commands/destroy.cpp
index 019906a20..5e19d4189 100644
--- a/src/bin/lttng/commands/destroy.cpp
+++ b/src/bin/lttng/commands/destroy.cpp
@@ -74,7 +74,7 @@ cmd_error_code destroy_session(const lttng_session& session)
 
 	ret = lttng_stop_tracing_no_wait(session.name);
 	if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
-		LTTNG_THROW_CTL(fmt::format("Failed to stop session `{}`", session.name),
+		LTTNG_THROW_CTL(lttng::format("Failed to stop session `{}`", session.name),
 				static_cast<lttng_error_code>(-ret));
 	}
 
@@ -110,7 +110,8 @@ cmd_error_code destroy_session(const lttng_session& session)
 		} while (ret != 0);
 	}
 
-	std::unique_ptr<char, lttng::memory::create_deleter_class<char, lttng::free>::deleter>
+	std::unique_ptr<char,
+			lttng::memory::create_deleter_class<char, lttng::memory::free>::deleter>
 		stats_str;
 	if (!session_was_already_stopped) {
 		char *raw_stats_str = nullptr;
@@ -134,7 +135,8 @@ cmd_error_code destroy_session(const lttng_session& session)
 		auto ctl_ret_code =
 			lttng_destroy_session_ext(session.name, &raw_destruction_handle);
 		if (ctl_ret_code != LTTNG_OK) {
-			LTTNG_THROW_CTL(fmt::format("Failed to destroy session `{}`", session.name),
+			LTTNG_THROW_CTL(lttng::format("Failed to destroy session `{}`",
+						      session.name),
 					ctl_ret_code);
 		}
 
@@ -184,7 +186,8 @@ cmd_error_code destroy_session(const lttng_session& session)
 		}
 
 		if (ctl_ret_code != LTTNG_OK) {
-			LTTNG_THROW_CTL(fmt::format("Failed to destroy session `{}`", session.name),
+			LTTNG_THROW_CTL(lttng::format("Failed to destroy session `{}`",
+						      session.name),
 					ctl_ret_code);
 		}
 
@@ -240,7 +243,7 @@ cmd_error_code destroy_session(const lttng_session& session)
 	 * destroy the file.
 	 */
 	const auto session_name =
-		lttng::make_unique_wrapper<char, lttng::free>(get_session_name_quiet());
+		lttng::make_unique_wrapper<char, lttng::memory::free>(get_session_name_quiet());
 	if (session_name && !strncmp(session.name, session_name.get(), NAME_MAX)) {
 		config_destroy_default();
 	}