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/auditor/taler-wire-auditor.c | |
parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) |
fix merge conflict
Diffstat (limited to 'src/auditor/taler-wire-auditor.c')
-rw-r--r-- | src/auditor/taler-wire-auditor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c index 8aeec8b11..73f1f9db9 100644 --- a/src/auditor/taler-wire-auditor.c +++ b/src/auditor/taler-wire-auditor.c @@ -1076,10 +1076,10 @@ wire_out_cb (void *cls, return GNUNET_OK; } { - char *payto_url; + char *payto_uri; - payto_url = TALER_JSON_wire_to_payto (wire); - if (0 != strcasecmp (payto_url, + payto_uri = TALER_JSON_wire_to_payto (wire); + if (0 != strcasecmp (payto_uri, roi->details.credit_account_url)) { /* Destination bank account is wrong in actual wire transfer, so @@ -1112,10 +1112,10 @@ wire_out_cb (void *cls, TALER_amount_add (&total_bad_amount_out_minus, &total_bad_amount_out_minus, amount)); - GNUNET_free (payto_url); + GNUNET_free (payto_uri); goto cleanup; } - GNUNET_free (payto_url); + GNUNET_free (payto_uri); } if (0 != TALER_amount_cmp (&roi->details.amount, amount)) |