X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstatus.cpp;h=23e8c03d390bc8fa2007cd82e7e271ec5bcda810;hb=HEAD;hp=a77830ece028d002ba0cf97ac30019ff585d7267;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/status.cpp b/src/bin/lttng/commands/status.cpp
index a77830ece..82a26c5b2 100644
--- a/src/bin/lttng/commands/status.cpp
+++ b/src/bin/lttng/commands/status.cpp
@@ -6,6 +6,10 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+#include "../utils.hpp"
+
+#include <config.h>
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,14 +18,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../command.hpp"
-#include "../utils.hpp"
-#include <config.h>
-
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-status.1.h>
-;
+	;
 #endif
 
 enum {
@@ -31,16 +31,16 @@ enum {
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",        'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
-	{"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 status(void)
+static int status()
 {
 	const char *argv[2];
 	int ret = CMD_SUCCESS;
-	char *session_name = NULL;
+	char *session_name = nullptr;
 
 	session_name = get_session_name();
 	if (!session_name) {
@@ -64,7 +64,7 @@ int cmd_status(int argc, const char **argv)
 	int opt, ret = CMD_SUCCESS;
 	static poptContext pc;
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -81,7 +81,7 @@ int cmd_status(int argc, const char **argv)
 		}
 	}
 
-	if (poptPeekArg(pc) != NULL) {
+	if (poptPeekArg(pc) != nullptr) {
 		ERR("This command does not accept positional arguments.\n");
 		ret = CMD_UNDEFINED;
 		goto end;