address double-slash situation.

This commit is contained in:
Marcello Stanisci 2018-04-23 15:59:48 +02:00
parent 202827ebda
commit b8ab8f01c7
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 10 additions and 3 deletions

View File

@ -94,6 +94,7 @@ run (void *cls,
"subject 1", "subject 1",
"http://exchange.com/"), "http://exchange.com/"),
/* bank gives to exchange */
TALER_TESTING_cmd_fakebank_transfer_with_subject TALER_TESTING_cmd_fakebank_transfer_with_subject
("deposit-2", ("deposit-2",
"KUDOS:5.01", "KUDOS:5.01",

View File

@ -184,7 +184,7 @@ print_expected (struct History *h,
for (uint64_t i=0;i<h_len;i++) for (uint64_t i=0;i<h_len;i++)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"H(%llu): %s%s (serial: %llu, subject: %s, to: %s)\n", "H(%llu): %s%s (serial: %llu, subject: %s, counterpart: %s)\n",
(unsigned long long) i, (unsigned long long) i,
(TALER_BANK_DIRECTION_CREDIT == h[i].direction) ? "+" : "-", (TALER_BANK_DIRECTION_CREDIT == h[i].direction) ? "+" : "-",
TALER_amount2s (&h[i].details.amount), TALER_amount2s (&h[i].details.amount),
@ -409,8 +409,11 @@ build_history (struct TALER_TESTING_Interpreter *is,
h[total].direction = TALER_BANK_DIRECTION_CREDIT; h[total].direction = TALER_BANK_DIRECTION_CREDIT;
if (GNUNET_YES == cancelled) if (GNUNET_YES == cancelled)
h[total].direction |= TALER_BANK_DIRECTION_CANCEL; h[total].direction |= TALER_BANK_DIRECTION_CANCEL;
GNUNET_asprintf (&h[total].details.account_url, GNUNET_asprintf (&h[total].details.account_url,
"payto://x-taler-bank/%s/%llu", ('/' == hs->bank_url[strlen(hs->bank_url) -1])
? "payto://x-taler-bank/%s%llu"
: "payto://x-taler-bank/%s/%llu",
hs->bank_url, hs->bank_url,
(unsigned long long) *debit_account_no); (unsigned long long) *debit_account_no);
} }
@ -420,8 +423,11 @@ build_history (struct TALER_TESTING_Interpreter *is,
h[total].direction = TALER_BANK_DIRECTION_DEBIT; h[total].direction = TALER_BANK_DIRECTION_DEBIT;
if (GNUNET_YES == cancelled) if (GNUNET_YES == cancelled)
h[total].direction |= TALER_BANK_DIRECTION_CANCEL; h[total].direction |= TALER_BANK_DIRECTION_CANCEL;
GNUNET_asprintf (&h[total].details.account_url, GNUNET_asprintf (&h[total].details.account_url,
"payto://x-taler-bank/%s/%llu", ('/' == hs->bank_url[strlen(hs->bank_url) -1])
? "payto://x-taler-bank/%s%llu"
: "payto://x-taler-bank/%s/%llu",
hs->bank_url, hs->bank_url,
(unsigned long long) *credit_account_no); (unsigned long long) *credit_account_no);
} }