taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get filename instead of get_string, nicify some strings

Browse Source
This commit is contained in:
Christian Grothoff 2018-04-02 17:10:05 +02:00
parent 8ebb4cda07
commit e098dbf4dc
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
View File

@ -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;
}

14
src/exchange-lib/testing_api_cmd_fakebank_transfer.c
View File

@ -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);

8
src/exchange-lib/testing_api_helpers.c
View File

@ -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",

15
src/exchange/taler-exchange-httpd.c
View File

@ -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,

4
src/exchange/taler-exchange-wirewatch.c
View File

@ -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)