statistics-cli: rename csv-parameter, update manpage

diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index eed1c1de849b58996bbbcf48f940caebd4e9e44c..2aa889382cf8458556e1416177a28932f8d8ad61 100644 (file)
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -41,6 +41,9 @@ non\-persistent.
 Statistics are kept for various subsystems.  With this option, the
 output can be restricted to a particular subsystem only.
 .B
+.IP "\-S SEPARATOR,  \-\-csv-separator=SEPARATOR"
+Specify a separator for generating csv-output.
+.B
 .IP "\-t TESTBED_PATH,  \-\-subsystem=TESTBED_PATH"
 When running testbed, you can get statistics of all peers with specefying the
 folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /tmp/testbedARtmQv\fP.

diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index 81563a134147e372f30cd0d242531dffde12e089..9093336e133c5836e4d6f00c91c5ea1c3a21b779 100644 (file)
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -787,12 +787,6 @@ int
 main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string ('d',
-                                 "csv-separator",
-                                 "CSV_SEPARATOR",
-                                 gettext_noop ("use as csv separator"),
-                                 &csv_separator),
-
     GNUNET_GETOPT_option_string ('n',
                                  "name",
                                  "NAME",
@@ -810,6 +804,12 @@ main (int argc, char *const *argv)
                                  gettext_noop ("limit output to the given SUBSYSTEM"),
                                  &subsystem),
 
+    GNUNET_GETOPT_option_string ('S',
+                                 "csv-separator",
+                                 "CSV_SEPARATOR",
+                                 gettext_noop ("use as csv separator"),
+                                 &csv_separator),
+
     GNUNET_GETOPT_option_filename ('t',
                                   "testbed",
                                   "TESTBED",