From 385b3e77dfa1b6bbaee5d0ec9da9bcbd69e91b70 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 31 Oct 2019 12:59:50 +0100 Subject: tighten formatting rules --- src/bank-lib/bank_api_history.c | 2 -- src/bank-lib/fakebank.c | 5 +++++ src/bank-lib/fakebank.h | 1 - src/bank-lib/fakebank_history.c | 1 + src/bank-lib/taler-bank-transfer.c | 1 + src/bank-lib/test_bank_api.c | 1 + src/bank-lib/test_bank_api_new.c | 1 + src/bank-lib/test_bank_api_twisted.c | 1 + src/bank-lib/test_bank_api_with_fakebank.c | 1 + src/bank-lib/test_bank_interpreter.c | 1 + src/bank-lib/testing_api_cmd_history.c | 16 ++++++---------- src/bank-lib/testing_api_cmd_reject.c | 1 + src/bank-lib/testing_api_helpers.c | 1 + 13 files changed, 20 insertions(+), 13 deletions(-) (limited to 'src/bank-lib') diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c index a29598a30..fcb68009f 100644 --- a/src/bank-lib/bank_api_history.c +++ b/src/bank-lib/bank_api_history.c @@ -251,7 +251,6 @@ handle_history_finished (void *cls, } - /** * Backend of both the /history[-range] requests. * @@ -407,7 +406,6 @@ TALER_BANK_history_range (struct GNUNET_CURL_Context *ctx, } - /** * Request the wire transfer history of a bank account. * diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c index 94e2e8d78..e1a5c9bbb 100644 --- a/src/bank-lib/fakebank.c +++ b/src/bank-lib/fakebank.c @@ -713,6 +713,7 @@ handle_history (struct TALER_FAKEBANK_Handle *h, &TFH_handle_history_advance); } + /** * Handle incoming HTTP request for /history-range. * @@ -897,6 +898,8 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h) &run_mhd, h); } + + #else /** * Schedule MHD. This function should be called initially when an @@ -957,6 +960,8 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h) if (NULL != wws) GNUNET_NETWORK_fdset_destroy (wws); } + + #endif diff --git a/src/bank-lib/fakebank.h b/src/bank-lib/fakebank.h index 321bc1336..cc2359014 100644 --- a/src/bank-lib/fakebank.h +++ b/src/bank-lib/fakebank.h @@ -188,7 +188,6 @@ struct HistoryArgs }; - /** * Type for a function that decides whether or not * the history-building loop should iterate once again. diff --git a/src/bank-lib/fakebank_history.c b/src/bank-lib/fakebank_history.c index 2ad363b49..170574522 100644 --- a/src/bank-lib/fakebank_history.c +++ b/src/bank-lib/fakebank_history.c @@ -299,6 +299,7 @@ TFH_build_history_response (struct MHD_Connection *connection, return ret; } + /** * Parse URL history arguments, of _both_ APIs: * /history and /history-range. diff --git a/src/bank-lib/taler-bank-transfer.c b/src/bank-lib/taler-bank-transfer.c index 1d6e2e9e6..625545b6b 100644 --- a/src/bank-lib/taler-bank-transfer.c +++ b/src/bank-lib/taler-bank-transfer.c @@ -270,4 +270,5 @@ main (int argc, char *const *argv) return global_ret; } + /* end taler-bank-transfer.c */ diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c index 6ad47c825..0a34e4b48 100644 --- a/src/bank-lib/test_bank_api.c +++ b/src/bank-lib/test_bank_api.c @@ -226,4 +226,5 @@ main (int argc, return (GNUNET_OK == result) ? 0 : 1; } + /* end of test_bank_api.c */ diff --git a/src/bank-lib/test_bank_api_new.c b/src/bank-lib/test_bank_api_new.c index 31602a1ee..ce99904f3 100644 --- a/src/bank-lib/test_bank_api_new.c +++ b/src/bank-lib/test_bank_api_new.c @@ -178,6 +178,7 @@ run (void *cls, commands); } + int main (int argc, char *const *argv) diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c index 49ce94164..293bef30f 100644 --- a/src/bank-lib/test_bank_api_twisted.c +++ b/src/bank-lib/test_bank_api_twisted.c @@ -215,4 +215,5 @@ main (int argc, return 1; } + /* end of test_bank_api_twisted.c */ diff --git a/src/bank-lib/test_bank_api_with_fakebank.c b/src/bank-lib/test_bank_api_with_fakebank.c index 331968120..c69a0e243 100644 --- a/src/bank-lib/test_bank_api_with_fakebank.c +++ b/src/bank-lib/test_bank_api_with_fakebank.c @@ -171,4 +171,5 @@ main (int argc, return (GNUNET_OK == result) ? 0 : 1; } + /* end of test_bank_api_with_fakebank.c */ diff --git a/src/bank-lib/test_bank_interpreter.c b/src/bank-lib/test_bank_interpreter.c index 7f30f5050..2512dff52 100644 --- a/src/bank-lib/test_bank_interpreter.c +++ b/src/bank-lib/test_bank_interpreter.c @@ -1047,4 +1047,5 @@ TBI_run_interpreter (int *resultp, GNUNET_SCHEDULER_add_shutdown (&do_shutdown, is); } + /* end of test_bank_interpeter.c */ diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c index ca8613141..0b5184ad8 100644 --- a/src/bank-lib/testing_api_cmd_history.c +++ b/src/bank-lib/testing_api_cmd_history.c @@ -34,7 +34,6 @@ #include "taler_fakebank_lib.h" - /** * State for a "history" CMD. */ @@ -267,7 +266,6 @@ print_expected (struct History *h, } - /** * Tell if the current item is beyond the allowed limit. * @@ -338,8 +336,7 @@ build_history (struct TALER_TESTING_Interpreter *is, * @var turns GNUNET_YES whenever either no 'start' value was * given for the history query, or the given value is found * in the list of all the CMDs. - */ - int ok; + */int ok; const uint64_t *row_id_start = NULL; if (NULL != hs->start_row_reference) @@ -399,8 +396,7 @@ build_history (struct TALER_TESTING_Interpreter *is, * The following command allows us to skip over those CMDs * that do not offer a "row_id" trait. Such skipped CMDs are * not interesting for building a history. - */ - if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (pos, + */if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (pos, 0, &row_id)) continue; @@ -533,8 +529,7 @@ build_history (struct TALER_TESTING_Interpreter *is, * Warning: this zeroing is superfluous, as * total doesn't get incremented if 'start' * was given and couldn't be found. - */ - total = 0; + */total = 0; ok = GNUNET_YES; continue; } @@ -598,8 +593,7 @@ build_history (struct TALER_TESTING_Interpreter *is, * _both_ the credit and the debit roles, but _only if_ * the audit goes on both directions.. This needs more * explaination! - */ - if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && + */if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && (hs->account_no == *credit_account_no)) && ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) && (hs->account_no == *debit_account_no)) ) @@ -775,6 +769,7 @@ check_result (struct TALER_TESTING_Interpreter *is, return GNUNET_OK; } + /** * This callback will (1) check that the HTTP response code * is acceptable and (2) that the history is consistent. The @@ -1191,4 +1186,5 @@ TALER_TESTING_cmd_bank_history_range_with_dates } } + /* end of testing_api_cmd_history.c */ diff --git a/src/bank-lib/testing_api_cmd_reject.c b/src/bank-lib/testing_api_cmd_reject.c index 8d37266d1..01c189f16 100644 --- a/src/bank-lib/testing_api_cmd_reject.c +++ b/src/bank-lib/testing_api_cmd_reject.c @@ -183,6 +183,7 @@ reject_traits (void *cls, index); } + /** * Create a "reject" CMD. * diff --git a/src/bank-lib/testing_api_helpers.c b/src/bank-lib/testing_api_helpers.c index 5d371a1a5..2f5ea36f5 100644 --- a/src/bank-lib/testing_api_helpers.c +++ b/src/bank-lib/testing_api_helpers.c @@ -120,6 +120,7 @@ TALER_TESTING_has_in_name (const char *prog_name, return strstr (prog_name + name_pos, marker) != NULL; } + /** * Start the (Python) bank process. Assume the port * is available and the database is clean. Use the "prepare -- cgit v1.2.3