rename GNUNET_GETOPT functions to achieve better consistency

2 files changed, 14 insertions, 14 deletions

diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c
index ac86a900d..70fafa1e1 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -246,31 +246,31 @@ main (int argc, char **argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('A',
+    GNUNET_GETOPT_option_uint ('A',
                                    "asize",
                                    NULL,
                                    gettext_noop ("number of element in set A-B"),
                                    &asize),
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('B',
+    GNUNET_GETOPT_option_uint ('B',
                                    "bsize",
                                    NULL,
                                    gettext_noop ("number of element in set B-A"),
                                    &bsize),
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('C',
+    GNUNET_GETOPT_option_uint ('C',
                                    "csize",
                                    NULL,
                                    gettext_noop ("number of common elements in A and B"),
                                    &csize),
     
-    GNUNET_GETOPT_OPTION_SET_UINT ('k',
+    GNUNET_GETOPT_option_uint ('k',
                                    "hash-num",
                                    NULL,
                                    gettext_noop ("hash num"),
                                    &hash_num),
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('s',
+    GNUNET_GETOPT_option_uint ('s',
                                    "ibf-size",
                                    NULL,
                                    gettext_noop ("ibf size"),
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 349bce6ea..68f7be690 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -427,54 +427,54 @@ int
 main (int argc, char **argv)
 {
    struct GNUNET_GETOPT_CommandLineOption options[] = {
-      GNUNET_GETOPT_OPTION_SET_UINT ('A',
+      GNUNET_GETOPT_option_uint ('A',
                                      "num-first",
                                      NULL,
                                      gettext_noop ("number of values"),
                                      &num_a),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('B',
+      GNUNET_GETOPT_option_uint ('B',
                                      "num-second",
                                      NULL,
                                      gettext_noop ("number of values"),
                                      &num_b),
 
-      GNUNET_GETOPT_OPTION_SET_ONE ('b',
+      GNUNET_GETOPT_option_flag ('b',
                                     "byzantine",
                                     gettext_noop ("use byzantine mode"),
                                     &byzantine),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('f',
+      GNUNET_GETOPT_option_uint ('f',
                                      "force-full",
                                      NULL,
                                      gettext_noop ("force sending full set"),
                                      &force_full),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('d',
+      GNUNET_GETOPT_option_uint ('d',
                                      "force-delta",
                                      NULL,
                                      gettext_noop ("number delta operation"),
                                      &force_delta),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('C',
+      GNUNET_GETOPT_option_uint ('C',
                                      "num-common",
                                      NULL,
                                      gettext_noop ("number of values"),
                                      &num_c),
 
-      GNUNET_GETOPT_OPTION_STRING ('x',
+      GNUNET_GETOPT_option_string ('x',
                                    "operation",
                                    NULL,
                                    gettext_noop ("operation to execute"),
                                    &op_str),
 
-      GNUNET_GETOPT_OPTION_SET_UINT ('w',
+      GNUNET_GETOPT_option_uint ('w',
                                      "element-size",
                                      NULL,
                                      gettext_noop ("element size"),
                                      &element_size),
 
-      GNUNET_GETOPT_OPTION_FILENAME ('s',
+      GNUNET_GETOPT_option_filename ('s',
                                      "statistics",
                                      "FILENAME",
                                      gettext_noop ("write statistics to file"),