ust: fix warnings

[ust.git] / ust / ust.c

diff --git a/ust/ust.c b/ust/ust.c
index 8752dbdf5f045fafcc4a39aed3b9890d861fbf18..d957cb3ac9068ec69db594936a02a1107adcb932 100644 (file)
--- a/ust/ust.c
+++ b/ust/ust.c
@@ -1,7 +1,8 @@
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include "ustcomm.h"
@@ -12,17 +13,33 @@ struct ust_opts {
        int take_reply;
 };
 
+char *progname = NULL;
+
+void usage(void)
+{
+       fprintf(stderr, "usage: %s [OPTIONS] COMMAND PID...\n", progname);
+       fprintf(stderr, "\nControl the tracing of a process that supports LTTng Userspace Tracing.\n\
+\n\
+Commands:\n\
+    --start-trace\t\t\tStart tracing\n\
+    --stop-trace\t\t\tStop tracing\n\
+    --destroy-trace\t\t\tDestroy the trace\n\
+    --enable-marker CHANNEL/MARKER\tEnable a marker\n\
+    --disable-marker CHANNEL/MARKER\tDisable a marker\n\
+    --list-markers\tList the markers of the process and their state\n\
+\n\
+");
+}
+
 int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 {
        int c;
-       int digit_optind = 0;
 
        opts->cmd = NULL;
        opts->pids = NULL;
        opts->take_reply = 0;
 
        while (1) {
-               int this_option_optind = optind ? optind : 1;
                int option_index = 0;
                static struct option long_options[] = {
                        {"start-trace", 0, 0, 1000},
@@ -99,24 +116,6 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
        return 0;
 }
 
-char *progname = NULL;
-
-void usage(void)
-{
-       fprintf(stderr, "usage: %s [OPTIONS] COMMAND PID...\n", progname);
-       fprintf(stderr, "\nControl the tracing of a process that supports LTTng Userspace Tracing.\n\
-\n\
-Commands:\n\
-    --start-trace\t\t\tStart tracing\n\
-    --stop-trace\t\t\tStop tracing\n\
-    --destroy-trace\t\t\tDestroy the trace\n\
-    --enable-marker CHANNEL/MARKER\tEnable a marker\n\
-    --disable-marker CHANNEL/MARKER\tDisable a marker\n\
-    --list-markers\tList the markers of the process and their state\n\
-\n\
-");
-}
-
 int main(int argc, char *argv[])
 {
        pid_t *pidit;