From 2696688aa31bd058ebff6610660d7e6d607c6e50 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 29 Oct 2019 18:04:04 +0100 Subject: fix compiler warnings --- src/bank-lib/fakebank.c | 25 ++++-- src/bank-lib/fakebank_history.c | 1 + src/bank-lib/taler-fakebank-run.c | 7 +- src/bank-lib/testing_api_cmd_history.c | 137 +++++++++++++++++---------------- src/bank-lib/testing_api_cmd_reject.c | 57 +++++++------- 5 files changed, 123 insertions(+), 104 deletions(-) (limited to 'src/bank-lib') diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c index 4323afdc3..94e2e8d78 100644 --- a/src/bank-lib/fakebank.c +++ b/src/bank-lib/fakebank.c @@ -367,7 +367,9 @@ handle_mhd_completion_callback (void *cls, enum MHD_RequestTerminationCode toe) { /* struct TALER_FAKEBANK_Handle *h = cls; */ - + (void) cls; + (void) connection; + (void) toe; GNUNET_JSON_post_parser_cleanup (*con_cls); *con_cls = NULL; } @@ -607,6 +609,8 @@ handle_home_page (struct TALER_FAKEBANK_Handle *h, struct MHD_Response *resp; #define HELLOMSG "Hello, Fakebank!" + (void) h; + (void) con_cls; resp = MHD_create_response_from_buffer (strlen (HELLOMSG), HELLOMSG, @@ -640,8 +644,10 @@ handle_history (struct TALER_FAKEBANK_Handle *h, const char *delta; struct Transaction *pos; - if (GNUNET_OK != TFH_parse_history_common_args (connection, - &ha)) + (void) con_cls; + if (GNUNET_OK != + TFH_parse_history_common_args (connection, + &ha)) { GNUNET_break (0); return MHD_NO; @@ -666,9 +672,10 @@ handle_history (struct TALER_FAKEBANK_Handle *h, ha.range = &hri; if (NULL == start) + { pos = 0 > hri.count ? h->transactions_tail : h->transactions_head; - + } else if (NULL != h->transactions_head) { for (pos = h->transactions_head; @@ -727,8 +734,10 @@ handle_history_range (struct TALER_FAKEBANK_Handle *h, long long unsigned int end_stamp; struct Transaction *pos; - if (GNUNET_OK != TFH_parse_history_common_args (connection, - &ha)) + (void) con_cls; + if (GNUNET_OK != + TFH_parse_history_common_args (connection, + &ha)) { GNUNET_break (0); return MHD_NO; @@ -771,6 +780,7 @@ handle_history_range (struct TALER_FAKEBANK_Handle *h, &TFH_handle_history_range_advance); } + /** * Handle incoming HTTP request. * @@ -796,11 +806,10 @@ handle_mhd_request (void *cls, { struct TALER_FAKEBANK_Handle *h = cls; + (void) version; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fakebank, serving: %s\n", url); - - if ( (0 == strcasecmp (url, "/")) && (0 == strcasecmp (method, diff --git a/src/bank-lib/fakebank_history.c b/src/bank-lib/fakebank_history.c index b1770bb85..2ad363b49 100644 --- a/src/bank-lib/fakebank_history.c +++ b/src/bank-lib/fakebank_history.c @@ -130,6 +130,7 @@ struct Transaction * TFH_handle_history_range_skip (const struct HistoryArgs *ha, const struct Transaction *pos) { + (void) ha; /* Transactions * are stored from "head"/older to "tail"/younger. */ return pos->next; diff --git a/src/bank-lib/taler-fakebank-run.c b/src/bank-lib/taler-fakebank-run.c index 51d054bca..2ed21d52d 100644 --- a/src/bank-lib/taler-fakebank-run.c +++ b/src/bank-lib/taler-fakebank-run.c @@ -43,11 +43,13 @@ run (void *cls, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { - + (void) cls; + (void) args; + (void) cfgfile; + (void) cfg; if (NULL == TALER_FAKEBANK_start (8082)) ret = 1; ret = 0; - } @@ -74,6 +76,5 @@ main (int argc, &run, NULL)) return 1; - return ret; } diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c index e69cd7c1a..ca8613141 100644 --- a/src/bank-lib/testing_api_cmd_history.c +++ b/src/bank-lib/testing_api_cmd_history.c @@ -64,9 +64,9 @@ struct HistoryState /** * How many rows we want in the result, _at most_. In * the case of /history-range, we fake this value with - * INT64_MAX. + * UINT64_MAX. */ - long long num_results; + unsigned long long num_results; /** * Handle to a pending "history" operation. @@ -159,6 +159,10 @@ history_traits (void *cls, const char *trait, unsigned int index) { + (void) cls; + (void) ret; + (void) trait; + (void) index; /* Must define this function because some callbacks * look for certain traits on _all_ the commands. */ return GNUNET_SYSERR; @@ -184,7 +188,7 @@ test_cancelled (struct TALER_TESTING_Interpreter *is, current_cmd = &is->commands[off]; TALER_LOG_INFO ("Is `%s' rejected?\n", current_cmd->label); - for (unsigned int i = 0; iip; i++) + for (int i = 0; iip; i++) { const struct TALER_TESTING_Command *c = &is->commands[i]; @@ -290,13 +294,10 @@ build_history_hit_limit (uint64_t total, TALER_TESTING_get_trait_absolute_time (pos, 0, ×tamp)); - GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != hs->end_date.abs_value_us); - return timestamp->abs_value_us >= hs->end_date.abs_value_us; } - return total >= hs->num_results; } @@ -714,6 +715,7 @@ compute_result_count (struct TALER_TESTING_Interpreter *is) return total; } + /** * Check that the "/history" response matches the * CMD whose offset in the list of CMDs is @a off. @@ -807,6 +809,7 @@ history_cb (void *cls, struct TALER_TESTING_Interpreter *is = cls; struct HistoryState *hs = is->commands[is->ip].cls; + (void) row_id; /*NOTE: "204 No Content" is used to signal the end of results.*/ if (MHD_HTTP_NO_CONTENT == http_status) { @@ -819,16 +822,19 @@ history_cb (void *cls, GNUNET_break (0); total = build_history (is, &h); - GNUNET_log - (GNUNET_ERROR_TYPE_ERROR, - "Expected history of length %llu, got %llu;" - " HTTP status code: %u, failed: %d\n", - (unsigned long long) total, - (unsigned long long) hs->results_obtained, - http_status, - hs->failed); - print_expected (h, total, UINT_MAX); - free_history (h, total); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Expected history of length %llu, got %llu;" + " HTTP status code: %u/%d, failed: %d\n", + (unsigned long long) total, + (unsigned long long) hs->results_obtained, + http_status, + (int) ec, + hs->failed); + print_expected (h, + total, + UINT_MAX); + free_history (h, + total); TALER_TESTING_interpreter_fail (is); return; } @@ -839,10 +845,9 @@ history_cb (void *cls, if (MHD_HTTP_OK != http_status) { hs->hh = NULL; - GNUNET_log - (GNUNET_ERROR_TYPE_ERROR, - "Unwanted response code from /history[-range]: %u\n", - http_status); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unwanted response code from /history[-range]: %u\n", + http_status); TALER_TESTING_interpreter_fail (is); return; } @@ -892,6 +897,7 @@ history_run (void *cls, const uint64_t *row_id_ptr = &row_id; struct TALER_BANK_AuthenticationData *auth; + (void) cmd; /* Get row_id from trait. */ if (NULL != hs->start_row_reference) { @@ -940,15 +946,14 @@ history_range_run (void *cls, const struct TALER_TESTING_Command *cmd, struct TALER_TESTING_Interpreter *is) { - struct HistoryState *hs = cls; const struct GNUNET_TIME_Absolute *start_date; const struct GNUNET_TIME_Absolute *end_date; struct TALER_BANK_AuthenticationData *auth; + (void) cmd; if (NULL != hs->start_row_reference) { - const struct TALER_TESTING_Command *history_cmd; history_cmd = TALER_TESTING_interpreter_lookup_command @@ -972,7 +977,6 @@ history_range_run (void *cls, if (NULL != hs->end_row_reference) { - const struct TALER_TESTING_Command *history_cmd; history_cmd = TALER_TESTING_interpreter_lookup_command @@ -1017,18 +1021,17 @@ history_range_run (void *cls, * @param cmd the command which is being cleaned up. */ static void -history_cleanup - (void *cls, - const struct TALER_TESTING_Command *cmd) +history_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) { struct HistoryState *hs = cls; + (void) cmd; if (NULL != hs->hh) { TALER_LOG_WARNING ("/history did not complete\n"); TALER_BANK_history_cancel (hs->hh); } - GNUNET_free (hs); } @@ -1041,24 +1044,22 @@ history_cleanup * operation. * @param account_no bank account number to ask the history for. * @param direction which direction this operation is interested. - * @param ascending if GNUNET_YES, the bank will return the rows + * @param ascending if #GNUNET_YES, the bank will return the rows * in ascending (= chronological) order. * @param start_row_reference reference to a command that can * offer a row identifier, to be used as the starting row * to accept in the result. - * @param num_result how many rows we want in the result. - * + * @param num_results how many rows we want in the result. * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_bank_history - (const char *label, - const char *bank_url, - uint64_t account_no, - enum TALER_BANK_Direction direction, - unsigned int ascending, - const char *start_row_reference, - long long num_results) +TALER_TESTING_cmd_bank_history (const char *label, + const char *bank_url, + uint64_t account_no, + enum TALER_BANK_Direction direction, + unsigned int ascending, + const char *start_row_reference, + unsigned long long num_results) { struct HistoryState *hs; @@ -1072,15 +1073,17 @@ TALER_TESTING_cmd_bank_history hs->start_date = GNUNET_TIME_UNIT_FOREVER_ABS; hs->end_date = GNUNET_TIME_UNIT_FOREVER_ABS; - struct TALER_TESTING_Command cmd = { - .label = label, - .cls = hs, - .run = &history_run, - .cleanup = &history_cleanup, - .traits = &history_traits - }; - - return cmd; + { + struct TALER_TESTING_Command cmd = { + .label = label, + .cls = hs, + .run = &history_run, + .cleanup = &history_cleanup, + .traits = &history_traits + }; + + return cmd; + } } @@ -1124,15 +1127,17 @@ TALER_TESTING_cmd_bank_history_range hs->start_date = GNUNET_TIME_UNIT_FOREVER_ABS; hs->end_date = GNUNET_TIME_UNIT_FOREVER_ABS; - struct TALER_TESTING_Command cmd = { - .label = label, - .cls = hs, - .run = &history_range_run, - .cleanup = &history_cleanup, - .traits = &history_traits - }; - - return cmd; + { + struct TALER_TESTING_Command cmd = { + .label = label, + .cls = hs, + .run = &history_range_run, + .cleanup = &history_cleanup, + .traits = &history_traits + }; + + return cmd; + } } @@ -1173,15 +1178,17 @@ TALER_TESTING_cmd_bank_history_range_with_dates hs->start_date = start_date; hs->end_date = end_date; - struct TALER_TESTING_Command cmd = { - .label = label, - .cls = hs, - .run = &history_range_run, - .cleanup = &history_cleanup, - .traits = &history_traits - }; - - return cmd; + { + struct TALER_TESTING_Command cmd = { + .label = label, + .cls = hs, + .run = &history_range_run, + .cleanup = &history_cleanup, + .traits = &history_traits + }; + + return cmd; + } } /* 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 1f19a379d..8d37266d1 100644 --- a/src/bank-lib/testing_api_cmd_reject.c +++ b/src/bank-lib/testing_api_cmd_reject.c @@ -79,14 +79,16 @@ reject_cb (void *cls, { GNUNET_break (0); fprintf (stderr, - "Unexpected response code %u:\n", - http_status); + "Unexpected response code %u/%d\n", + http_status, + (int) ec); TALER_TESTING_interpreter_fail (is); return; } TALER_TESTING_interpreter_next (is); } + /** * Cleanup the state of a "reject" CMD, and possibly * cancel a pending operation thereof. @@ -95,21 +97,21 @@ reject_cb (void *cls, * @param cmd the command. */ static void -reject_cleanup - (void *cls, - const struct TALER_TESTING_Command *cmd) +reject_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) { struct RejectState *rs = cls; + (void) cmd; if (NULL != rs->rh) { TALER_LOG_WARNING ("/reject did not complete\n"); TALER_BANK_reject_cancel (rs->rh); } - GNUNET_free (rs); } + /** * Run the command. * @@ -128,19 +130,18 @@ reject_run (void *cls, const uint64_t *row_id; extern struct TALER_BANK_AuthenticationData AUTHS[]; - deposit_cmd = TALER_TESTING_interpreter_lookup_command - (is, rs->deposit_reference); - + (void) cmd; + deposit_cmd + = TALER_TESTING_interpreter_lookup_command (is, + rs->deposit_reference); if (NULL == deposit_cmd) TALER_TESTING_FAIL (is); - - GNUNET_assert - (GNUNET_OK == TALER_TESTING_GET_TRAIT_CREDIT_ACCOUNT - (deposit_cmd, &credit_account)); - - GNUNET_assert - (GNUNET_OK == TALER_TESTING_GET_TRAIT_ROW_ID - (deposit_cmd, &row_id)); + GNUNET_assert (GNUNET_OK == + TALER_TESTING_GET_TRAIT_CREDIT_ACCOUNT (deposit_cmd, + &credit_account)); + GNUNET_assert (GNUNET_OK == + TALER_TESTING_GET_TRAIT_ROW_ID (deposit_cmd, + &row_id)); TALER_LOG_INFO ("Account %llu rejects deposit\n", (unsigned long long) *credit_account); rs->rh = TALER_BANK_reject (is->ctx, @@ -191,7 +192,6 @@ reject_traits (void *cls, * @param deposit_reference reference to a command that will * provide a "row id" and credit (bank) account to craft * the "reject" request. - * * @return the command. */ struct TALER_TESTING_Command @@ -205,16 +205,17 @@ TALER_TESTING_cmd_bank_reject (const char *label, rs->bank_url = bank_url; rs->deposit_reference = deposit_reference; - struct TALER_TESTING_Command cmd = { - .cls = rs, - .run = &reject_run, - .cleanup = &reject_cleanup, - .label = label, - .traits = &reject_traits - }; - - return cmd; - + { + struct TALER_TESTING_Command cmd = { + .cls = rs, + .run = &reject_run, + .cleanup = &reject_cleanup, + .label = label, + .traits = &reject_traits + }; + + return cmd; + } } -- cgit v1.2.3