From 8d9dc14227350eb93f89c56c774ed377b633bc88 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 25 Mar 2017 21:22:22 +0100
Subject: renaming GNUNET_GETOPT-symbols to match latest changes in GNUnet

---
 src/auditor/taler-auditor-sign.c | 22 +++++++++++-----------
 src/auditor/taler-auditor.c      |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/auditor')

diff --git a/src/auditor/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c
index 5d73eccaf..13bf586b0 100644
--- a/src/auditor/taler-auditor-sign.c
+++ b/src/auditor/taler-auditor-sign.c
@@ -139,37 +139,37 @@ main (int argc,
 {
   char *cfgfile = NULL;
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_FILENAME ('a',
+    GNUNET_GETOPT_option_filename ('a',
                                    "auditor-key",
                                    "FILENAME",
                                    "file containing the private key of the auditor",
                                    &auditor_key_file),
-    GNUNET_GETOPT_OPTION_CFG_FILE (&cfgfile),
-    GNUNET_GETOPT_OPTION_HELP ("Private key of the auditor to use for signing"),
-    GNUNET_GETOPT_OPTION_MANDATORY
-    (GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('m',
+    GNUNET_GETOPT_option_cfgfile (&cfgfile),
+    GNUNET_GETOPT_option_help ("Private key of the auditor to use for signing"),
+    GNUNET_GETOPT_option_mandatory
+    (GNUNET_GETOPT_option_base32_auto ('m',
                                            "exchange-key",
                                            "KEY",
                                            "public key of the exchange (Crockford base32 encoded)",
                                            &master_public_key)),
-    GNUNET_GETOPT_OPTION_STRING ('u',
+    GNUNET_GETOPT_option_string ('u',
                                  "auditor-url",
                                  "URL",
                                  "URL of the auditor (informative link for the user)",
                                  &auditor_url),
-    GNUNET_GETOPT_OPTION_MANDATORY
-    (GNUNET_GETOPT_OPTION_FILENAME ('r',
+    GNUNET_GETOPT_option_mandatory
+    (GNUNET_GETOPT_option_filename ('r',
                                     "exchange-request",
                                     "FILENAME",
                                     "set of keys the exchange requested the auditor to sign",
                                     &exchange_request_file)),
-    GNUNET_GETOPT_OPTION_FILENAME ('o',
+    GNUNET_GETOPT_option_filename ('o',
                                    "output",
                                    "FILENAME",
                                    "where to write our signature",
                                    &output_file),
-    GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION),
-    GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+    GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
+    GNUNET_GETOPT_option_verbose (&verbose),
     GNUNET_GETOPT_OPTION_END
   };
   struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv;
diff --git a/src/auditor/taler-auditor.c b/src/auditor/taler-auditor.c
index f3c49aa32..c58a8b151 100644
--- a/src/auditor/taler-auditor.c
+++ b/src/auditor/taler-auditor.c
@@ -3352,13 +3352,13 @@ main (int argc,
       char *const *argv)
 {
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_MANDATORY
-    (GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('m',
+    GNUNET_GETOPT_option_mandatory
+    (GNUNET_GETOPT_option_base32_auto ('m',
                                            "exchange-key",
                                            "KEY",
                                            "public key of the exchange (Crockford base32 encoded)",
                                            &master_pub)),
-    GNUNET_GETOPT_OPTION_SET_ONE ('r',
+    GNUNET_GETOPT_option_flag ('r',
                                   "restart",
                                   "restart audit from the beginning (required on first run)",
                                   &restart),
-- 
cgit v1.2.3