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=9dd702ec30cae3b14c90e5a5e0849dd134f9bc82;hp=38e99b4a408a2891298c729c6f28319732bdcd1b;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d

diff --git a/src/bin/lttng/commands/metadata.cpp b/src/bin/lttng/commands/metadata.cpp
index 38e99b4a4..9dd702ec3 100644
--- 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,10 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/mi-lttng.hpp>
-
-#include "../command.hpp"
-
 static char *opt_session_name;
 static char *session_name = NULL;
 
@@ -25,7 +25,7 @@ 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,
+		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,
+	},
 };
 
 static struct cmd_struct actions[] = {
-	{ "regenerate", metadata_regenerate },
-	{ NULL, NULL }	/* Array closure */
+	{ "regenerate", metadata_regenerate }, { NULL, NULL } /* Array closure */
 };
 
 /*
@@ -66,8 +89,7 @@ static int count_arguments(const char **argv)
 	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;
 
@@ -106,16 +128,16 @@ static int handle_command(const char **argv)
 		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;
@@ -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;
@@ -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;