From f88fd4640fbf1fdbead38f826bbdb5f6f41e4565 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 May 2020 20:12:18 +0200 Subject: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies --- src/testing/testing_api_cmd_deposits_get.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') 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); -- cgit v1.2.3