-remove _tuple suffix

10 files changed, 77 insertions, 72 deletions

diff --git a/src/lib/merchant_api_delete_account.c b/src/lib/merchant_api_delete_account.c
index e47833b7..42d8bc5d 100644
--- a/src/lib/merchant_api_delete_account.c
+++ b/src/lib/merchant_api_delete_account.c
@@ -74,8 +74,8 @@ struct TALER_MERCHANT_AccountDeleteHandle
  */
 static void
 handle_delete_account_finished (void *cls,
-                                 long response_code,
-                                 const void *response)
+                                long response_code,
+                                const void *response)
 {
   struct TALER_MERCHANT_AccountDeleteHandle *adh = cls;
   const json_t *json = response;
diff --git a/src/lib/merchant_api_delete_template.c b/src/lib/merchant_api_delete_template.c
index 0a5924aa..b2083cc9 100644
--- a/src/lib/merchant_api_delete_template.c
+++ b/src/lib/merchant_api_delete_template.c
@@ -74,8 +74,8 @@ struct TALER_MERCHANT_TemplateDeleteHandle
  */
 static void
 handle_delete_template_finished (void *cls,
-                                long response_code,
-                                const void *response)
+                                 long response_code,
+                                 const void *response)
 {
   struct TALER_MERCHANT_TemplateDeleteHandle *tdh = cls;
   const json_t *json = response;
diff --git a/src/lib/merchant_api_get_rewards.c b/src/lib/merchant_api_get_rewards.c
index 96ec4d34..eebc53d8 100644
--- a/src/lib/merchant_api_get_rewards.c
+++ b/src/lib/merchant_api_get_rewards.c
@@ -74,8 +74,8 @@ struct TALER_MERCHANT_RewardsGetHandle
  */
 static enum GNUNET_GenericReturnValue
 parse_rewards (const json_t *ia,
-            struct TALER_MERCHANT_RewardsGetResponse *tgr,
-            struct TALER_MERCHANT_RewardsGetHandle *tgh)
+               struct TALER_MERCHANT_RewardsGetResponse *tgr,
+               struct TALER_MERCHANT_RewardsGetHandle *tgh)
 {
   unsigned int tes_len = json_array_size (ia);
   struct TALER_MERCHANT_RewardEntry tes[GNUNET_NZL (tes_len)];
@@ -122,8 +122,8 @@ parse_rewards (const json_t *ia,
  */
 static void
 handle_get_rewards_finished (void *cls,
-                          long response_code,
-                          const void *response)
+                             long response_code,
+                             const void *response)
 {
   struct TALER_MERCHANT_RewardsGetHandle *tgh = cls;
   const json_t *json = response;
@@ -158,8 +158,8 @@ handle_get_rewards_finished (void *cls,
       }
       if (GNUNET_OK ==
           parse_rewards (rewards,
-                      &tgr,
-                      tgh))
+                         &tgr,
+                         tgh))
       {
         TALER_MERCHANT_rewards_get_cancel (tgh);
         return;
@@ -197,23 +197,23 @@ TALER_MERCHANT_rewards_get (
   void *cb_cls)
 {
   return TALER_MERCHANT_rewards_get2 (ctx,
-                                   backend_url,
-                                   TALER_EXCHANGE_YNA_NO,
-                                   -20,
-                                   UINT64_MAX,
-                                   cb,
-                                   cb_cls);
+                                      backend_url,
+                                      TALER_EXCHANGE_YNA_NO,
+                                      -20,
+                                      UINT64_MAX,
+                                      cb,
+                                      cb_cls);
 }
 
 
 struct TALER_MERCHANT_RewardsGetHandle *
 TALER_MERCHANT_rewards_get2 (struct GNUNET_CURL_Context *ctx,
-                          const char *backend_url,
-                          enum TALER_EXCHANGE_YesNoAll expired,
-                          int64_t limit,
-                          uint64_t offset,
-                          TALER_MERCHANT_RewardsGetCallback cb,
-                          void *cb_cls)
+                             const char *backend_url,
+                             enum TALER_EXCHANGE_YesNoAll expired,
+                             int64_t limit,
+                             uint64_t offset,
+                             TALER_MERCHANT_RewardsGetCallback cb,
+                             void *cb_cls)
 {
   struct TALER_MERCHANT_RewardsGetHandle *tgh;
   CURL *eh;
diff --git a/src/lib/merchant_api_merchant_get_reward.c b/src/lib/merchant_api_merchant_get_reward.c
index ba7306c0..a26c4243 100644
--- a/src/lib/merchant_api_merchant_get_reward.c
+++ b/src/lib/merchant_api_merchant_get_reward.c
@@ -112,8 +112,8 @@ parse_pickups (const json_t *pa,
  */
 static void
 handle_merchant_reward_get_finished (void *cls,
-                                  long response_code,
-                                  const void *response)
+                                     long response_code,
+                                     const void *response)
 {
   struct TALER_MERCHANT_RewardMerchantGetHandle *tgh = cls;
   const json_t *json = response;
@@ -214,13 +214,14 @@ handle_merchant_reward_get_finished (void *cls,
 
 struct TALER_MERCHANT_RewardMerchantGetHandle *
 TALER_MERCHANT_merchant_reward_get (struct GNUNET_CURL_Context *ctx,
-                                 const char *backend_url,
-                                 const struct TALER_RewardIdentifierP *reward_id,
-                                 const struct TALER_Amount *min_pick_up,
-                                 struct GNUNET_TIME_Relative lp_timeout,
-                                 bool pickups,
-                                 TALER_MERCHANT_RewardMerchantGetCallback cb,
-                                 void *cb_cls)
+                                    const char *backend_url,
+                                    const struct
+                                    TALER_RewardIdentifierP *reward_id,
+                                    const struct TALER_Amount *min_pick_up,
+                                    struct GNUNET_TIME_Relative lp_timeout,
+                                    bool pickups,
+                                    TALER_MERCHANT_RewardMerchantGetCallback cb,
+                                    void *cb_cls)
 {
   struct TALER_MERCHANT_RewardMerchantGetHandle *tgh;
   CURL *eh;
diff --git a/src/lib/merchant_api_post_account.c b/src/lib/merchant_api_post_account.c
index 68be6afd..5ed3f3b3 100644
--- a/src/lib/merchant_api_post_account.c
+++ b/src/lib/merchant_api_post_account.c
@@ -83,8 +83,8 @@ struct TALER_MERCHANT_AccountPostHandle
  */
 static void
 handle_post_account_finished (void *cls,
-                               long response_code,
-                               const void *response)
+                              long response_code,
+                              const void *response)
 {
   struct TALER_MERCHANT_AccountPostHandle *aph = cls;
   const json_t *json = response;
@@ -163,17 +163,17 @@ TALER_MERCHANT_account_post (
   json_t *req_obj;
 
   req_obj = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_string (
-          "payto_uri",
-          account->payto_uri),
-        GNUNET_JSON_pack_allow_null (
-          GNUNET_JSON_pack_string (
-            "credit_facade_url",
-            account->credit_facade_url)),
-        GNUNET_JSON_pack_allow_null (
-          GNUNET_JSON_pack_object_incref (
-            "credit_facade_credentials",
-            account->credit_facade_credentials))
+    GNUNET_JSON_pack_string (
+      "payto_uri",
+      account->payto_uri),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string (
+        "credit_facade_url",
+        account->credit_facade_url)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_object_incref (
+        "credit_facade_credentials",
+        account->credit_facade_credentials))
     );
   aph = GNUNET_new (struct TALER_MERCHANT_AccountPostHandle);
   aph->ctx = ctx;
diff --git a/src/lib/merchant_api_post_using_templates.c b/src/lib/merchant_api_post_using_templates.c
index d72768f3..f09c34cb 100644
--- a/src/lib/merchant_api_post_using_templates.c
+++ b/src/lib/merchant_api_post_using_templates.c
@@ -89,9 +89,9 @@ handle_post_using_templates_finished (void *cls,
 
   utph->job = NULL;
   TALER_MERCHANT_handle_order_creation_response_ (utph->cb,
-                                                            utph->cb_cls,
-                                                            response_code,
-                                                            json);
+                                                  utph->cb_cls,
+                                                  response_code,
+                                                  json);
   TALER_MERCHANT_using_templates_post_cancel (utph);
 }
 
diff --git a/src/lib/merchant_api_reward_authorize.c b/src/lib/merchant_api_reward_authorize.c
index b250031b..a695e378 100644
--- a/src/lib/merchant_api_reward_authorize.c
+++ b/src/lib/merchant_api_reward_authorize.c
@@ -136,8 +136,8 @@ check_ok (struct TALER_MERCHANT_RewardAuthorizeHandle *tao,
  */
 static void
 handle_reward_authorize_finished (void *cls,
-                               long response_code,
-                               const void *response)
+                                  long response_code,
+                                  const void *response)
 {
   struct TALER_MERCHANT_RewardAuthorizeHandle *tao = cls;
   const json_t *json = response;
@@ -294,12 +294,13 @@ TALER_MERCHANT_reward_authorize2 (
 
 struct TALER_MERCHANT_RewardAuthorizeHandle *
 TALER_MERCHANT_reward_authorize (struct GNUNET_CURL_Context *ctx,
-                              const char *backend_url,
-                              const char *next_url,
-                              const struct TALER_Amount *amount,
-                              const char *justification,
-                              TALER_MERCHANT_RewardAuthorizeCallback authorize_cb,
-                              void *authorize_cb_cls)
+                                 const char *backend_url,
+                                 const char *next_url,
+                                 const struct TALER_Amount *amount,
+                                 const char *justification,
+                                 TALER_MERCHANT_RewardAuthorizeCallback
+                                 authorize_cb,
+                                 void *authorize_cb_cls)
 {
   struct TALER_MERCHANT_RewardAuthorizeHandle *tao;
   CURL *eh;
diff --git a/src/lib/merchant_api_reward_pickup.c b/src/lib/merchant_api_reward_pickup.c
index 1d884d48..fd5cf9cc 100644
--- a/src/lib/merchant_api_reward_pickup.c
+++ b/src/lib/merchant_api_reward_pickup.c
@@ -264,12 +264,12 @@ pickup_post_csr (struct TALER_MERCHANT_RewardPickupHandle *tp)
     }
   }
   tp->tpo2 = TALER_MERCHANT_reward_pickup2 (tp->ctx,
-                                         tp->backend_url,
-                                         &tp->reward_id,
-                                         tp->num_planchets,
-                                         details,
-                                         &pickup_done_cb,
-                                         tp);
+                                            tp->backend_url,
+                                            &tp->reward_id,
+                                            tp->num_planchets,
+                                            details,
+                                            &pickup_done_cb,
+                                            tp);
   for (unsigned int j = 0; j<tp->num_planchets; j++)
     TALER_planchet_detail_free (&details[j]);
   if (NULL == tp->tpo2)
@@ -408,7 +408,8 @@ TALER_MERCHANT_reward_pickup (
 
 
 void
-TALER_MERCHANT_reward_pickup_cancel (struct TALER_MERCHANT_RewardPickupHandle *tp)
+TALER_MERCHANT_reward_pickup_cancel (struct
+                                     TALER_MERCHANT_RewardPickupHandle *tp)
 {
   for (unsigned int i = 0; i<tp->num_planchets; i++)
   {
diff --git a/src/lib/merchant_api_reward_pickup2.c b/src/lib/merchant_api_reward_pickup2.c
index 397f1a2b..45ebf266 100644
--- a/src/lib/merchant_api_reward_pickup2.c
+++ b/src/lib/merchant_api_reward_pickup2.c
@@ -160,8 +160,8 @@ check_ok (struct TALER_MERCHANT_RewardPickup2Handle *tpo,
  */
 static void
 handle_reward_pickup_finished (void *cls,
-                            long response_code,
-                            const void *response)
+                               long response_code,
+                               const void *response)
 {
   struct TALER_MERCHANT_RewardPickup2Handle *tpo = cls;
   const json_t *json = response;
@@ -189,8 +189,9 @@ handle_reward_pickup_finished (void *cls,
     /* Can happen if we pickup an amount that exceeds the reward... */
     tpr.hr.ec = TALER_JSON_get_error_code (json);
     tpr.hr.hint = TALER_JSON_get_error_hint (json);
-    GNUNET_break (TALER_EC_MERCHANT_REWARD_PICKUP_AMOUNT_EXCEEDS_REWARD_REMAINING ==
-                  tpr.hr.ec);
+    GNUNET_break (
+      TALER_EC_MERCHANT_REWARD_PICKUP_AMOUNT_EXCEEDS_REWARD_REMAINING ==
+      tpr.hr.ec);
     break;
   case MHD_HTTP_CONFLICT:
     /* legal, can happen if we pickup a reward twice... */
diff --git a/src/lib/merchant_api_wallet_get_reward.c b/src/lib/merchant_api_wallet_get_reward.c
index f548d692..534eb7f4 100644
--- a/src/lib/merchant_api_wallet_get_reward.c
+++ b/src/lib/merchant_api_wallet_get_reward.c
@@ -75,8 +75,8 @@ struct TALER_MERCHANT_RewardWalletGetHandle
  */
 static void
 handle_wallet_reward_get_finished (void *cls,
-                                long response_code,
-                                const void *response)
+                                   long response_code,
+                                   const void *response)
 {
   struct TALER_MERCHANT_RewardWalletGetHandle *tgh = cls;
   const json_t *json = response;
@@ -152,10 +152,11 @@ handle_wallet_reward_get_finished (void *cls,
 
 struct TALER_MERCHANT_RewardWalletGetHandle *
 TALER_MERCHANT_wallet_reward_get (struct GNUNET_CURL_Context *ctx,
-                               const char *backend_url,
-                               const struct TALER_RewardIdentifierP *reward_id,
-                               TALER_MERCHANT_RewardWalletGetCallback cb,
-                               void *cb_cls)
+                                  const char *backend_url,
+                                  const struct
+                                  TALER_RewardIdentifierP *reward_id,
+                                  TALER_MERCHANT_RewardWalletGetCallback cb,
+                                  void *cb_cls)
 {
   struct TALER_MERCHANT_RewardWalletGetHandle *tgh;
   CURL *eh;