*/
#define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+
#include <ctype.h>
#include <popt.h>
#include <stdio.h>
#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);
#ifdef LTTNG_EMBED_HELP
static const char help_msg[] =
#include <lttng-regenerate.1.h>
-;
+ ;
#endif
enum {
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 */
};
/*
LTTNG_ASSERT(argv);
- while (argv[i] != NULL) {
+ while (argv[i] != nullptr) {
i++;
}
return i;
}
-static int regenerate_metadata(int argc, const char **argv)
+static int regenerate_metadata(int argc, const char **argv __attribute__((unused)))
{
int ret;
return ret;
}
-static int regenerate_statedump(int argc, const char **argv)
+static int regenerate_statedump(int argc, const char **argv __attribute__((unused)))
{
int ret;
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;
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;
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) {
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;
if (!opt_session_name) {
session_name = get_session_name();
- if (session_name == NULL) {
+ if (session_name == nullptr) {
ret = CMD_ERROR;
goto end;
}
}
/* 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;