rename GNUNET_GETOPT functions to achieve better consistency

2 files changed, 13 insertions, 13 deletions

diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index 597285f5e..5af2fbce3 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -3289,29 +3289,29 @@ main (int argc, char *argv[])
 
   static struct GNUNET_GETOPT_CommandLineOption options[] =
   {
-    GNUNET_GETOPT_OPTION_STRING ('s',
+    GNUNET_GETOPT_option_string ('s',
                                  "solver",
                                  gettext_noop ("solver to use"),
                                  &opt_solver),
 
-    GNUNET_GETOPT_OPTION_STRING ('e',
+    GNUNET_GETOPT_option_string ('e',
                                  "experiment"
                                  gettext_noop ("experiment to use"),
                                  &opt_exp_file),
 
-    GNUNET_GETOPT_OPTION_VERBOSE (&opt_verbose),
+    GNUNET_GETOPT_option_verbose (&opt_verbose),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('p', 
+    GNUNET_GETOPT_option_flag ('p', 
                                   "print",
                                   gettext_noop ("print logging"),
                                   &opt_print),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('f',
+    GNUNET_GETOPT_option_flag ('f',
                                   "file",
                                   gettext_noop ("save logging to disk"),
                                   &opt_save),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('d', 
+    GNUNET_GETOPT_option_flag ('d', 
                                   "dn",
                                   gettext_noop ("disable normalization"),
                                   &opt_disable_normalization),
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 855899b36..7fae3624f 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -1405,37 +1405,37 @@ main (int argc, char *argv[])
 
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('a',
+      GNUNET_GETOPT_option_uint ('a',
                                      "addresses",
                                      gettext_noop ("addresses to use"),
                                      &ph.N_address),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('s',
+      GNUNET_GETOPT_option_uint ('s',
                                      "start",
                                      gettext_noop ("start with peer"),
                                      &ph.N_peers_start),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('e',
+      GNUNET_GETOPT_option_uint ('e',
                                      "end",
                                      gettext_noop ("end with peer"),
                                      &ph.N_peers_end),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('i',
+      GNUNET_GETOPT_option_uint ('i',
                                      "iterations",
                                      gettext_noop ("number of iterations used for averaging (default: 1)"),
                                      &ph.total_iterations),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('p',
+      GNUNET_GETOPT_option_uint ('p',
                                      "percentage",
                                      gettext_noop ("update a fix percentage of addresses"),
                                      &ph.opt_update_percent),
 
-      GNUNET_GETOPT_OPTION_SET_ONE ('d',
+      GNUNET_GETOPT_option_flag ('d',
                                     "data",
                                     gettext_noop ("create data file"),
                                     &ph.create_datafile),
 
-      GNUNET_GETOPT_OPTION_SET_ONE ('u',
+      GNUNET_GETOPT_option_flag ('u',
                                     "update",
                                     gettext_noop ("measure updates"),
                                     &ph.measure_updates),