minor stylistic fixes

2 files changed, 33 insertions, 30 deletions

diff --git a/src/backend/taler-merchant-httpd_track-deposit.c b/src/backend/taler-merchant-httpd_track-deposit.c
index 5e2cf4f0..c1d9b352 100644
--- a/src/backend/taler-merchant-httpd_track-deposit.c
+++ b/src/backend/taler-merchant-httpd_track-deposit.c
@@ -129,6 +129,11 @@ free_deposit_track_context (struct DepositTrackContext *rctx)
     GNUNET_SCHEDULER_cancel (rctx->timeout_task);
     rctx->timeout_task = NULL;
   }
+  if (NULL != rctx->wdh)
+  {
+    TALER_EXCHANGE_wire_deposits_cancel (rctx->wdh);
+    rctx->wdh = NULL;
+  }
   if (NULL != rctx->uri)
   {
     GNUNET_free (rctx->uri);
@@ -213,7 +218,7 @@ check_deposit (void *cls,
        (0 != TALER_amount_cmp (deposit_fee,
                                &wdd->coin_fee)) )
   {
-    /* Disagreement between the exchange and us how much this
+    /* Disagreement between the exchange and us about how much this
        coin is worth! */
     GNUNET_break_op (0);
     rctx->check_deposit_result = GNUNET_SYSERR;
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c
index e75d92aa..bfae1af9 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -95,7 +95,6 @@ struct TrackTransactionContext
 
   /**
    * This field MUST be first.
-   * FIXME: Explain why!
    */
   struct TM_HandlerContext hc;
 
@@ -120,73 +119,72 @@ struct TrackTransactionContext
   char *exchange_uri;
 
   /**
-   * Wire transfer identifier we are currently looking up in @e wdh
+   * Task run on timeout.
    */
-  struct TALER_WireTransferIdentifierRawP current_wtid;
+  struct GNUNET_SCHEDULER_Task *timeout_task;
 
   /**
-   * Transaction this request is about.
+   * Handle for operation to lookup /keys (and auditors) from
+   * the exchange used for this transaction; NULL if no operation is
+   * pending.
    */
-  uint64_t transaction_id;
+  struct TMH_EXCHANGES_FindOperation *fo;
 
   /**
-   * Hash of wire details for the transaction.
+   * Handle to our exchange, once we found it.
    */
-  struct GNUNET_HashCode h_wire;
+  struct TALER_EXCHANGE_Handle *eh;
 
   /**
-   * Timestamp of the transaction.
+   * Handle we use to resolve transactions for a given WTID.
    */
-  struct GNUNET_TIME_Absolute timestamp;
+  struct TALER_EXCHANGE_WireDepositsHandle *wdh;
 
   /**
-   * Refund deadline for the transaction.
+   * Response to return upon resume.
    */
-  struct GNUNET_TIME_Absolute refund_deadline;
+  struct MHD_Response *response;
 
   /**
-   * Total value of the transaction.
+   * Wire transfer identifier we are currently looking up in @e wdh.
    */
-  struct TALER_Amount total_amount;
+  struct TALER_WireTransferIdentifierRawP current_wtid;
 
   /**
-   * Hash of the contract.
+   * Hash of wire details for the transaction.
    */
-  struct GNUNET_HashCode h_contract;
+  struct GNUNET_HashCode h_wire;
 
   /**
-   * Task run on timeout.
+   * Hash of the contract.
    */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
+  struct GNUNET_HashCode h_contract;
 
   /**
-   * Handle for operation to lookup /keys (and auditors) from
-   * the exchange used for this transaction; NULL if no operation is
-   * pending.
+   * Timestamp of the transaction.
    */
-  struct TMH_EXCHANGES_FindOperation *fo;
+  struct GNUNET_TIME_Absolute timestamp;
 
   /**
-   * Handle to our exchange, once we found it.
+   * Refund deadline for the transaction.
    */
-  struct TALER_EXCHANGE_Handle *eh;
+  struct GNUNET_TIME_Absolute refund_deadline;
 
   /**
-   * Handle we use to resolve transactions for a given WTID.
+   * Total value of the transaction.
    */
-  struct TALER_EXCHANGE_WireDepositsHandle *wdh;
+  struct TALER_Amount total_amount;
 
   /**
-   * Response to return upon resume.
+   * Transaction this request is about.
    */
-  struct MHD_Response *response;
+  uint64_t transaction_id;
 
   /**
    * Response code to return upon resume.
    */
   unsigned int response_code;
 
-
 };
 
 
@@ -672,4 +670,4 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh,
 }
 
 
-/* end of taler-merchant-httpd_contract.c */
+/* end of taler-merchant-httpd_track-transaction.c */