diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-03-15 20:09:32 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-03-15 20:09:32 +0100 |
| commit | 0fb7b9b4c2b8b1f83b2c2e7cb2eb0c3cbe9eb2e6 (patch) | |
| tree | a7406d39203390a533ddbd55e7d7edd11c70f669 | |
| parent | 9d37275ed83e9eafe6bd712b5df058c53d7f83c3 (diff) | |
| download | merchant-0fb7b9b4c2b8b1f83b2c2e7cb2eb0c3cbe9eb2e6.tar.gz merchant-0fb7b9b4c2b8b1f83b2c2e7cb2eb0c3cbe9eb2e6.tar.bz2 merchant-0fb7b9b4c2b8b1f83b2c2e7cb2eb0c3cbe9eb2e6.zip | |
move common logic to parse currency into libtalerutil
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 11 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 9 |
2 files changed, 5 insertions, 15 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 7b2297a5..6e87c6d6 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1545,15 +1545,10 @@ run (void *cls, result = GNUNET_SYSERR; GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); - if (GNUNET_SYSERR == - GNUNET_CONFIGURATION_get_value_string (config, - "taler", - "CURRENCY", - &TMH_currency)) + if (GNUNET_OK != + TALER_config_get_currency (config, + &TMH_currency)) { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "taler", - "CURRENCY"); GNUNET_SCHEDULER_shutdown (); return; } diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index bbc80132..6e57419f 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -3502,14 +3502,9 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) return NULL; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "taler", - "CURRENCY", - &pg->currency)) + TALER_config_get_currency (cfg, + &pg->currency)) { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "taler", - "CURRENCY"); GNUNET_PQ_disconnect (pg->conn); GNUNET_free (pg->sql_dir); GNUNET_free (pg); |