diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
| commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
| tree | b29517e7aee281484ea960b92f53a6c13269904c /src/exchangedb/exchangedb_accounts.c | |
| parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
| parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
fix merge conflict
Diffstat (limited to 'src/exchangedb/exchangedb_accounts.c')
| -rw-r--r-- | src/exchangedb/exchangedb_accounts.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c index fa349d58a..fa45fd81f 100644 --- a/src/exchangedb/exchangedb_accounts.c +++ b/src/exchangedb/exchangedb_accounts.c @@ -62,7 +62,7 @@ check_for_account (void *cls, { struct FindAccountContext *ctx = cls; char *method; - char *payto_url; + char *payto_uri; char *wire_response_filename; struct TALER_EXCHANGEDB_AccountInfo ai; @@ -73,12 +73,12 @@ check_for_account (void *cls, if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (ctx->cfg, section, - "URL", - &payto_url)) + "PAYTO_URI", + &payto_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, section, - "URL"); + "PAYTO_URI"); return; } if (GNUNET_OK != @@ -90,7 +90,7 @@ check_for_account (void *cls, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, section, "METHOD"); - GNUNET_free (payto_url); + GNUNET_free (payto_uri); return; } if (GNUNET_OK != @@ -101,7 +101,7 @@ check_for_account (void *cls, wire_response_filename = NULL; ai.section_name = section; ai.method = method; - ai.payto_url = payto_url; + ai.payto_uri = payto_uri; ai.wire_response_filename = wire_response_filename; ai.debit_enabled = (GNUNET_YES == @@ -114,7 +114,7 @@ check_for_account (void *cls, "ENABLE_CREDIT")); ctx->cb (ctx->cb_cls, &ai); - GNUNET_free (payto_url); + GNUNET_free (payto_uri); GNUNET_free (method); GNUNET_free_non_null (wire_response_filename); } |