Backport: Use EXTRA_VERSION_NAME and EXTRA_VERSION_DESCRIPTION

[lttng-tools.git] / src / bin / lttng / lttng.c

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 9317e83dc5873d84a3c107d64ca5d6b9de228f1f..dcbffeb74c438e5b8a725a798c3e972506e4b856 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -66,7 +66,6 @@ static struct option long_options[] = {
 /* First level command */
 static struct cmd_struct commands[] =  {
        { "add-context", cmd_add_context},
-       { "calibrate", cmd_calibrate},
        { "create", cmd_create},
        { "destroy", cmd_destroy},
        { "disable-channel", cmd_disable_channels},
@@ -94,9 +93,10 @@ static struct cmd_struct commands[] =  {
 
 static void version(FILE *ofp)
 {
-       fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+       fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s%s\n",
                        progname,
-                       GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+                       GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+                       EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -254,7 +254,7 @@ static void show_basic_help(void)
        puts("  create            " CONFIG_CMD_DESCR_CREATE);
        puts("  destroy           " CONFIG_CMD_DESCR_DESTROY);
        puts("  load              " CONFIG_CMD_DESCR_LOAD);
-       puts("  metadata          " CONFIG_CMD_DESCR_METADATA);
+       puts("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
        puts("  save              " CONFIG_CMD_DESCR_SAVE);
        puts("  set-session       " CONFIG_CMD_DESCR_SET_SESSION);
        puts("");
@@ -281,7 +281,6 @@ static void show_basic_help(void)
        puts("  untrack           " CONFIG_CMD_DESCR_UNTRACK);
        puts("");
        puts("Miscellaneous:");
-       puts("  calibrate         " CONFIG_CMD_DESCR_CALIBRATE);
        puts("  help              " CONFIG_CMD_DESCR_HELP);
        puts("  version           " CONFIG_CMD_DESCR_VERSION);
        puts("  view              " CONFIG_CMD_DESCR_VIEW);
@@ -300,7 +299,6 @@ static void show_basic_help(void)
 static int parse_args(int argc, char **argv)
 {
        int opt, ret;
-       char *user;
 
        if (lttng_is_setuid_setgid()) {
                ERR("'%s' is not allowed to be executed as a setuid/setgid binary for security reasons. Aborting.", argv[0]);