Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / arm / gnunet-arm.c

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 78c78738a1d5d3b2c65dc713bf70acff159b59fa..4c30985b1a6c04367bff1cac65446fc51d5b5c21 100644 (file)
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -764,64 +764,64 @@ main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('e',
+    GNUNET_GETOPT_option_flag ('e',
                                   "end",
                                   gettext_noop ("stop all GNUnet services"),
                                   &end),
 
-    GNUNET_GETOPT_OPTION_STRING ('i',
+    GNUNET_GETOPT_option_string ('i',
                                  "init",
                                  "SERVICE",
                                  gettext_noop ("start a particular service"),
                                  &init),
 
-    GNUNET_GETOPT_OPTION_STRING ('k',
+    GNUNET_GETOPT_option_string ('k',
                                  "kill",
                                  "SERVICE",
                                  gettext_noop ("stop a particular service"),
                                  &term),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('s',
+    GNUNET_GETOPT_option_flag ('s',
                                   "start",
                                   gettext_noop ("start all GNUnet default services"),
                                   &start),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('r',
+    GNUNET_GETOPT_option_flag ('r',
                                   "restart",
                                   gettext_noop ("stop and start all GNUnet default services"),
                                   &restart),
-    GNUNET_GETOPT_OPTION_SET_ONE ('d',
+    GNUNET_GETOPT_option_flag ('d',
                                   "delete",
                                   gettext_noop ("delete config file and directory on exit"),
                                   &delete),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('m',
+    GNUNET_GETOPT_option_flag ('m',
                                   "monitor",
                                   gettext_noop ("monitor ARM activities"),
                                   &monitor),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('q',
+    GNUNET_GETOPT_option_flag ('q',
                                   "quiet",
                                   gettext_noop ("don't print status messages"),
                                   &quiet),
 
-    GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('T',
+    GNUNET_GETOPT_option_relative_time ('T',
                                             "timeout",
                                             "DELAY",
                                             gettext_noop ("exit with error status if operation does not finish after DELAY"),
                                             &timeout),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('I',
+    GNUNET_GETOPT_option_flag ('I',
                                   "info",
                                   gettext_noop ("list currently running services"),
                                   &list), 
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('O',
+    GNUNET_GETOPT_option_flag ('O',
                                   "no-stdout",
                                   gettext_noop ("don't let gnunet-service-arm inherit standard output"),
                                   &no_stdout),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('E',
+    GNUNET_GETOPT_option_flag ('E',
                                   "no-stderr",
                                   gettext_noop ("don't let gnunet-service-arm inherit standard error"),
                                   &no_stderr),