Clean-up: harmonize popt option declarations in save.c

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

diff --git a/src/bin/lttng/commands/save.c b/src/bin/lttng/commands/save.c
index 43f10dc39131d821acc984e3d75aba777707f602..958d1afc5b819e2ab5b155ba970facd411a4f510 100644 (file)
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
@@ -32,6 +31,7 @@
 static char *opt_output_path;
 static int opt_force;
 static int opt_save_all;
+static struct mi_writer *writer;
 
 enum {
        OPT_HELP = 1,
@@ -42,30 +42,14 @@ enum {
 
 static struct poptOption save_opts[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-       {"help",        'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-       {"all",         'a', POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
-       {"output-path", 'o', POPT_ARG_STRING, &opt_output_path, 0, 0, 0},
-       {"force",       'f', POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
+       {"help",        'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
+       {"all",         'a', POPT_ARG_NONE, NULL, OPT_ALL, NULL, NULL},
+       {"output-path", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
+       {"force",       'f', POPT_ARG_NONE, NULL, OPT_FORCE, NULL, NULL},
        {"list-options",  0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
-static struct mi_writer *writer;
-
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-       fprintf(ofp, "usage: lttng save [OPTIONS] [SESSION]\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "Options:\n");
-       fprintf(ofp, "  -h, --help           Show this help\n");
-       fprintf(ofp, "  -a, --all            Save all sessions (default)\n");
-       fprintf(ofp, "  -o, --output-path    Output path of the session configuration(s)\n");
-       fprintf(ofp, "  -f, --force          Overwrite existing session configuration(s)\n");
-}
-
 static int mi_partial_session(const char *session_name)
 {
        int ret;
@@ -147,7 +131,7 @@ int cmd_save(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stdout);
+                       SHOW_HELP();
                        goto end;
                case OPT_ALL:
                        opt_save_all = 1;
@@ -159,7 +143,6 @@ int cmd_save(int argc, const char **argv)
                        list_cmd_options(stdout, save_opts);
                        goto end;
                default:
-                       usage(stderr);
                        ret = CMD_UNDEFINED;
                        goto end;
                }