X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.cpp;h=0bffb30bdb86ac1399516eba05c6bc74bb787e11;hb=42a11b8f4c8d98b33fa1eadcdcda96253e651f0b;hp=b9fd53bbf620bbd7be275c5a0aabf6c24e3387f2;hpb=b978006283473456b0e545d1c21de60d3e298dc5;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/destroy.cpp b/src/bin/lttng/commands/destroy.cpp
index b9fd53bbf..0bffb30bd 100644
--- a/src/bin/lttng/commands/destroy.cpp
+++ b/src/bin/lttng/commands/destroy.cpp
@@ -272,7 +272,7 @@ cmd_error_code destroy_sessions(const session_spec& spec)
 		}
 	}();
 
-	if (!listing_failed && sessions.size() == 0 && spec.type == session_spec::type::NAME) {
+	if (!listing_failed && sessions.size() == 0 && spec.type_ == session_spec::type::NAME) {
 		ERR_FMT("Session `{}` not found", spec.value);
 		return CMD_ERROR;
 	}
@@ -289,7 +289,7 @@ cmd_error_code destroy_sessions(const session_spec& spec)
 		} catch (const lttng::ctl::error& ctl_exception) {
 			switch (ctl_exception.code()) {
 			case LTTNG_ERR_NO_SESSION:
-				if (spec.type != session_spec::type::NAME) {
+				if (spec.type_ != session_spec::type::NAME) {
 					/* Session destroyed during command, ignore and carry-on. */
 					sub_ret = CMD_SUCCESS;
 					break;
@@ -335,10 +335,7 @@ int cmd_destroy(int argc, const char **argv)
 	bool success;
 	static poptContext pc;
 	const char *leftover = nullptr;
-	struct session_spec spec = {
-		.type = session_spec::NAME,
-		.value = nullptr,
-	};
+	struct session_spec spec(session_spec::type::NAME);
 	session_list const sessions;
 
 	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
@@ -358,10 +355,10 @@ int cmd_destroy(int argc, const char **argv)
 			list_cmd_options(stdout, long_options);
 			goto end;
 		case OPT_ALL:
-			spec.type = session_spec::ALL;
+			spec.type_ = session_spec::type::ALL;
 			break;
 		case OPT_ENABLE_GLOB:
-			spec.type = session_spec::GLOB_PATTERN;
+			spec.type_ = session_spec::type::GLOB_PATTERN;
 			break;
 		default:
 			command_ret = CMD_UNDEFINED;