X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fmetadata.c;h=e702c5ebaca50b6ee2f71e60b498ff57d714c352;hb=83d6d6c4496e692df39843142cb8cf96279eaa20;hp=4f248d44c0e3a948da256e09977b4772ca0b4d0d;hpb=fb288d1e46a63d47d3be2be8322e1b8c48ba36a1;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/metadata.c b/src/bin/lttng/commands/metadata.c
index 4f248d44c..e702c5eba 100644
--- a/src/bin/lttng/commands/metadata.c
+++ b/src/bin/lttng/commands/metadata.c
@@ -33,6 +33,12 @@ static char *session_name = NULL;
 
 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 {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
@@ -76,12 +82,14 @@ static int metadata_regenerate(int argc, const char **argv)
 	int ret;
 
 	if (argc > 1) {
-		ret = -LTTNG_ERR_INVALID;
+		ret = CMD_UNDEFINED;
 		goto end;
 	}
-	ret = lttng_metadata_regenerate(session_name);
+	ret = lttng_regenerate_metadata(session_name);
 	if (ret == 0) {
 		MSG("Metadata successfully regenerated for session %s", session_name);
+	} else {
+		ERR("%s", lttng_strerror(ret));
 	}
 
 end:
@@ -94,12 +102,13 @@ static int handle_command(const char **argv)
 	int ret = CMD_SUCCESS, i = 0, argc, command_ret = CMD_SUCCESS;
 
 	if (argv == NULL) {
-		SHOW_HELP();
-		command_ret = CMD_ERROR;
+		ERR("No action specified for metadata command.");
+		ret = CMD_ERROR;
 		goto end;
 	}
 
 	argc = count_arguments(argv);
+	assert(argc >= 1);
 
 	cmd = &actions[i];
 	while (cmd->func != NULL) {
@@ -215,12 +224,7 @@ int cmd_metadata(int argc, const char **argv)
 
 	command_ret = handle_command(poptGetArgs(pc));
 	if (command_ret) {
-		switch (-command_ret) {
-		default:
-			ERR("%s", lttng_strerror(command_ret));
-			success = 0;
-			break;
-		}
+		success = 0;
 	}
 
 	if (lttng_opt_mi) {