summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-03 20:12:18 +0200
committerChristian Grothoff <christian@grothoff.org>2020-05-19 01:16:06 +0200
commitf88fd4640fbf1fdbead38f826bbdb5f6f41e4565 (patch)
tree8819990921c00289ade7144173467ebf7396761d
parent353c4e2fa0ad2797c69aea1a580b6dc1f6e66508 (diff)
downloadexchange-f88fd4640fbf1fdbead38f826bbdb5f6f41e4565.tar.gz
exchange-f88fd4640fbf1fdbead38f826bbdb5f6f41e4565.tar.bz2
exchange-f88fd4640fbf1fdbead38f826bbdb5f6f41e4565.zip
modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies
-rw-r--r--src/testing/testing_api_cmd_deposits_get.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index 58456a492..33987e161 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -111,8 +111,7 @@ deposit_wtid_cb (void *cls,
switch (hr->http_status)
{
case MHD_HTTP_OK:
- GNUNET_assert (NULL != dd->wtid);
- tts->wtid = *dd->wtid;
+ tts->wtid = dd->wtid;
if (NULL != tts->bank_transfer_reference)
{
const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -140,11 +139,7 @@ deposit_wtid_cb (void *cls,
}
/* Compare that expected and gotten subjects match. */
-<<<<<<< HEAD
if (0 != GNUNET_memcmp (&dd->wtid,
-=======
- if (0 != GNUNET_memcmp (dd->wtid,
->>>>>>> modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)
wtid_want))
{
GNUNET_break (0);