.gitignore: ignore local vscode workspace settings file

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

diff --git a/src/bin/lttng/commands/version.cpp b/src/bin/lttng/commands/version.cpp
index 2126e20b7959fe9fe0acaba86a0e8bf26d19a6f0..836e8f489d194c3de9e82a94d871d91d9f05e388 100644 (file)
--- a/src/bin/lttng/commands/version.cpp
+++ b/src/bin/lttng/commands/version.cpp
@@ -6,6 +6,11 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+#include "version.hpp"
+
+#include <common/mi-lttng.hpp>
+
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,15 +19,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/mi-lttng.h>
-
-#include "../command.h"
-#include "version.h"
-
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-version.1.h>
-;
+       ;
 #endif
 
 enum {
@@ -34,9 +34,9 @@ static const char *lttng_license = "lttng is free software and under the GPL lic
 
 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 }
 };
 
 /*
@@ -56,10 +56,10 @@ static void create_version(struct mi_lttng_version_data *version)
 /*
  * Print the machine interface output of this command.
  */
-static int print_mi(void)
+static int print_mi()
 {
        int ret = CMD_SUCCESS;
-       struct mi_writer *writer = NULL;
+       struct mi_writer *writer = nullptr;
        struct mi_lttng_version_data version;
 
        create_version(&version);
@@ -71,24 +71,21 @@ static int print_mi(void)
        }
 
        /* Open the command element */
-       ret = mi_lttng_writer_command_open(writer,
-                       mi_lttng_element_command_version);
+       ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_version);
        if (ret) {
                ret = CMD_ERROR;
                goto error;
        }
 
        /* Beginning of output */
-       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 error;
        }
 
        /* Print the machine interface of version */
-       ret = mi_lttng_version(writer, &version,
-                       VERSION_DESCRIPTION, lttng_license);
+       ret = mi_lttng_version(writer, &version, VERSION_DESCRIPTION, lttng_license);
        if (ret) {
                ret = CMD_ERROR;
                goto error;
@@ -126,7 +123,7 @@ int cmd_version(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) {
@@ -147,7 +144,7 @@ int cmd_version(int argc, const char **argv)
                ret = print_mi();
        } else {
                MSG("lttng version " VERSION " - " VERSION_NAME "%s",
-                       GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+                   GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
                MSG("\n" VERSION_DESCRIPTION "\n");
                MSG("Web site: https://lttng.org");
                MSG("\n%s", lttng_license);