gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-exchange] 114/152: modify TALER_EXCHANGE_deposits_get() API to av


From: gnunet
Subject: [taler-exchange] 114/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies
Date: Sun, 05 Jul 2020 20:47:50 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

commit 532440acf829f794fec93952da889ca015559bb4
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 9b65822b..d5617ec2 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]