[taler-merchant] branch master updated: -remove bogus comment

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 1f0e2307 -remove bogus comment
1f0e2307 is described below

commit 1f0e230741d514e71541daa3106aef6975d57e26
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 1 12:21:56 2024 +0200

    -remove bogus comment
---
 contrib/wallet-core                   |  2 +-
 src/lib/merchant_api_post_order_pay.c | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 1e571b38..d605149b 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 1e571b38d30cdb936825e90bfba4ca4122220965
+Subproject commit d605149b9601eb2011aff08c3c19bacec5f93982
diff --git a/src/lib/merchant_api_post_order_pay.c 
b/src/lib/merchant_api_post_order_pay.c
index cf06630a..77e14c02 100644
--- a/src/lib/merchant_api_post_order_pay.c
+++ b/src/lib/merchant_api_post_order_pay.c
@@ -145,7 +145,7 @@ parse_tokens (const json_t *token_sigs,
   {
     struct TALER_MERCHANT_OutputToken *token = &(*tokens)[i];
     const json_t *jtoken = json_array_get (token_sigs,
-                                       i);
+                                           i);
 
     if (NULL == jtoken)
     {
@@ -285,9 +285,6 @@ handle_pay_finished (void *cls,
   case MHD_HTTP_FORBIDDEN:
     pr.hr.ec = TALER_JSON_get_error_code (json);
     pr.hr.hint = TALER_JSON_get_error_hint (json);
-    /* Nothing really to verify, merchant says we tried to abort the payment
-     * after it was successful. We should pass the JSON reply to the
-     * application */
     break;
   case MHD_HTTP_NOT_FOUND:
     pr.hr.ec = TALER_JSON_get_error_code (json);
@@ -478,10 +475,10 @@ TALER_MERCHANT_order_pay_frontend (
         GNUNET_JSON_pack_data_auto ("token_pub",
                                     &ut->token_pub),
         TALER_JSON_pack_token_issue_sig ("ub_sig",
-                                        &ut->ub_sig));
+                                         &ut->ub_sig));
       if (0 !=
           json_array_append_new (j_tokens,
-                                j_token))
+                                 j_token))
       {
         GNUNET_break (0);
         json_decref (j_tokens);
@@ -581,7 +578,8 @@ TALER_MERCHANT_order_pay (
   unsigned int num_tokens,
   const struct TALER_MERCHANT_UseToken tokens[static num_tokens],
   unsigned int num_output_tokens,
-  const struct TALER_MERCHANT_OutputToken output_tokens[static 
num_output_tokens],
+  const struct TALER_MERCHANT_OutputToken output_tokens[static 
num_output_tokens
+  ],
   TALER_MERCHANT_OrderPayCallback pay_cb,
   void *pay_cb_cls)
 {
@@ -619,7 +617,7 @@ TALER_MERCHANT_order_pay (
 
       if (0 !=
           json_array_append_new (j_output_tokens,
-                                j_token_ev))
+                                 j_token_ev))
       {
         GNUNET_break (0);
         json_decref (j_output_tokens);
@@ -634,9 +632,9 @@ TALER_MERCHANT_order_pay (
                               choice_index),
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_array_incref ("tokens_evs",
-                                      j_output_tokens)));
+                                       j_output_tokens)));
     TALER_json_hash (wallet_data,
-                    &wallet_data_hash);
+                     &wallet_data_hash);
   }
   {
     struct TALER_MERCHANT_PaidCoin pc[num_coins];

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.