clang-tidy: add Chrome-inspired checks

[lttng-tools.git] / src / bin / lttng / commands / metadata.cpp

diff --git a/src/bin/lttng/commands/metadata.cpp b/src/bin/lttng/commands/metadata.cpp
index 38e99b4a408a2891298c729c6f28319732bdcd1b..d9b86f2ffef47cecca1bf08ab53a6292afcdbbf9 100644 (file)
--- a/src/bin/lttng/commands/metadata.cpp
+++ b/src/bin/lttng/commands/metadata.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,19 +17,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/mi-lttng.hpp>
-
-#include "../command.hpp"
-
 static char *opt_session_name;
-static char *session_name = NULL;
+static char *session_name = nullptr;
 
 static int metadata_regenerate(int argc, const char **argv);
 
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-metadata.1.h>
-;
+       ;
 #endif
 
 enum {
@@ -38,16 +38,39 @@ 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, NULL, NULL},
-       { 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[] = {
-       { "regenerate", metadata_regenerate },
-       { NULL, NULL }  /* Array closure */
+       { "regenerate", metadata_regenerate }, { nullptr, nullptr } /* Array closure */
 };
 
 /*
@@ -59,15 +82,14 @@ static int count_arguments(const char **argv)
 
        LTTNG_ASSERT(argv);
 
-       while (argv[i] != NULL) {
+       while (argv[i] != nullptr) {
                i++;
        }
 
        return i;
 }
 
-static int metadata_regenerate(int argc,
-               const char **argv __attribute__((unused)))
+static int metadata_regenerate(int argc, const char **argv __attribute__((unused)))
 {
        int ret;
 
@@ -91,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;
@@ -101,21 +123,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_metadata_action);
+                               ret = mi_lttng_writer_open_element(
+                                       writer, mi_lttng_element_command_metadata_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;
@@ -158,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) {
@@ -168,16 +190,14 @@ int cmd_metadata(int argc, const char **argv)
                        goto end;
                }
                /* Open command element */
-               ret = mi_lttng_writer_command_open(writer,
-                               mi_lttng_element_command_metadata);
+               ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_metadata);
                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;
@@ -204,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;
                }
@@ -226,8 +246,8 @@ int cmd_metadata(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;