X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fmetadata.cpp;fp=src%2Fbin%2Flttng%2Fcommands%2Fmetadata.cpp;h=d9b86f2ffef47cecca1bf08ab53a6292afcdbbf9;hp=9dd702ec30cae3b14c90e5a5e0849dd134f9bc82;hb=cd9adb8b829564212158943a0d279bb35322ab30;hpb=e665dfbce25215d5ec77ff03a279c7163b337db1

diff --git a/src/bin/lttng/commands/metadata.cpp b/src/bin/lttng/commands/metadata.cpp
index 9dd702ec3..d9b86f2ff 100644
--- a/src/bin/lttng/commands/metadata.cpp
+++ b/src/bin/lttng/commands/metadata.cpp
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 static char *opt_session_name;
-static char *session_name = NULL;
+static char *session_name = nullptr;
 
 static int metadata_regenerate(int argc, const char **argv);
 
@@ -42,35 +42,35 @@ static struct poptOption long_options[] = {
 		"help",
 		'h',
 		POPT_ARG_NONE,
-		0,
+		nullptr,
 		OPT_HELP,
-		0,
-		0,
+		nullptr,
+		nullptr,
 	},
-	{ "session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0 },
+	{ "session", 's', POPT_ARG_STRING, &opt_session_name, 0, nullptr, nullptr },
 	{
 		"list-options",
 		0,
 		POPT_ARG_NONE,
-		NULL,
+		nullptr,
 		OPT_LIST_OPTIONS,
-		0,
-		0,
+		nullptr,
+		nullptr,
 	},
-	{ "list-commands", 0, POPT_ARG_NONE, NULL, OPT_LIST_COMMANDS, NULL, NULL },
+	{ "list-commands", 0, POPT_ARG_NONE, nullptr, OPT_LIST_COMMANDS, nullptr, nullptr },
 	{
+		nullptr,
 		0,
 		0,
+		nullptr,
 		0,
-		0,
-		0,
-		0,
-		0,
+		nullptr,
+		nullptr,
 	},
 };
 
 static struct cmd_struct actions[] = {
-	{ "regenerate", metadata_regenerate }, { NULL, NULL } /* Array closure */
+	{ "regenerate", metadata_regenerate }, { nullptr, nullptr } /* Array closure */
 };
 
 /*
@@ -82,7 +82,7 @@ static int count_arguments(const char **argv)
 
 	LTTNG_ASSERT(argv);
 
-	while (argv[i] != NULL) {
+	while (argv[i] != nullptr) {
 		i++;
 	}
 
@@ -113,7 +113,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 action specified for metadata command.");
 		ret = CMD_ERROR;
 		goto end;
@@ -123,7 +123,7 @@ 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) {
@@ -180,7 +180,7 @@ int cmd_metadata(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) {
@@ -224,7 +224,7 @@ int cmd_metadata(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;
 		}