[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 46/152: modify TALER_EXCHANGE_deposits_get() API to avo
From: |
gnunet |
Subject: |
[taler-exchange] 46/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies |
Date: |
Sun, 05 Jul 2020 20:46:42 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit f88fd4640fbf1fdbead38f826bbdb5f6f41e4565
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun May 3 20:12:18 2020 +0200
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(-)
diff --git a/src/testing/testing_api_cmd_deposits_get.c
b/src/testing/testing_api_cmd_deposits_get.c
index 58456a49..33987e16 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);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 28/152: update, (continued)
- [taler-exchange] 28/152: update, gnunet, 2020/07/05
- [taler-exchange] 40/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 35/152: implement #6181, gnunet, 2020/07/05
- [taler-exchange] 37/152: make tests skip until we have a wallet to regen the DB, gnunet, 2020/07/05
- [taler-exchange] 38/152: update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later, gnunet, 2020/07/05
- [taler-exchange] 39/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later), gnunet, 2020/07/05
- [taler-exchange] 26/152: towards changing timestamp in deposit confirmation (tests failing), gnunet, 2020/07/05
- [taler-exchange] 29/152: merge, gnunet, 2020/07/05
- [taler-exchange] 30/152: use unregister, gnunet, 2020/07/05
- [taler-exchange] 32/152: v8 bump, gnunet, 2020/07/05
- [taler-exchange] 46/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies,
gnunet <=
- [taler-exchange] 42/152: return fee as well, gnunet, 2020/07/05
- [taler-exchange] 44/152: sleep to ensure aggregator has work, gnunet, 2020/07/05
- [taler-exchange] 47/152: return fee as well, gnunet, 2020/07/05
- [taler-exchange] 48/152: update, gnunet, 2020/07/05
- [taler-exchange] 43/152: towards changing timestamp in deposit confirmation (tests failing), gnunet, 2020/07/05
- [taler-exchange] 52/152: fix drop call, gnunet, 2020/07/05
- [taler-exchange] 51/152: merge, gnunet, 2020/07/05
- [taler-exchange] 54/152: ecs, gnunet, 2020/07/05
- [taler-exchange] 56/152: update ECs, gnunet, 2020/07/05
- [taler-exchange] 61/152: bringing gana up to date so uncrustify accepts taler_error_codes.h, gnunet, 2020/07/05