X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fregenerate.cpp;h=fb415739387ab08a72466341527a10109cc02093;hb=HEAD;hp=4ceb55424073cb10aa70f6714c76ab693627bfb0;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/regenerate.cpp b/src/bin/lttng/commands/regenerate.cpp
index 4ceb55424..fb4157393 100644
--- a/src/bin/lttng/commands/regenerate.cpp
+++ b/src/bin/lttng/commands/regenerate.cpp
@@ -6,6 +6,10 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+
 #include <ctype.h>
 #include <popt.h>
 #include <stdio.h>
@@ -13,12 +17,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/mi-lttng.h>
-
-#include "../command.h"
-
 static char *opt_session_name;
-static char *session_name = NULL;
+static char *session_name = nullptr;
 
 static int regenerate_metadata(int argc, const char **argv);
 static int regenerate_statedump(int argc, const char **argv);
@@ -26,7 +26,7 @@ static int regenerate_statedump(int argc, const char **argv);
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-regenerate.1.h>
-;
+	;
 #endif
 
 enum {
@@ -39,17 +39,41 @@ static struct mi_writer *writer;
 
 static struct poptOption long_options[] = {
 	/* { longName, shortName, argInfo, argPtr, value, descrip, argDesc, } */
-	{ "help",		'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0, },
-	{ "session",		's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
-	{ "list-options",	0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, 0, 0, },
-	{ "list-commands",  	0, POPT_ARG_NONE, NULL, OPT_LIST_COMMANDS},
-	{ 0, 0, 0, 0, 0, 0, 0, },
+	{
+		"help",
+		'h',
+		POPT_ARG_NONE,
+		nullptr,
+		OPT_HELP,
+		nullptr,
+		nullptr,
+	},
+	{ "session", 's', POPT_ARG_STRING, &opt_session_name, 0, nullptr, nullptr },
+	{
+		"list-options",
+		0,
+		POPT_ARG_NONE,
+		nullptr,
+		OPT_LIST_OPTIONS,
+		nullptr,
+		nullptr,
+	},
+	{ "list-commands", 0, POPT_ARG_NONE, nullptr, OPT_LIST_COMMANDS, nullptr, nullptr },
+	{
+		nullptr,
+		0,
+		0,
+		nullptr,
+		0,
+		nullptr,
+		nullptr,
+	},
 };
 
 static struct cmd_struct actions[] = {
 	{ "metadata", regenerate_metadata },
 	{ "statedump", regenerate_statedump },
-	{ NULL, NULL }	/* Array closure */
+	{ nullptr, nullptr } /* Array closure */
 };
 
 /*
@@ -61,15 +85,14 @@ static int count_arguments(const char **argv)
 
 	LTTNG_ASSERT(argv);
 
-	while (argv[i] != NULL) {
+	while (argv[i] != nullptr) {
 		i++;
 	}
 
 	return i;
 }
 
-static int regenerate_metadata(int argc,
-		const char **argv __attribute__((unused)))
+static int regenerate_metadata(int argc, const char **argv __attribute__((unused)))
 {
 	int ret;
 
@@ -88,8 +111,7 @@ end:
 	return ret;
 }
 
-static int regenerate_statedump(int argc,
-		const char **argv __attribute__((unused)))
+static int regenerate_statedump(int argc, const char **argv __attribute__((unused)))
 {
 	int ret;
 
@@ -111,7 +133,7 @@ static int handle_command(const char **argv)
 	struct cmd_struct *cmd;
 	int ret = CMD_SUCCESS, i = 0, argc, command_ret = CMD_SUCCESS;
 
-	if (argv == NULL) {
+	if (argv == nullptr) {
 		ERR("No object specified for regenerate command.");
 		command_ret = CMD_ERROR;
 		goto end;
@@ -121,21 +143,21 @@ static int handle_command(const char **argv)
 	LTTNG_ASSERT(argc >= 1);
 
 	cmd = &actions[i];
-	while (cmd->func != NULL) {
+	while (cmd->func != nullptr) {
 		/* Find command */
 		if (strcmp(argv[0], cmd->name) == 0) {
 			if (lttng_opt_mi) {
 				/* Action element */
-				ret = mi_lttng_writer_open_element(writer,
-						mi_lttng_element_command_regenerate_action);
+				ret = mi_lttng_writer_open_element(
+					writer, mi_lttng_element_command_regenerate_action);
 				if (ret) {
 					ret = CMD_ERROR;
 					goto end;
 				}
 
 				/* Name of the action */
-				ret = mi_lttng_writer_write_element_string(writer,
-						config_element_name, argv[0]);
+				ret = mi_lttng_writer_write_element_string(
+					writer, config_element_name, argv[0]);
 				if (ret) {
 					ret = CMD_ERROR;
 					goto end;
@@ -178,7 +200,7 @@ int cmd_regenerate(int argc, const char **argv)
 		goto end;
 	}
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	if (lttng_opt_mi) {
@@ -188,16 +210,14 @@ int cmd_regenerate(int argc, const char **argv)
 			goto end;
 		}
 		/* Open command element */
-		ret = mi_lttng_writer_command_open(writer,
-				mi_lttng_element_command_regenerate);
+		ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_regenerate);
 		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;
@@ -224,7 +244,7 @@ int cmd_regenerate(int argc, const char **argv)
 
 	if (!opt_session_name) {
 		session_name = get_session_name();
-		if (session_name == NULL) {
+		if (session_name == nullptr) {
 			ret = CMD_ERROR;
 			goto end;
 		}
@@ -246,8 +266,8 @@ int cmd_regenerate(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;