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 fe051966cdc6a568046b477a223b113d0bbaac19..958d1afc5b819e2ab5b155ba970facd411a4f510 100644 (file)
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -31,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,
@@ -41,16 +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;
-
 static int mi_partial_session(const char *session_name)
 {
        int ret;