[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: tighten formatting rules
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: tighten formatting rules |
|
Date: |
Thu, 31 Oct 2019 13:02:20 +0100 |
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 b94c69a tighten formatting rules
new 9bb0242 Merge branch 'master' of git+ssh://git.taler.net/merchant
b94c69a is described below
commit b94c69aeb88d446415e8f12b6e5454d027176b0d
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Oct 31 10:19:37 2019 +0100
tighten formatting rules
---
contrib/uncrustify.cfg | 17 +++++++++++
src/backend/taler-merchant-httpd.c | 2 +-
src/backend/taler-merchant-httpd_auditors.c | 1 +
src/backend/taler-merchant-httpd_auditors.h | 2 --
src/backend/taler-merchant-httpd_check-payment.c | 3 --
src/backend/taler-merchant-httpd_config.c | 1 +
src/backend/taler-merchant-httpd_exchanges.c | 2 +-
src/backend/taler-merchant-httpd_history.c | 1 +
src/backend/taler-merchant-httpd_parsing.c | 4 ---
src/backend/taler-merchant-httpd_pay.c | 7 ++---
src/backend/taler-merchant-httpd_proposal.h | 1 +
src/backend/taler-merchant-httpd_refund.c | 3 +-
src/backend/taler-merchant-httpd_tip-authorize.c | 1 +
src/backend/taler-merchant-httpd_tip-query.c | 1 +
src/backend/taler-merchant-httpd_track-transfer.c | 5 ++--
src/backenddb/plugin_merchantdb_postgres.c | 11 +++----
src/backenddb/test_merchantdb.c | 7 +++--
src/include/taler_merchant_service.h | 2 --
src/include/taler_merchant_testing_lib.h | 5 ++++
src/include/taler_merchantdb_plugin.h | 1 -
src/lib/merchant_api_check_payment.c | 4 ++-
src/lib/merchant_api_history.c | 2 +-
src/lib/merchant_api_proposal.c | 1 +
src/lib/merchant_api_refund.c | 6 ++--
src/lib/merchant_api_tip_authorize.c | 1 +
src/lib/merchant_api_tip_pickup.c | 1 +
src/lib/merchant_api_tip_query.c | 1 +
src/lib/merchant_api_track_transaction.c | 1 +
src/lib/merchant_api_track_transfer.c | 1 +
src/lib/test_merchant_api.c | 17 +++++------
src/lib/test_merchant_api_twisted.c | 31 +++++++-------------
src/lib/testing_api_cmd_history.c | 2 +-
src/lib/testing_api_cmd_pay.c | 35 +++++++++++++++++------
src/lib/testing_api_cmd_proposal.c | 2 ++
src/lib/testing_api_cmd_refund.c | 17 +++++++----
src/lib/testing_api_cmd_rewind.c | 1 +
src/lib/testing_api_cmd_tip.c | 19 ++++++++----
src/lib/testing_api_cmd_track.c | 12 +++++---
src/lib/testing_api_helpers.c | 1 -
src/lib/testing_api_trait_merchant_sig.c | 2 ++
src/lib/testing_api_trait_planchet.c | 2 ++
src/lib/testing_api_trait_refund_entry.c | 1 +
src/merchant-tools/taler-merchant-benchmark.c | 14 ++++-----
43 files changed, 153 insertions(+), 98 deletions(-)
diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index f56c8e7..8c9df2c 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -49,8 +49,12 @@ nl_assign_brace=remove
# No extra newlines that cause noisy diffs
nl_start_of_file=remove
+nl_after_func_proto = 2
+nl_after_func_body = 3
# If there's no new line, it's not a text file!
nl_end_of_file=add
+nl_max_blank_in_func = 3
+nl_max = 3
sp_inside_paren = remove
@@ -69,6 +73,7 @@ sp_between_ptr_star = remove
sp_before_sparen = add
sp_inside_fparen = remove
+sp_inside_sparen = remove
# add space before function call and decl: "foo (x)"
sp_func_call_paren = add
@@ -76,3 +81,15 @@ sp_func_proto_paren = add
sp_func_proto_paren_empty = add
sp_func_def_paren = add
sp_func_def_paren_empty = add
+
+# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
+# so as uncrustify doesn't give exactly what we want => ignore
+sp_paren_paren = ignore
+sp_inside_paren = remove
+sp_bool = force
+
+nl_func_type_name = force
+#nl_branch_else = add
+nl_else_brace = add
+nl_elseif_brace = add
+nl_for_brace = add
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index 66dcc46..42e15ea 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -168,7 +168,7 @@ is_valid_correlation_id (const char *correlation_id)
if (strlen (correlation_id) >= 64)
return GNUNET_NO;
for (size_t i = 0; i < strlen (correlation_id); i++)
- if (! (isalnum (correlation_id[i]) ||(correlation_id[i] == '-')))
+ if (! (isalnum (correlation_id[i]) || (correlation_id[i] == '-')))
return GNUNET_NO;
return GNUNET_YES;
}
diff --git a/src/backend/taler-merchant-httpd_auditors.c
b/src/backend/taler-merchant-httpd_auditors.c
index 9aab237..fc25583 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -270,4 +270,5 @@ TMH_AUDITORS_done ()
nauditors = 0;
}
+
/* end of taler-merchant-httpd_auditors.c */
diff --git a/src/backend/taler-merchant-httpd_auditors.h
b/src/backend/taler-merchant-httpd_auditors.h
index cc980b8..e3ec292 100644
--- a/src/backend/taler-merchant-httpd_auditors.h
+++ b/src/backend/taler-merchant-httpd_auditors.h
@@ -69,6 +69,4 @@ void
TMH_AUDITORS_done (void);
-
-
#endif
diff --git a/src/backend/taler-merchant-httpd_check-payment.c
b/src/backend/taler-merchant-httpd_check-payment.c
index ee7c928..02a5120 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -37,7 +37,6 @@
#define MAX_RETRIES 5
-
/**
* Make a taler://pay URI
*
@@ -106,7 +105,6 @@ make_taler_pay_uri (struct MHD_Connection *connection,
}
-
/**
* Function called with information about a refund.
* It is responsible for summing up the refund amount.
@@ -427,7 +425,6 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
GNUNET_HashCode));
-
/* Check if the order has been paid for. */
if (NULL != session_id)
{
diff --git a/src/backend/taler-merchant-httpd_config.c
b/src/backend/taler-merchant-httpd_config.c
index 21fb55c..8af84e9 100644
--- a/src/backend/taler-merchant-httpd_config.c
+++ b/src/backend/taler-merchant-httpd_config.c
@@ -56,4 +56,5 @@ MH_handler_config (struct TMH_RequestHandler *rh,
"currency", TMH_currency);
}
+
/* end of taler-merchant-httpd_config.c */
diff --git a/src/backend/taler-merchant-httpd_exchanges.c
b/src/backend/taler-merchant-httpd_exchanges.c
index a589fba..1dfd810 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -25,7 +25,6 @@
#include "taler-merchant-httpd_exchanges.h"
-
/**
* Delay after which we'll re-fetch key information from the exchange.
*/
@@ -1153,4 +1152,5 @@ TMH_EXCHANGES_done ()
trusted_exchanges = NULL;
}
+
/* end of taler-merchant-httpd_exchanges.c */
diff --git a/src/backend/taler-merchant-httpd_history.c
b/src/backend/taler-merchant-httpd_history.c
index 5db0fb6..e4ba509 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -290,4 +290,5 @@ MH_handler_history (struct TMH_RequestHandler *rh,
return ret;
}
+
/* end of taler-merchant-httpd_history.c */
diff --git a/src/backend/taler-merchant-httpd_parsing.c
b/src/backend/taler-merchant-httpd_parsing.c
index 7e21482..497db87 100644
--- a/src/backend/taler-merchant-httpd_parsing.c
+++ b/src/backend/taler-merchant-httpd_parsing.c
@@ -67,8 +67,6 @@ struct Buffer
};
-
-
/**
* Free the data in a buffer. Does *not* free
* the buffer object itself.
@@ -83,7 +81,6 @@ buffer_deinit (struct Buffer *buf)
}
-
/**
* Function called whenever we are done with a request
* to clean up our state.
@@ -220,7 +217,6 @@ TMH_PARSE_json_data (struct MHD_Connection *connection,
}
-
/**
* Extract base32crockford encoded data from request.
*
diff --git a/src/backend/taler-merchant-httpd_pay.c
b/src/backend/taler-merchant-httpd_pay.c
index 7b2e3fb..69b8e2d 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -738,8 +738,7 @@ check_payment_sufficient (struct PayContext *pc)
* Deposit fees of *all* the coins are higher than
* the fixed limit that the merchant is willing to
* pay. The fees difference must be paid by the customer.
- */
- if (-1 == TALER_amount_cmp (&pc->max_fee,
+ */if (-1 == TALER_amount_cmp (&pc->max_fee,
&acc_fee))
{
struct TALER_Amount excess_fee;
@@ -783,8 +782,7 @@ check_payment_sufficient (struct PayContext *pc)
* fraction, and check that the remaining paid amount is
* enough to pay both the remaining wire fee customer's
* fraction AND the price of the contract itself.
- */
- else
+ */else
{
struct TALER_Amount deposit_fee_savings;
@@ -2230,4 +2228,5 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
return MHD_YES;
}
+
/* end of taler-merchant-httpd_pay.c */
diff --git a/src/backend/taler-merchant-httpd_proposal.h
b/src/backend/taler-merchant-httpd_proposal.h
index 4edac09..b118523 100644
--- a/src/backend/taler-merchant-httpd_proposal.h
+++ b/src/backend/taler-merchant-httpd_proposal.h
@@ -65,4 +65,5 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
const char *upload_data,
size_t *upload_data_size,
struct MerchantInstance *mi);
+
#endif
diff --git a/src/backend/taler-merchant-httpd_refund.c
b/src/backend/taler-merchant-httpd_refund.c
index a9d8ab1..a7b1660 100644
--- a/src/backend/taler-merchant-httpd_refund.c
+++ b/src/backend/taler-merchant-httpd_refund.c
@@ -349,8 +349,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
*
* Just a "200 OK" should be fine here, as the frontend has all
* the information needed to generate the right response.
- */
- confirmation.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_REFUND_OK);
+ */confirmation.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_REFUND_OK);
confirmation.purpose.size = htonl (sizeof (struct
TALER_MerchantRefundConfirmationPS));
GNUNET_CRYPTO_hash (order_id,
diff --git a/src/backend/taler-merchant-httpd_tip-authorize.c
b/src/backend/taler-merchant-httpd_tip-authorize.c
index 67c4a6e..7580f44 100644
--- a/src/backend/taler-merchant-httpd_tip-authorize.c
+++ b/src/backend/taler-merchant-httpd_tip-authorize.c
@@ -301,4 +301,5 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
}
}
+
/* end of taler-merchant-httpd_tip-authorize.c */
diff --git a/src/backend/taler-merchant-httpd_tip-query.c
b/src/backend/taler-merchant-httpd_tip-query.c
index d54625c..d4a86a7 100644
--- a/src/backend/taler-merchant-httpd_tip-query.c
+++ b/src/backend/taler-merchant-httpd_tip-query.c
@@ -235,4 +235,5 @@ MH_handler_tip_query (struct TMH_RequestHandler *rh,
return MHD_YES;
}
+
/* end of taler-merchant-httpd_tip-query.c */
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c
b/src/backend/taler-merchant-httpd_track-transfer.c
index e9e0cb9..b73bde9 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -197,6 +197,7 @@ free_transfer_track_context (struct TrackTransferContext
*rctx)
GNUNET_free (rctx);
}
+
/**
* Callback that frees all the elements in the hashmap
*
@@ -688,8 +689,7 @@ wire_transfer_cb (void *cls,
*
* details_length is how many (Taler coin) deposits have been
* aggregated into _this_ wire transfer.
- */
- for (unsigned int i = 0; i<details_length; i++)
+ */for (unsigned int i = 0; i<details_length; i++)
{
rctx->current_offset = i;
rctx->current_detail = &details[i];
@@ -1079,4 +1079,5 @@ MH_handler_track_transfer (struct TMH_RequestHandler *rh,
return MHD_YES;
}
+
/* end of taler-merchant-httpd_track-transfer.c */
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 4b75289..89f8d12 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -588,6 +588,7 @@ postgres_insert_session_info (void *cls,
params);
}
+
/**
* Retrieve the order ID that was used to pay for a resource within a session.
*
@@ -2316,8 +2317,7 @@ process_deposits_for_refund_cb (void *cls,
* Although this should be checked as the business should never
* issue a refund bigger than the contract's actual price, we cannot
* rely upon the frontend being correct.
- */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ */GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"The refund of %s is bigger than the order's value\n",
TALER_amount2s (ctx->refund));
@@ -2475,7 +2475,7 @@ postgres_enable_tip_reserve_TR (void *cls,
retries = 0;
check_connection (pg);
- RETRY:
+RETRY:
if (MAX_RETRIES < ++retries)
return GNUNET_DB_STATUS_SOFT_ERROR;
if (GNUNET_OK !=
@@ -2682,7 +2682,7 @@ postgres_authorize_tip_TR (void *cls,
retries = 0;
check_connection (pg);
- RETRY:
+RETRY:
if (MAX_RETRIES < ++retries)
return TALER_EC_TIP_AUTHORIZE_DB_SOFT_ERROR;
if (GNUNET_OK !=
@@ -2898,7 +2898,7 @@ postgres_pickup_tip_TR (void *cls,
retries = 0;
check_connection (pg);
- RETRY:
+RETRY:
if (MAX_RETRIES < ++retries)
return TALER_EC_TIP_PICKUP_DB_ERROR_SOFT;
if (GNUNET_OK !=
@@ -3745,4 +3745,5 @@ libtaler_plugin_merchantdb_postgres_done (void *cls)
return NULL;
}
+
/* end of plugin_merchantdb_postgres.c */
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index 1a569b1..99f6434 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -262,8 +262,8 @@ deposit_cb (void *cls,
const struct TALER_Amount *awire_fee,
const json_t *aexchange_proof)
{
- CHECK ((0 == GNUNET_memcmp (ah_contract_terms,
- &h_contract_terms)));
+ CHECK (0 == GNUNET_memcmp (ah_contract_terms,
+ &h_contract_terms));
CHECK (0 == GNUNET_memcmp (acoin_pub,
&coin_pub));
CHECK (0 == strcmp (aexchange_url,
@@ -329,6 +329,8 @@ proof_cb (void *cls,
CHECK (1 == json_equal ((json_t *) proof,
transfer_proof));
}
+
+
#undef CHECK
@@ -1070,4 +1072,5 @@ main (int argc,
return result;
}
+
/* end of test_merchantdb.c */
diff --git a/src/include/taler_merchant_service.h
b/src/include/taler_merchant_service.h
index cefafcc..fff74ea 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -247,7 +247,6 @@ TALER_MERCHANT_proposal_lookup_cancel (struct
plo);
-
/* ********************* /pay *********************** */
@@ -871,7 +870,6 @@ TALER_MERCHANT_tip_authorize (struct GNUNET_CURL_Context
*ctx,
void *authorize_cb_cls);
-
/**
* Cancel a pending /tip-authorize request
*
diff --git a/src/include/taler_merchant_testing_lib.h
b/src/include/taler_merchant_testing_lib.h
index 93b92fa..ac9ae6f 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -81,6 +81,7 @@ TALER_TESTING_cmd_proposal (const char *label,
const char *merchant_url,
unsigned int http_status,
const char *order);
+
/**
* Make a "proposal lookup" command.
*
@@ -119,6 +120,7 @@ TALER_TESTING_cmd_check_payment (const char *label,
unsigned int http_status,
const char *proposal_reference,
unsigned int expect_paid);
+
/**
* Make a "pay" test command.
*
@@ -145,6 +147,7 @@ TALER_TESTING_cmd_pay (const char *label,
const char *amount_with_fee,
const char *amount_without_fee,
const char *refund_fee);
+
/**
* Make a "pay again" test command. Its purpose is to
* take all the data from a aborted "pay" CMD, and use
@@ -166,6 +169,7 @@ TALER_TESTING_cmd_pay_again (const char *label,
const char *coin_reference,
const char *refund_fee,
unsigned int http_status);
+
/**
* Make a "pay abort" test command.
*
@@ -651,6 +655,7 @@ struct TALER_TESTING_Command
TALER_TESTING_cmd_tip_query (const char *label,
const char *merchant_url,
unsigned int http_status);
+
/**
* Define a /tip-query CMD equipped with a expected amount.
*
diff --git a/src/include/taler_merchantdb_plugin.h
b/src/include/taler_merchantdb_plugin.h
index e8a91b5..f88f311 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -524,7 +524,6 @@ struct TALER_MERCHANTDB_Plugin
TALER_MasterSignatureP *exchange_sig);
-
/**
* Lookup information about coin payments by proposal data's hashcode.
*
diff --git a/src/lib/merchant_api_check_payment.c
b/src/lib/merchant_api_check_payment.c
index ba5ac77..8a85d26 100644
--- a/src/lib/merchant_api_check_payment.c
+++ b/src/lib/merchant_api_check_payment.c
@@ -126,7 +126,8 @@ handle_check_payment_finished (void *cls,
&refund_amount,
NULL);
}
- else {
+ else
+ {
cpo->cb (cpo->cb_cls,
response_code,
json,
@@ -249,4 +250,5 @@ TALER_MERCHANT_check_payment_cancel (struct
GNUNET_free (cph);
}
+
/* end of merchant_api_check_payment.c */
diff --git a/src/lib/merchant_api_history.c b/src/lib/merchant_api_history.c
index 4c23c01..726204c 100644
--- a/src/lib/merchant_api_history.c
+++ b/src/lib/merchant_api_history.c
@@ -148,6 +148,7 @@ history_raw_cb (void *cls,
TALER_MERCHANT_history_cancel (ho);
}
+
/**
* Issue a /history request to the backend.
*
@@ -199,7 +200,6 @@ TALER_MERCHANT_history2 (struct GNUNET_CURL_Context *ctx,
start);
-
GNUNET_free (base);
eh = curl_easy_init ();
if (CURLE_OK != curl_easy_setopt (eh,
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index 88e68da..de2a228 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -458,4 +458,5 @@ TALER_MERCHANT_proposal_lookup_cancel
GNUNET_free (plo);
}
+
/* end of merchant_api_contract.c */
diff --git a/src/lib/merchant_api_refund.c b/src/lib/merchant_api_refund.c
index 5a6b0e3..19b39e6 100644
--- a/src/lib/merchant_api_refund.c
+++ b/src/lib/merchant_api_refund.c
@@ -138,8 +138,7 @@ handle_refund_increase_finished (void *cls,
* The backend gave response, but it's error, log it.
* NOTE that json must be a Taler-specific error object (FIXME,
* need a link to error objects at docs)
- */
- if (-1 == json_unpack
+ */if (-1 == json_unpack
((json_t *) json,
"{s:s, s:I, s:s}",
"error", &error,
@@ -297,8 +296,7 @@ handle_refund_lookup_finished (void *cls,
* The backend gave response, but it's error, log it.
* NOTE that json must be a Taler-specific error object (FIXME,
* need a link to error objects at docs)
- */
- if (-1 == json_unpack ((json_t *) json,
+ */if (-1 == json_unpack ((json_t *) json,
"{s:s, s:I, s:s}",
"error", &error,
"code", &code))
diff --git a/src/lib/merchant_api_tip_authorize.c
b/src/lib/merchant_api_tip_authorize.c
index 582c9a4..22fd329 100644
--- a/src/lib/merchant_api_tip_authorize.c
+++ b/src/lib/merchant_api_tip_authorize.c
@@ -268,4 +268,5 @@ TALER_MERCHANT_tip_authorize_cancel (struct
GNUNET_free (tao);
}
+
/* end of merchant_api_tip_authorize.c */
diff --git a/src/lib/merchant_api_tip_pickup.c
b/src/lib/merchant_api_tip_pickup.c
index 34b7d25..12b08f4 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -337,4 +337,5 @@ TALER_MERCHANT_tip_pickup_cancel (struct
TALER_MERCHANT_TipPickupOperation *tpo)
GNUNET_free (tpo);
}
+
/* end of merchant_api_tip_pickup.c */
diff --git a/src/lib/merchant_api_tip_query.c b/src/lib/merchant_api_tip_query.c
index 0f72482..8e3600d 100644
--- a/src/lib/merchant_api_tip_query.c
+++ b/src/lib/merchant_api_tip_query.c
@@ -242,4 +242,5 @@ TALER_MERCHANT_tip_query_cancel (struct
TALER_MERCHANT_TipQueryOperation *tqo)
GNUNET_free (tqo);
}
+
/* end of merchant_api_tip_query.c */
diff --git a/src/lib/merchant_api_track_transaction.c
b/src/lib/merchant_api_track_transaction.c
index e2889b3..aa72962 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -193,4 +193,5 @@ TALER_MERCHANT_track_transaction_cancel (struct
GNUNET_free (tdo);
}
+
/* end of merchant_api_track_transaction.c */
diff --git a/src/lib/merchant_api_track_transfer.c
b/src/lib/merchant_api_track_transfer.c
index df303b1..791d5b8 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -287,4 +287,5 @@ TALER_MERCHANT_track_transfer_cancel (struct
GNUNET_free (tdo);
}
+
/* end of merchant_api_track_transfer.c */
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index bb7d9e2..5499a83 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -366,14 +366,12 @@ run (void *cls,
* all records to be returned; setting date as
0 lets the
* interpreter set it as 'now' + one hour
delta, just to
* make sure it surpasses the proposal's
timestamp.
- */
- GNUNET_TIME_UNIT_ZERO_ABS,
+ */GNUNET_TIME_UNIT_ZERO_ABS,
/**
* We only expect ONE result
(create-proposal-1) to be
* included in /history response, because
create-proposal-3
* did NOT go through because of double
spending.
- */
- 1, // nresult
+ */1, // nresult
10, // start
-10), // nrows
@@ -487,8 +485,7 @@ run (void *cls,
* Now we expect BOTH contracts
(create-proposal-{1,2})
* to be included in /history response, because
* create-proposal-2 has now been correctly
paid.
- */
- 2,
+ */2,
10,
-10),
TALER_TESTING_cmd_end ()
@@ -567,8 +564,7 @@ run (void *cls,
* it, and finally (4) attempt to pick up a refund
* from it without any increasing taking place
* in the first place.
- **/
- CMD_TRANSFER_TO_EXCHANGE ("create-reserve-unincreased-refund",
+ **/CMD_TRANSFER_TO_EXCHANGE ("create-reserve-unincreased-refund",
"EUR:5.01"),
CMD_EXEC_WIREWATCH ("wirewatch-unincreased-refund"),
@@ -682,8 +678,7 @@ run (void *cls,
* against a reserve that does not exist. This is
* implemented by passing a "tip instance" that
* specifies a reserve key that was never used to
- * actually create a reserve. */
- TALER_TESTING_cmd_tip_authorize_with_ec
+ * actually create a reserve. */TALER_TESTING_cmd_tip_authorize_with_ec
("authorize-tip-null",
merchant_url_internal ("nulltip"),
exchange_url,
@@ -1061,6 +1056,7 @@ run (void *cls,
fakebank_url);
}
+
int
main (int argc,
char *const *argv)
@@ -1119,4 +1115,5 @@ main (int argc,
return 0;
}
+
/* end of test_merchant_api_new.c */
diff --git a/src/lib/test_merchant_api_twisted.c
b/src/lib/test_merchant_api_twisted.c
index f34795d..09485ef 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -258,8 +258,7 @@ run (void *cls,
* not manage to pass the callback a valid JSON and will
* instead pass a NULL pointer. This should trigger the path
* mentioned in the bug report #5719.
- */
- TALER_TESTING_cmd_malform_response
+ */TALER_TESTING_cmd_malform_response
("5719-malform-exchange-resp",
PROXY_EXCHANGE_CONFIG_FILE),
@@ -375,9 +374,7 @@ run (void *cls,
* Cause the PUT /proposal callback to be called
* with a response code == 0. We achieve this by malforming
* the response body.
- */
-
- TALER_TESTING_cmd_malform_response
+ */TALER_TESTING_cmd_malform_response
("malform-proposal",
PROXY_MERCHANT_CONFIG_FILE),
@@ -507,8 +504,7 @@ run (void *cls,
* code, that is then expected to trigger some
* emergency behaviour, like setting the response
* code to zero before calling the callback.
- */
- TALER_TESTING_cmd_hack_response_code
+ */TALER_TESTING_cmd_hack_response_code
("twist-history",
PROXY_MERCHANT_CONFIG_FILE,
MHD_HTTP_GONE),
@@ -524,8 +520,7 @@ run (void *cls,
* Making the returned response malformed, in order
* to make the JSON downloader+parser fail and call
* the lib passing a response code as zero.
- */
- TALER_TESTING_cmd_malform_response
+ */TALER_TESTING_cmd_malform_response
("malform-history",
PROXY_MERCHANT_CONFIG_FILE),
@@ -545,8 +540,7 @@ run (void *cls,
* This block tests whether a refund_deadline and/or
* wire_transfer_deadline very far in the future do NOT
* result in any wire transfer from the aggregator (#5366).
- */
- struct TALER_TESTING_Command unaggregation[] = {
+ */struct TALER_TESTING_Command unaggregation[] = {
CMD_TRANSFER_TO_EXCHANGE
("create-reserve-unaggregation",
@@ -672,8 +666,7 @@ run (void *cls,
brutto 2.00 -
deposit fee 0.01 * 2 -
wire fee 0.01
- */
- "EUR:1.97",
+ */"EUR:1.97",
EXCHANGE_ACCOUNT_NO,
MERCHANT_ACCOUNT_NO),
TALER_TESTING_cmd_modify_object_dl
@@ -776,8 +769,7 @@ run (void *cls,
brutto 2.00 -
deposit fee 0.01 * 2 -
wire fee 0.01
- */
- "EUR:1.97",
+ */"EUR:1.97",
EXCHANGE_ACCOUNT_NO,
MERCHANT_ACCOUNT_NO),
@@ -786,16 +778,13 @@ run (void *cls,
* coin contributes 0.99 to the final wire transfer. The
* wire transfer itself drains 0.01-EUR from the total amount.
* Therefore, wire transferring 1-EUR coin results in a net
- * of: 0.99 - 0.01 = 0.98. */
-
- /**
+ * of: 0.99 - 0.01 = 0.98. *//**
* NOTE: the following two hacks aim at modifying the
* communication between the merchant and the exchange.
* In particular, they are supposed to modify the call
* to /track/transfer issued from the merchant to the
* exchange that happens _before_ the call to /track/transaction
- * issued below by the test case (to the merchant backend.) */
- TALER_TESTING_cmd_modify_object_dl
+ * issued below by the test case (to the merchant backend.)
*/TALER_TESTING_cmd_modify_object_dl
("hack-0",
PROXY_EXCHANGE_CONFIG_FILE,
"total",
@@ -1042,6 +1031,7 @@ run (void *cls,
fakebank_url);
}
+
/**
* Kill, wait, and destroy convenience function.
*
@@ -1137,4 +1127,5 @@ main (int argc,
return 0;
}
+
/* end of test_merchant_api_twisted.c */
diff --git a/src/lib/testing_api_cmd_history.c
b/src/lib/testing_api_cmd_history.c
index fc1b269..5a776fc 100644
--- a/src/lib/testing_api_cmd_history.c
+++ b/src/lib/testing_api_cmd_history.c
@@ -30,7 +30,6 @@
#include "taler_merchant_testing_lib.h"
-
/**
* State for a "history" CMD.
*/
@@ -341,6 +340,7 @@ cmd_history2 (const char *label,
return cmd;
}
+
/**
* Make a "history" command.
*
diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c
index 3be5d8d..3e9fa37 100644
--- a/src/lib/testing_api_cmd_pay.c
+++ b/src/lib/testing_api_cmd_pay.c
@@ -352,6 +352,7 @@ check_payment_cb (void *cls,
TALER_TESTING_interpreter_next (cps->is);
}
+
/**
* Run a /check-payment CMD.
*
@@ -394,6 +395,7 @@ check_payment_run (void *cls,
GNUNET_assert (NULL != cps->cpo);
}
+
/**
* Make a "check payment" test command.
*
@@ -433,6 +435,7 @@ TALER_TESTING_cmd_check_payment (const char *label,
}
+
/**
* Parse the @a coins specification and grow the @a pc
* array with the coins found, updating @a npc.
@@ -636,6 +639,7 @@ pay_cb (void *cls,
TALER_TESTING_interpreter_next (ps->is);
}
+
/**
* Callback for a "pay abort" operation. Mainly, check HTTP
* response code was as expected and stores refund permissions
@@ -874,6 +878,7 @@ _pay_run (const char *merchant_url,
return ret;
}
+
/**
* Run a "pay" CMD.
*
@@ -903,6 +908,7 @@ pay_run (void *cls,
TALER_TESTING_FAIL (is);
}
+
/**
* Free a "pay" CMD, and cancel it if need be.
*
@@ -949,9 +955,9 @@ pay_traits (void *cls,
const struct TALER_TESTING_Command *proposal_cmd;
struct GNUNET_CRYPTO_EddsaPublicKey *merchant_pub;
- if ( NULL ==
- (proposal_cmd = TALER_TESTING_interpreter_lookup_command
- (ps->is, ps->proposal_reference)))
+ if (NULL ==
+ (proposal_cmd = TALER_TESTING_interpreter_lookup_command
+ (ps->is, ps->proposal_reference)))
{
GNUNET_break (0);
return GNUNET_SYSERR;
@@ -998,6 +1004,7 @@ pay_traits (void *cls,
return GNUNET_SYSERR;
}
+
/**
* Make a "pay" test command.
*
@@ -1073,6 +1080,7 @@ pay_abort_cleanup (void *cls,
GNUNET_free (pas);
}
+
/**
* Run a "pay abort" CMD.
*
@@ -1134,6 +1142,7 @@ pay_abort_run (void *cls,
TALER_TESTING_FAIL (is);
}
+
/**
* Offer internal data useful to other commands.
*
@@ -1170,6 +1179,7 @@ pay_abort_traits (void *cls,
return GNUNET_SYSERR;
}
+
/**
* Make a "pay abort" test command.
*
@@ -1204,6 +1214,7 @@ TALER_TESTING_cmd_pay_abort (const char *label,
return cmd;
}
+
/**
* Function called with the result of a /pay again operation,
* check signature and HTTP response code are good.
@@ -1242,9 +1253,9 @@ pay_again_cb (void *cls,
return;
}
- if ( NULL ==
- (pay_cmd = TALER_TESTING_interpreter_lookup_command
- (pas->is, pas->pay_reference)))
+ if (NULL ==
+ (pay_cmd = TALER_TESTING_interpreter_lookup_command
+ (pas->is, pas->pay_reference)))
TALER_TESTING_FAIL (pas->is);
if (MHD_HTTP_OK == http_status)
@@ -1287,6 +1298,7 @@ pay_again_cb (void *cls,
TALER_TESTING_interpreter_next (pas->is);
}
+
/**
* Run a "pay again" CMD.
*
@@ -1337,6 +1349,7 @@ pay_again_run (void *cls,
TALER_TESTING_FAIL (is);
}
+
/**
* Free and possibly cancel a "pay again" CMD.
*
@@ -1361,6 +1374,7 @@ pay_again_cleanup (void *cls,
GNUNET_free (pas);
}
+
/**
* Make a "pay again" test command. Its purpose is to
* take all the data from a aborted "pay" CMD, and use
@@ -1442,6 +1456,7 @@ abort_refund_cb (void *cls,
TALER_TESTING_interpreter_next (pars->is);
}
+
/**
* Free the state of a "pay abort refund" CMD, and possibly
* cancel a pending operation.
@@ -1466,6 +1481,7 @@ pay_abort_refund_cleanup (void *cls,
GNUNET_free (pars);
}
+
/**
* Run a "pay abort refund" CMD.
*
@@ -1489,9 +1505,9 @@ pay_abort_refund_run (void *cls,
pars->is = is;
- if ( NULL ==
- (abort_cmd = TALER_TESTING_interpreter_lookup_command
- (is, pars->abort_reference)) )
+ if (NULL ==
+ (abort_cmd = TALER_TESTING_interpreter_lookup_command
+ (is, pars->abort_reference)) )
TALER_TESTING_FAIL (is);
if (GNUNET_OK != TALER_TESTING_get_trait_uint
@@ -1576,4 +1592,5 @@ TALER_TESTING_cmd_pay_abort_refund
return cmd;
}
+
/* end of testing_api_cmd_pay.c */
diff --git a/src/lib/testing_api_cmd_proposal.c
b/src/lib/testing_api_cmd_proposal.c
index f5e282c..5e1f4eb 100644
--- a/src/lib/testing_api_cmd_proposal.c
+++ b/src/lib/testing_api_cmd_proposal.c
@@ -418,6 +418,7 @@ proposal_cleanup (void *cls,
GNUNET_free (ps);
}
+
/**
* Free the state of a "proposal lookup" CMD, and possibly
* cancel it if it did not complete.
@@ -477,6 +478,7 @@ TALER_TESTING_cmd_proposal (const char *label,
return cmd;
}
+
/**
* Callback for "proposal lookup" operation, to check the
* response code is as expected.
diff --git a/src/lib/testing_api_cmd_refund.c b/src/lib/testing_api_cmd_refund.c
index 9bd30cc..f592f6a 100644
--- a/src/lib/testing_api_cmd_refund.c
+++ b/src/lib/testing_api_cmd_refund.c
@@ -172,6 +172,7 @@ refund_lookup_cleanup (void *cls,
GNUNET_free (rls);
}
+
/**
* Process POST /refund (increase) response; just checking
* if the HTTP response code is the one expected.
@@ -226,6 +227,7 @@ refund_increase_run (void *cls,
GNUNET_assert (NULL != ris->rio);
}
+
/**
* Callback that frees all the elements in the hashmap
*
@@ -322,9 +324,9 @@ refund_lookup_cb (void *cls,
/* Compare spent coins with refunded, and if they match,
* increase an accumulator. */
- if ( NULL ==
- (pay_cmd = TALER_TESTING_interpreter_lookup_command
- (rls->is, rls->pay_reference)))
+ if (NULL ==
+ (pay_cmd = TALER_TESTING_interpreter_lookup_command
+ (rls->is, rls->pay_reference)))
TALER_TESTING_FAIL (rls->is);
if (GNUNET_OK != TALER_TESTING_get_trait_coin_reference
@@ -344,9 +346,9 @@ refund_lookup_cb (void *cls,
struct TALER_Amount *iamount;
const struct TALER_TESTING_Command *icoin_cmd;
- if ( NULL ==
- (icoin_cmd = TALER_TESTING_interpreter_lookup_command
- (rls->is, icoin_reference)) )
+ if (NULL ==
+ (icoin_cmd = TALER_TESTING_interpreter_lookup_command
+ (rls->is, icoin_reference)) )
{
GNUNET_break (0);
TALER_LOG_ERROR ("Bad reference `%s'\n",
@@ -486,6 +488,7 @@ refund_increase_traits (void *cls,
return GNUNET_SYSERR;
}
+
/**
* Define a "refund increase" CMD.
*
@@ -531,6 +534,7 @@ TALER_TESTING_cmd_refund_increase
return cmd;
}
+
/**
* Define a "refund lookup" CMD.
*
@@ -628,4 +632,5 @@ TALER_TESTING_cmd_refund_lookup_with_amount
return cmd;
}
+
/* end of testing_api_cmd_refund.c */
diff --git a/src/lib/testing_api_cmd_rewind.c b/src/lib/testing_api_cmd_rewind.c
index ba694b8..2e43b75 100644
--- a/src/lib/testing_api_cmd_rewind.c
+++ b/src/lib/testing_api_cmd_rewind.c
@@ -83,6 +83,7 @@ rewind_ip_run (void *cls,
TALER_TESTING_interpreter_next (is);
}
+
/**
* Make the instruction pointer point to @a new_ip
* only if @a counter is greater than zero.
diff --git a/src/lib/testing_api_cmd_tip.c b/src/lib/testing_api_cmd_tip.c
index 77ab919..41757b6 100644
--- a/src/lib/testing_api_cmd_tip.c
+++ b/src/lib/testing_api_cmd_tip.c
@@ -280,6 +280,7 @@ tip_authorize_cb (void *cls,
TALER_TESTING_interpreter_next (tas->is);
}
+
/**
* Offers information from the /tip-authorize CMD state to other
* commands.
@@ -436,7 +437,6 @@ TALER_TESTING_cmd_tip_authorize_with_ec
}
-
/**
* Create a /tip-authorize CMD.
*
@@ -478,6 +478,7 @@ TALER_TESTING_cmd_tip_authorize (const char *label,
return cmd;
}
+
/**
* Callback to process a GET /tip-query request, it mainly
* checks that what the backend returned matches the command's
@@ -575,6 +576,7 @@ tip_query_cb (void *cls,
TALER_TESTING_interpreter_next (tqs->is);
}
+
/**
* Free the state from a /tip-query CMD, and possibly cancel
* a pending /tip-query request.
@@ -597,6 +599,7 @@ tip_query_cleanup (void *cls,
GNUNET_free (tqs);
}
+
/**
* Run a /tip-query CMD.
*
@@ -695,6 +698,7 @@ TALER_TESTING_cmd_tip_query (const char *label,
return cmd;
}
+
/**
* Internal withdraw handle used when withdrawing tips.
*/
@@ -903,14 +907,15 @@ tip_pickup_run (void *cls,
/* Count planchets. */
for (num_planchets = 0;
NULL != tps->amounts[num_planchets];
- num_planchets++);
+ num_planchets++)
+ ;
}
else
{
const unsigned int *np;
- if ( NULL == /* looking for "parent" tip-pickup command */
- (replay_cmd = TALER_TESTING_interpreter_lookup_command
- (is, tps->replay_reference)) )
+ if (NULL == /* looking for "parent" tip-pickup command */
+ (replay_cmd = TALER_TESTING_interpreter_lookup_command
+ (is, tps->replay_reference)) )
TALER_TESTING_FAIL (is);
if (GNUNET_OK != TALER_TESTING_get_trait_uint
@@ -994,6 +999,7 @@ tip_pickup_run (void *cls,
}
}
+
/**
* Free a /tip-pickup CMD state, and possibly cancel a
* pending /tip-pickup request.
@@ -1126,6 +1132,7 @@ TALER_TESTING_cmd_tip_pickup_with_ec
return cmd;
}
+
/**
* Define a /tip-pickup CMD.
*
@@ -1165,6 +1172,7 @@ TALER_TESTING_cmd_tip_pickup
return cmd;
}
+
/**
* This commands does not query the backend at all,
* but just makes up a fake authorization id that will
@@ -1193,4 +1201,5 @@ TALER_TESTING_cmd_tip_authorize_fake (const char *label)
return cmd;
}
+
/* end of testing_api_cmd_tip.c */
diff --git a/src/lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c
index 8d5f7e7..a651a50 100644
--- a/src/lib/testing_api_cmd_track.c
+++ b/src/lib/testing_api_cmd_track.c
@@ -184,6 +184,7 @@ track_transaction_cb (void *cls,
TALER_TESTING_interpreter_next (tts->is);
}
+
/**
* Callback for a /track/transfer operation, only checks if
* response code is the expected one.
@@ -341,7 +342,6 @@ track_transfer_cb
}
-
/**
* Run the "track transfer" CMD.
*
@@ -381,6 +381,7 @@ track_transfer_run (void *cls,
GNUNET_assert (NULL != tts->tth);
}
+
/**
* Run the "track transaction" CMD.
*
@@ -399,9 +400,9 @@ track_transaction_run (void *cls,
const struct TALER_TESTING_Command *pay_cmd;
tts->is = is;
- if ( NULL ==
- (pay_cmd = TALER_TESTING_interpreter_lookup_command
- (is, tts->pay_reference)))
+ if (NULL ==
+ (pay_cmd = TALER_TESTING_interpreter_lookup_command
+ (is, tts->pay_reference)))
TALER_TESTING_FAIL (is);
if (GNUNET_OK != TALER_TESTING_get_trait_order_id
@@ -442,6 +443,7 @@ track_transfer_cleanup (void *cls,
GNUNET_free (tts);
}
+
/**
* Free the state of a "track transaction" CMD, and possibly
* cancel a pending operation thereof.
@@ -513,6 +515,7 @@ track_transaction_traits (void *cls,
return GNUNET_SYSERR;
}
+
/**
* Define a "track transaction" CMD.
*
@@ -585,4 +588,5 @@ TALER_TESTING_cmd_merchant_track_transfer
return cmd;
}
+
/* end of testing_api_cmd_track.c */
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index 520600f..326bfcb 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
@@ -188,7 +188,6 @@ TALER_TESTING_prepare_merchant (const char *config_filename)
GNUNET_OS_process_destroy (dbinit_proc);
-
GNUNET_asprintf (&base_url,
"http://localhost:%llu/";,
port);
diff --git a/src/lib/testing_api_trait_merchant_sig.c
b/src/lib/testing_api_trait_merchant_sig.c
index 4b4e071..5a2f5eb 100644
--- a/src/lib/testing_api_trait_merchant_sig.c
+++ b/src/lib/testing_api_trait_merchant_sig.c
@@ -50,6 +50,7 @@ TALER_TESTING_get_trait_merchant_sig
index);
}
+
/**
* Offer a merchant signature over a contract.
*
@@ -72,4 +73,5 @@ TALER_TESTING_make_trait_merchant_sig
return ret;
}
+
/* end of testing_api_trait_merchant_sig.c */
diff --git a/src/lib/testing_api_trait_planchet.c
b/src/lib/testing_api_trait_planchet.c
index d290e8e..165ce81 100644
--- a/src/lib/testing_api_trait_planchet.c
+++ b/src/lib/testing_api_trait_planchet.c
@@ -49,6 +49,7 @@ TALER_TESTING_get_trait_planchet_secrets
index);
}
+
/**
* Offer planchet secrets.
*
@@ -70,4 +71,5 @@ TALER_TESTING_make_trait_planchet_secrets
return ret;
}
+
/* end of testing_api_trait_planchet.c */
diff --git a/src/lib/testing_api_trait_refund_entry.c
b/src/lib/testing_api_trait_refund_entry.c
index bc947e2..6a27cfb 100644
--- a/src/lib/testing_api_trait_refund_entry.c
+++ b/src/lib/testing_api_trait_refund_entry.c
@@ -52,6 +52,7 @@ TALER_TESTING_get_trait_refund_entry
index);
}
+
/**
* Offer refund entry.
*
diff --git a/src/merchant-tools/taler-merchant-benchmark.c
b/src/merchant-tools/taler-merchant-benchmark.c
index f1e3b57..dedcc22 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -527,6 +527,7 @@ run (void *cls,
result = 1;
}
+
/**
* Send SIGTERM and wait for process termination.
*
@@ -540,6 +541,7 @@ terminate_process (struct GNUNET_OS_Process *process)
GNUNET_OS_process_destroy (process);
}
+
/**
* The main function of the serve tool
*
@@ -588,8 +590,7 @@ main (int argc,
* is no way - yet? - to get the merchant base url.
* Clearly, we could introduce a merchant_base_url
* value into the configuration.
- */
- GNUNET_GETOPT_option_string
+ */GNUNET_GETOPT_option_string
('m',
"merchant-url",
"MU",
@@ -657,8 +658,7 @@ main (int argc,
* is no way - yet? - to get the merchant base url.
* Clearly, we could introduce a merchant_base_url
* value into the configuration.
- */
- GNUNET_GETOPT_option_string
+ */GNUNET_GETOPT_option_string
('m',
"merchant-url",
"MU",
@@ -773,9 +773,9 @@ main (int argc,
return MISSING_BANK_URL;
}
- if ( NULL == (bankd = TALER_TESTING_run_bank
- (cfg_filename,
- bank_url)))
+ if (NULL == (bankd = TALER_TESTING_run_bank
+ (cfg_filename,
+ bank_url)))
{
TALER_LOG_ERROR ("Failed to run the bank\n");
terminate_process (merchantd);
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: tighten formatting rules,
gnunet <=