From 5a7cef0202631204485cbcb1e36671e4321a936f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 25 Mar 2017 21:25:44 +0100
Subject: rename GNUNET_GETOPT functions to achieve better consistency

---
 src/transport/gnunet-transport-profiler.c | 14 +++++++-------
 src/transport/gnunet-transport.c          | 22 +++++++++++-----------
 src/transport/tcp_service_legacy.c        | 12 ++++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/transport')

diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c
index 9292c42d4..d580fce08 100644
--- a/src/transport/gnunet-transport-profiler.c
+++ b/src/transport/gnunet-transport-profiler.c
@@ -612,35 +612,35 @@ main (int argc, char * const *argv)
 
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('s',
+    GNUNET_GETOPT_option_flag ('s',
                                   "send",
                                   gettext_noop ("send data to peer"),
                                   &benchmark_send),
-    GNUNET_GETOPT_OPTION_SET_ONE ('r',
+    GNUNET_GETOPT_option_flag ('r',
                                   "receive",
                                   gettext_noop ("receive data from peer"),
                                   &benchmark_receive),
-    GNUNET_GETOPT_OPTION_SET_UINT ('i',
+    GNUNET_GETOPT_option_uint ('i',
                                    "iterations",
                                    NULL,
                                    gettext_noop ("iterations"),
                                    &benchmark_iterations),
-    GNUNET_GETOPT_OPTION_SET_UINT ('n',
+    GNUNET_GETOPT_option_uint ('n',
                                    "number",
                                    NULL,
                                    gettext_noop ("number of messages to send"),
                                    &benchmark_count),
-    GNUNET_GETOPT_OPTION_SET_UINT ('m',
+    GNUNET_GETOPT_option_uint ('m',
                                    "messagesize",
                                    NULL,
                                    gettext_noop ("message size to use"),
                                    &benchmark_size),
-    GNUNET_GETOPT_OPTION_STRING ('p',
+    GNUNET_GETOPT_option_string ('p',
                                  "peer",
                                  "PEER",
                                  gettext_noop ("peer identity"),
                                  &cpid),
-    GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
+    GNUNET_GETOPT_option_verbose (&verbosity),
     GNUNET_GETOPT_OPTION_END
   };
 
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 8624b09b4..96d0a6a3a 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -1428,49 +1428,49 @@ main (int argc,
 {
   int res;
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_SET_ONE ('a',
+    GNUNET_GETOPT_option_flag ('a',
                                   "all",
                                   gettext_noop ("print information for all peers (instead of only connected peers)"),
                                   &iterate_all),
-    GNUNET_GETOPT_OPTION_SET_ONE ('b',
+    GNUNET_GETOPT_option_flag ('b',
                                   "benchmark",
                                   gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"),
                                   &benchmark_receive),
-    GNUNET_GETOPT_OPTION_SET_ONE ('D',
+    GNUNET_GETOPT_option_flag ('D',
                                   "disconnect",
                                   gettext_noop ("disconnect from a peer"),
                                   &do_disconnect),
-    GNUNET_GETOPT_OPTION_SET_ONE ('i',
+    GNUNET_GETOPT_option_flag ('i',
                                   "information",
                                   gettext_noop ("provide information about all current connections (once)"),
                                   &iterate_connections),
-    GNUNET_GETOPT_OPTION_SET_ONE ('m',
+    GNUNET_GETOPT_option_flag ('m',
                                   "monitor",
                                   gettext_noop ("provide information about all current connections (continuously)"),
                                   &monitor_connections),
-    GNUNET_GETOPT_OPTION_SET_ONE ('e',
+    GNUNET_GETOPT_option_flag ('e',
                                   "events",
                                   gettext_noop ("provide information about all connects and disconnect events (continuously)"),
                                   &monitor_connects),
-    GNUNET_GETOPT_OPTION_SET_ONE ('n',
+    GNUNET_GETOPT_option_flag ('n',
                                   "numeric",
                                   gettext_noop ("do not resolve hostnames"),
                                   &numeric),
-    GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('p',
+    GNUNET_GETOPT_option_base32_auto ('p',
                                           "peer",
                                           "PEER",
                                           gettext_noop ("peer identity"),
                                           &pid),
-    GNUNET_GETOPT_OPTION_SET_ONE ('P',
+    GNUNET_GETOPT_option_flag ('P',
                                   "plugins",
                                   gettext_noop ("monitor plugin sessions"),
                                   &monitor_plugins),
-    GNUNET_GETOPT_OPTION_SET_ONE ('s',
+    GNUNET_GETOPT_option_flag ('s',
                                   "send",
                                   gettext_noop
       ("send data for benchmarking to the other peer (until CTRL-C)"),
                                   &benchmark_send),
-    GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
+    GNUNET_GETOPT_option_verbose (&verbosity),
     GNUNET_GETOPT_OPTION_END
   };
 
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index 7c2d3e55a..1f1f6c063 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -1392,15 +1392,15 @@ LEGACY_SERVICE_run (int argc, char *const *argv,
   const char *xdg;
 
   struct GNUNET_GETOPT_CommandLineOption service_options[] = {
-    GNUNET_GETOPT_OPTION_CFG_FILE (&opt_cfg_fn),
-    GNUNET_GETOPT_OPTION_SET_ONE ('d',
+    GNUNET_GETOPT_option_cfgfile (&opt_cfg_fn),
+    GNUNET_GETOPT_option_flag ('d',
                                   "daemonize",
                                   gettext_noop ("do daemonize (detach from terminal)"),
                                   &do_daemonize),
-    GNUNET_GETOPT_OPTION_HELP (NULL),
-    GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
-    GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
-    GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION),
+    GNUNET_GETOPT_option_help (NULL),
+    GNUNET_GETOPT_option_loglevel (&loglev),
+    GNUNET_GETOPT_option_logfile (&logfile),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
   err = 1;
-- 
cgit v1.2.3