X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstart.cpp;h=d8e3569760298a1c7850bf8e29a9dff1ee0c2880;hb=5c7248cd5bce45bf64d563fb4e130a63bf345f11;hp=9a54d2227812f6022ddb284cdfba8075f0270951;hpb=5b915816f16e7cb3134dd7279abad79b31c2486c;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/start.cpp b/src/bin/lttng/commands/start.cpp
index 9a54d2227..d8e356976 100644
--- a/src/bin/lttng/commands/start.cpp
+++ b/src/bin/lttng/commands/start.cpp
@@ -6,6 +6,11 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,18 +19,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <common/mi-lttng.hpp>
-
-#include "../command.hpp"
-
-
 static struct mi_writer *writer;
 
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-start.1.h>
-;
+	;
 #endif
 
 enum {
@@ -35,9 +34,9 @@ enum {
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
-	{0, 0, 0, 0, 0, 0, 0}
+	{ "help", 'h', POPT_ARG_NONE, nullptr, OPT_HELP, nullptr, nullptr },
+	{ "list-options", 0, POPT_ARG_NONE, nullptr, OPT_LIST_OPTIONS, nullptr, nullptr },
+	{ nullptr, 0, 0, nullptr, 0, nullptr, nullptr }
 };
 
 static int mi_print_session(char *session_name, int enabled)
@@ -51,14 +50,12 @@ static int mi_print_session(char *session_name, int enabled)
 	}
 
 	/* Print session name element */
-	ret = mi_lttng_writer_write_element_string(writer, config_element_name,
-			session_name);
+	ret = mi_lttng_writer_write_element_string(writer, config_element_name, session_name);
 	if (ret) {
 		goto end;
 	}
 
-	ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled,
-			enabled);
+	ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled, enabled);
 	if (ret) {
 		goto end;
 	}
@@ -80,16 +77,16 @@ static int start_tracing(const char *arg_session_name)
 	int ret;
 	char *session_name;
 
-	if (arg_session_name == NULL) {
+	if (arg_session_name == nullptr) {
 		session_name = get_session_name();
 	} else {
 		session_name = strdup(arg_session_name);
-		if (session_name == NULL) {
+		if (session_name == nullptr) {
 			PERROR("Failed to copy session name");
 		}
 	}
 
-	if (session_name == NULL) {
+	if (session_name == nullptr) {
 		ret = CMD_ERROR;
 		goto error;
 	}
@@ -135,10 +132,10 @@ int cmd_start(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	static poptContext pc;
-	const char *arg_session_name = NULL;
-	const char *leftover = NULL;
+	const char *arg_session_name = nullptr;
+	const char *leftover = nullptr;
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -173,16 +170,14 @@ int cmd_start(int argc, const char **argv)
 		}
 
 		/* Open command element */
-		ret = mi_lttng_writer_command_open(writer,
-				mi_lttng_element_command_start);
+		ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_start);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
 		}
 
 		/* Open output element */
-		ret = mi_lttng_writer_open_element(writer,
-				mi_lttng_element_command_output);
+		ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
@@ -192,8 +187,7 @@ int cmd_start(int argc, const char **argv)
 		 * Open sessions element
 		 * For validation purpose
 		 */
-		ret = mi_lttng_writer_open_element(writer,
-			config_element_sessions);
+		ret = mi_lttng_writer_open_element(writer, config_element_sessions);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
@@ -215,8 +209,8 @@ int cmd_start(int argc, const char **argv)
 		}
 
 		/* Success ? */
-		ret = mi_lttng_writer_write_element_bool(writer,
-				mi_lttng_element_command_success, success);
+		ret = mi_lttng_writer_write_element_bool(
+			writer, mi_lttng_element_command_success, success);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;