get filename instead of get_string, nicify some strings

5 files changed, 29 insertions, 32 deletions

diff --git a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c b/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
index bae0c076a..98ce116ec 100644
--- a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
+++ b/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
@@ -72,23 +72,23 @@ auditor_sign_run (void *cls,
   if (GNUNET_OK != GNUNET_CONFIGURATION_load
     (cfg, ass->config_filename))
   {
-    GNUNET_break (0); 
-    TALER_TESTING_interpreter_fail (is); 
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
     return;
   }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "paths",
-                                             "TALER_TEST_HOME",
-                                             &test_home_dir))
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "paths",
+                                               "TALER_TEST_HOME",
+                                               &test_home_dir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "paths",
                                "TALER_TEST_HOME");
     GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_break (0); 
-    TALER_TESTING_interpreter_fail (is); 
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -108,8 +108,8 @@ auditor_sign_run (void *cls,
                                "MASTER_PUBLIC_KEY");
     GNUNET_CONFIGURATION_destroy (cfg);
 
-    GNUNET_break (0); 
-    TALER_TESTING_interpreter_fail (is); 
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
     return;
   }
 
diff --git a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c b/src/exchange-lib/testing_api_cmd_fakebank_transfer.c
index a8bad860a..733ceb4cb 100644
--- a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c
+++ b/src/exchange-lib/testing_api_cmd_fakebank_transfer.c
@@ -231,18 +231,16 @@ fakebank_transfer_run (void *cls,
         }
 
         GNUNET_asprintf (&section,
-                         "merchant-instance-%s",
+                         "instance-%s",
                          fts->instance);
         if (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_string
-              (cfg,
-               section,
-               "TIP_RESERVE_PRIV_FILENAME",
-               &keys))
+            GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                                     section,
+                                                     "TIP_RESERVE_PRIV_FILENAME",
+                                                     &keys))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      "Configuration fails to specify reserve"
-                      " private key filename in section %s\n",
+                      "Configuration fails to specify reserve private key filename in section %s\n",
                       section);
           GNUNET_free (section);
           TALER_TESTING_interpreter_fail (is);
diff --git a/src/exchange-lib/testing_api_helpers.c b/src/exchange-lib/testing_api_helpers.c
index 3aff0a3cc..8bf66efb4 100644
--- a/src/exchange-lib/testing_api_helpers.c
+++ b/src/exchange-lib/testing_api_helpers.c
@@ -127,10 +127,10 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
   }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "paths",
-                                             "TALER_TEST_HOME",
-                                             &test_home_dir))
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "paths",
+                                               "TALER_TEST_HOME",
+                                               &test_home_dir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "paths",
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 823f12460..cb8ba2833 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -472,13 +472,12 @@ parse_port_config (const char *section,
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_string (cfg,
                                                section,
-                                               "unixpath_mode",
+                                               "UNIXPATH_MODE",
                                                &modestring))
     {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                  section,
-                                 "unixpath_mode",
-                                 "unixpath_mode required");
+                                 "UNIXPATH_MODE");
       return GNUNET_SYSERR;
     }
     errno = 0;
@@ -487,8 +486,8 @@ parse_port_config (const char *section,
     {
       GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
                                  section,
-                                 "unixpath_mode",
-                                 "unixpath_mode required");
+                                 "UNIXPATH_MODE",
+                                 "must be octal number");
       GNUNET_free (modestring);
       return GNUNET_SYSERR;
     }
@@ -526,7 +525,7 @@ exchange_serve_process_config ()
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "taler",
-                                             "currency",
+                                             "CURRENCY",
                                              &TEH_exchange_currency_string))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
@@ -545,7 +544,7 @@ exchange_serve_process_config ()
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "exchange",
-                                             "master_public_key",
+                                             "MASTER_PUBLIC_KEY",
                                              &TEH_master_public_key_str))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index cabfac7f4..67fab85ca 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -265,12 +265,12 @@ exchange_serve_process_config ()
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "taler",
-                                             "currency",
+                                             "CURRENCY",
                                              &exchange_currency_string))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "taler",
-                               "currency");
+                               "CURRENCY");
     return GNUNET_SYSERR;
   }
   if (strlen (exchange_currency_string) >= TALER_CURRENCY_LEN)