From 684da791cc9ad3c86b4c28089c050ab7efd5e796 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jan 2020 17:22:13 +0100 Subject: [PATCH] fix warnings --- src/auditordb/plugin_auditordb_postgres.c | 47 +++++++++++++++++++ src/exchange-tools/taler-wire.c | 19 ++++++-- src/exchange/taler-exchange-aggregator.c | 1 + .../taler-exchange-httpd_reserve_status.c | 4 ++ .../taler-exchange-httpd_track_transfer.c | 4 ++ src/exchange/taler-exchange-httpd_wire.c | 2 +- src/exchange/taler-exchange-wirewatch.c | 1 + 7 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c index 16ca896de..4ca2b6b35 100644 --- a/src/auditordb/plugin_auditordb_postgres.c +++ b/src/auditordb/plugin_auditordb_postgres.c @@ -838,6 +838,7 @@ postgres_rollback (void *cls, GNUNET_PQ_EXECUTE_STATEMENT_END }; + (void) cls; GNUNET_break (GNUNET_OK == GNUNET_PQ_exec_statements (session->conn, es)); @@ -859,6 +860,7 @@ postgres_commit (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "do_commit", params); @@ -936,6 +938,7 @@ postgres_insert_exchange (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_insert_exchange", params); @@ -962,6 +965,7 @@ postgres_delete_exchange (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_delete_exchange", params); @@ -1007,6 +1011,7 @@ exchange_info_cb (void *cls, { struct ExchangeInfoContext *eic = cls; + (void) cls; for (unsigned int i = 0; i < num_results; i++) { struct TALER_MasterPublicKeyP master_pub; @@ -1059,6 +1064,7 @@ postgres_list_exchanges (void *cls, }; enum GNUNET_DB_QueryStatus qs; + (void) cls; qs = GNUNET_PQ_eval_prepared_multi_select (session->conn, "auditor_list_exchanges", params, @@ -1095,6 +1101,7 @@ postgres_insert_exchange_signkey (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_insert_exchange_signkey", params); @@ -1130,6 +1137,7 @@ postgres_insert_deposit_confirmation (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_deposit_confirmation_insert", params); @@ -1314,6 +1322,7 @@ postgres_insert_denomination_info (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; /* check fees match coin currency */ GNUNET_assert (GNUNET_YES == TALER_amount_cmp_currency_nbo (&issue->value, @@ -1456,6 +1465,7 @@ postgres_select_denomination_info (void *cls, }; enum GNUNET_DB_QueryStatus qs; + (void) cls; qs = GNUNET_PQ_eval_prepared_multi_select (session->conn, "auditor_denominations_select", params, @@ -1497,6 +1507,7 @@ postgres_insert_auditor_progress_reserve (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_insert_reserve", params); @@ -1532,6 +1543,7 @@ postgres_update_auditor_progress_reserve (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_update_reserve", params); @@ -1571,6 +1583,7 @@ postgres_get_auditor_progress_reserve (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_progress_select_reserve", params, @@ -1604,6 +1617,7 @@ postgres_insert_auditor_progress_aggregation (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_insert_aggregation", params); @@ -1636,6 +1650,7 @@ postgres_update_auditor_progress_aggregation (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_update_aggregation", params); @@ -1671,6 +1686,7 @@ postgres_get_auditor_progress_aggregation (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_progress_select_aggregation", params, @@ -1706,6 +1722,7 @@ postgres_insert_auditor_progress_deposit_confirmation (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_insert_deposit_confirmation", params); @@ -1740,6 +1757,7 @@ postgres_update_auditor_progress_deposit_confirmation (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_update_deposit_confirmation", params); @@ -1777,6 +1795,7 @@ postgres_get_auditor_progress_deposit_confirmation (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_progress_select_deposit_confirmation", params, @@ -1813,6 +1832,7 @@ postgres_insert_auditor_progress_coin (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_insert_coin", params); @@ -1848,6 +1868,7 @@ postgres_update_auditor_progress_coin (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_progress_update_coin", params); @@ -1891,6 +1912,7 @@ postgres_get_auditor_progress_coin (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_progress_select_coin", params, @@ -1935,6 +1957,7 @@ postgres_insert_wire_auditor_account_progress (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "wire_auditor_account_progress_insert", params); @@ -1978,6 +2001,7 @@ postgres_update_wire_auditor_account_progress (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "wire_auditor_account_progress_update", params); @@ -2026,6 +2050,7 @@ postgres_get_wire_auditor_account_progress (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "wire_auditor_account_progress_select", params, @@ -2058,6 +2083,7 @@ postgres_insert_wire_auditor_progress (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "wire_auditor_progress_insert", params); @@ -2089,6 +2115,7 @@ postgres_update_wire_auditor_progress (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "wire_auditor_progress_update", params); @@ -2123,6 +2150,7 @@ postgres_get_wire_auditor_progress (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "wire_auditor_progress_select", params, @@ -2165,6 +2193,7 @@ postgres_insert_reserve_info (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; GNUNET_assert (GNUNET_YES == TALER_amount_cmp_currency (reserve_balance, withdraw_fee_balance)); @@ -2207,6 +2236,7 @@ postgres_update_reserve_info (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; GNUNET_assert (GNUNET_YES == TALER_amount_cmp_currency (reserve_balance, withdraw_fee_balance)); @@ -2238,6 +2268,7 @@ postgres_del_reserve_info (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_reserves_delete", params); @@ -2285,6 +2316,7 @@ postgres_get_reserve_info (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_reserves_select", params, @@ -2320,6 +2352,7 @@ postgres_insert_reserve_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; GNUNET_assert (GNUNET_YES == TALER_amount_cmp_currency (reserve_balance, withdraw_fee_balance)); @@ -2358,6 +2391,7 @@ postgres_update_reserve_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_reserve_balance_update", params); @@ -2394,6 +2428,7 @@ postgres_get_reserve_summary (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_reserve_balance_select", params, @@ -2424,6 +2459,7 @@ postgres_insert_wire_fee_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_wire_fee_balance_insert", params); @@ -2453,6 +2489,7 @@ postgres_update_wire_fee_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_wire_fee_balance_update", params); @@ -2485,6 +2522,7 @@ postgres_get_wire_fee_summary (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_wire_fee_balance_select", params, @@ -2527,6 +2565,7 @@ postgres_insert_denomination_balance (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_denomination_pending_insert", params); @@ -2568,6 +2607,7 @@ postgres_update_denomination_balance (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_denomination_pending_update", params); @@ -2611,6 +2651,7 @@ postgres_get_denomination_balance (void *cls, GNUNET_PQ_result_spec_end }; + (void) cls; return GNUNET_PQ_eval_prepared_singleton_select (session->conn, "auditor_denomination_pending_select", params, @@ -2659,6 +2700,7 @@ postgres_insert_balance_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; GNUNET_assert (GNUNET_YES == TALER_amount_cmp_currency (denom_balance, deposit_fee_balance)); @@ -2717,6 +2759,7 @@ postgres_update_balance_summary (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_balance_summary_update", params); @@ -2810,6 +2853,7 @@ postgres_insert_historic_denom_revenue (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_historic_denomination_revenue_insert", params); @@ -2971,6 +3015,7 @@ postgres_insert_historic_reserve_revenue (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_historic_reserve_summary_insert", params); @@ -3119,6 +3164,7 @@ postgres_insert_predicted_result (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_predicted_result_insert", params); @@ -3148,6 +3194,7 @@ postgres_update_predicted_result (void *cls, GNUNET_PQ_query_param_end }; + (void) cls; return GNUNET_PQ_eval_prepared_non_select (session->conn, "auditor_predicted_result_update", params); diff --git a/src/exchange-tools/taler-wire.c b/src/exchange-tools/taler-wire.c index 3251aad41..4cb81f10b 100644 --- a/src/exchange-tools/taler-wire.c +++ b/src/exchange-tools/taler-wire.c @@ -119,6 +119,7 @@ history_cb (void *cls, (void) cls; (void) ec; (void) http_status; + (void) json; if (NULL == details) { fprintf (stdout, @@ -129,8 +130,13 @@ history_cb (void *cls, } fprintf (stdout, - "%llu\n", - (unsigned long long) serial_id); + "%llu: %s->%s (%s) over %s at %s\n", + (unsigned long long) serial_id, + details->debit_account_url, + details->credit_account_url, + TALER_B2S (&details->reserve_pub), + TALER_amount2s (&details->amount), + GNUNET_STRINGS_absolute_time_to_string (details->execution_date)); return GNUNET_OK; } @@ -152,6 +158,7 @@ confirmation_cb (void *cls, uint64_t row_id, struct GNUNET_TIME_Absolute timestamp) { + (void) cls; if (MHD_HTTP_OK != response_code) { fprintf (stderr, @@ -162,7 +169,9 @@ confirmation_cb (void *cls, } fprintf (stdout, - "Wire transfer executed successfully.\n"); + "Wire transfer #%llu executed successfully at %s.\n", + (unsigned long long) row_id, + GNUNET_STRINGS_absolute_time_to_string (timestamp)); global_ret = 0; GNUNET_SCHEDULER_shutdown (); } @@ -255,6 +264,7 @@ execute_history () static void do_shutdown (void *cls) { + (void) cls; if (NULL != ctx) { GNUNET_CURL_fini (ctx); @@ -294,6 +304,9 @@ run (void *cls, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { + (void) cls; + (void) args; + (void) cfgfile; if (NULL == account_section) { fprintf (stderr, diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index 9c11954a3..bfeb78373 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -1639,6 +1639,7 @@ wire_confirm_cb (void *cls, (void) cls; (void) row_id; + (void) wire_timestamp; wpd->eh = NULL; if (MHD_HTTP_OK != http_status_code) { diff --git a/src/exchange/taler-exchange-httpd_reserve_status.c b/src/exchange/taler-exchange-httpd_reserve_status.c index 040bba3af..f6ff2c4ad 100644 --- a/src/exchange/taler-exchange-httpd_reserve_status.c +++ b/src/exchange/taler-exchange-httpd_reserve_status.c @@ -137,6 +137,10 @@ TEH_RESERVE_handler_reserve_status (struct TEH_RequestHandler *rh, int res; int mhd_ret; + (void) rh; + (void) connection_cls; + (void) upload_data; + (void) upload_data_size; res = TALER_MHD_parse_request_arg_data (connection, "reserve_pub", &rsc.reserve_pub, diff --git a/src/exchange/taler-exchange-httpd_track_transfer.c b/src/exchange/taler-exchange-httpd_track_transfer.c index 14671ce0b..1a780c063 100644 --- a/src/exchange/taler-exchange-httpd_track_transfer.c +++ b/src/exchange/taler-exchange-httpd_track_transfer.c @@ -502,6 +502,10 @@ TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, int res; int mhd_ret; + (void) rh; + (void) connection_cls; + (void) upload_data; + (void) upload_data_size; memset (&ctx, 0, sizeof (ctx)); res = TALER_MHD_parse_request_arg_data (connection, "wtid", diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c index 4e4c34db5..b6f9963ed 100644 --- a/src/exchange/taler-exchange-httpd_wire.c +++ b/src/exchange/taler-exchange-httpd_wire.c @@ -137,7 +137,7 @@ TEH_WIRE_handler_wire (struct TEH_RequestHandler *rh, size_t *upload_data_size) { (void) rh; - (void) connection; + (void) connection_cls; (void) upload_data; (void) upload_data_size; GNUNET_assert (NULL != wire_methods); diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c index bce876877..43c5f7642 100644 --- a/src/exchange/taler-exchange-wirewatch.c +++ b/src/exchange/taler-exchange-wirewatch.c @@ -334,6 +334,7 @@ history_cb (void *cls, struct TALER_EXCHANGEDB_Session *session = cls; enum GNUNET_DB_QueryStatus qs; + (void) json; if (NULL == details) { hh = NULL;