Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng / utils.cpp

diff --git a/src/bin/lttng/utils.cpp b/src/bin/lttng/utils.cpp
index e799e2f906e5e6fed14311dfc704b5472a9d775c..45fe256a579d092b4a1d92ddd81e26459b315a1e 100644 (file)
--- a/src/bin/lttng/utils.cpp
+++ b/src/bin/lttng/utils.cpp
@@ -8,6 +8,7 @@
 #define _LGPL_SOURCE
 #include "command.hpp"
 #include "conf.hpp"
+#include "exception.hpp"
 #include "utils.hpp"
 
 #include <common/defaults.hpp>
@@ -712,17 +713,17 @@ lttng::cli::session_list lttng::cli::list_sessions(const struct session_spec& sp
        case lttng::cli::session_spec::type::NAME:
                if (spec.value == nullptr) {
                        const auto configured_name =
-                               lttng::make_unique_wrapper<char, lttng::free>(get_session_name());
+                               lttng::make_unique_wrapper<char, lttng::memory::free>(
+                                       get_session_name());
 
-                       if (configured_name) {
-                               const struct lttng::cli::session_spec new_spec(
-                                       lttng::cli::session_spec::type::NAME,
-                                       configured_name.get());
-
-                               return list_sessions(new_spec);
+                       if (!configured_name) {
+                               LTTNG_THROW_CLI_NO_DEFAULT_SESSION();
                        }
 
-                       return lttng::cli::session_list();
+                       const struct lttng::cli::session_spec new_spec(
+                               lttng::cli::session_spec::type::NAME, configured_name.get());
+
+                       return list_sessions(new_spec);
                }
 
                return get_sessions(
@@ -777,9 +778,8 @@ void print_kernel_tracer_status_error()
                        std::cerr << "\tlttng-sessiond failed to open /proc/lttng" << std::endl;
                        break;
                case LTTNG_KERNEL_TRACER_STATUS_ERR_VERSION_MISMATCH:
-                       std::cerr
-                               << "\tVersion mismatch between kernel tracer and kernel tracer ABI"
-                               << std::endl;
+                       std::cerr << "\tVersion mismatch between kernel tracer and kernel tracer ABI"
+                                 << std::endl;
                        break;
                default:
                        std::cerr << lttng::format("\t\tUnknown kernel tracer status (%d)",