4 files changed, 14 insertions, 14 deletions

diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c
index fb7ac10c1..0746d5c57 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/gns/gnunet-bcd.c
@@ -516,7 +516,7 @@ main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('p',
+    GNUNET_GETOPT_option_uint ('p',
                                    "port",
                                    "PORT",
                                    gettext_noop ("Run HTTP serve on port PORT (default is 8888)"),
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index c9b4bde9c..424677d14 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -778,31 +778,31 @@ main (int argc,
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_STRING ('d',
+    GNUNET_GETOPT_option_string ('d',
                                  "dns",
                                  "IP",
                                  gettext_noop ("IP of recursive DNS resolver to use (required)"),
                                  &dns_ip),
 
-    GNUNET_GETOPT_OPTION_STRING ('f',
+    GNUNET_GETOPT_option_string ('f',
                                  "fcfs",
                                  "NAME",
                                  gettext_noop ("Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"),
                                  &fcfs_suffix),
 
-    GNUNET_GETOPT_OPTION_STRING ('s',
+    GNUNET_GETOPT_option_string ('s',
                                  "suffix",
                                  "SUFFIX",
                                  gettext_noop ("Authoritative DNS suffix to use (optional); default: zkey.eu"),
                                  &dns_suffix),
 
-    GNUNET_GETOPT_OPTION_SET_UINT ('p',
+    GNUNET_GETOPT_option_uint ('p',
                                    "port",
                                    "UDPPORT",
                                    gettext_noop ("UDP port to listen on for inbound DNS requests; default: 2853"),
                                    &listen_port),
 
-    GNUNET_GETOPT_OPTION_STRING ('z',
+    GNUNET_GETOPT_option_string ('z',
                                  "zone",
                                  "PUBLICKEY",
                                  gettext_noop ("Public key of the GNS zone to use (overrides default)"),
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 35f42cdec..2a6de1c30 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -3263,13 +3263,13 @@ main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_ULONG ('p',
+    GNUNET_GETOPT_option_ulong ('p',
                                     "port",
                                     NULL,
                                     gettext_noop ("listen on specified port (default: 7777)"),
                                     &port),
 
-    GNUNET_GETOPT_OPTION_STRING ('a',
+    GNUNET_GETOPT_option_string ('a',
                                  "authority",
                                  NULL,
                                  gettext_noop ("pem file to use as CA"),
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index c85ddfe81..c0de0f30c 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -422,36 +422,36 @@ main (int argc,
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_STRING ('u',
+    GNUNET_GETOPT_option_string ('u',
                                  "lookup",
                                  "NAME",
                                  gettext_noop ("Lookup a record for the given name"),
                                  &lookup_name),
 
-    GNUNET_GETOPT_OPTION_STRING ('t',
+    GNUNET_GETOPT_option_string ('t',
                                  "type",
                                  "TYPE",
                                  gettext_noop ("Specify the type of the record to lookup"),
                                  &lookup_type),
 
-    GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('T',
+    GNUNET_GETOPT_option_relative_time ('T',
                                             "timeout",
                                             "DELAY",
                                             gettext_noop ("Specify timeout for the lookup"),
                                             &timeout),
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('r',
+    GNUNET_GETOPT_option_flag ('r',
                                   "raw",
                                   gettext_noop ("No unneeded output"),
                                   &raw),
 
-    GNUNET_GETOPT_OPTION_STRING ('p',
+    GNUNET_GETOPT_option_string ('p',
                                  "public-key",
                                  "PKEY",
                                  gettext_noop ("Specify the public key of the zone to lookup the record in"),
                                  &public_key),
     
-    GNUNET_GETOPT_OPTION_STRING ('z',
+    GNUNET_GETOPT_option_string ('z',
                                  "zone",
                                  "NAME",
                                  gettext_noop ("Specify the name of the ego of the zone to lookup the record in"),