From 8dbc19758b87c41ada780c20edac0c500ab2daa1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jan 2020 19:16:33 +0100 Subject: [PATCH] fix compiler warnings --- configure.ac | 2 +- src/benchmark/taler-exchange-benchmark.c | 5 +++++ src/exchange/taler-exchange-aggregator.c | 2 +- src/exchange/taler-exchange-httpd_refresh_reveal.c | 1 - src/exchangedb/exchangedb_denomkeys.c | 1 - src/json/json_wire.c | 9 ++++----- src/lib/exchange_api_common.c | 1 + src/lib/exchange_api_handle.c | 4 ---- src/lib/exchange_api_payback.c | 1 + src/lib/exchange_api_refresh_link.c | 9 +++++---- src/lib/testing_api_cmd_withdraw.c | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index bb771dc2a..6561c8754 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_PROG_CC_C99 CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS" # Checks for header files. -AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h]) +AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h sys/socket.h sys/un.h netinet/in.h netinet/ip.h]) # Require minimum libgcrypt version diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index ae65d44bf..563d4596c 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -818,6 +818,11 @@ main (int argc, TALER_LOG_ERROR ("-p option value given is too large\n"); return BAD_CLI_ARG; } + if (0 == howmany_clients) + { + TALER_LOG_ERROR ("-p option value must not be zero\n"); + return BAD_CLI_ARG; + } if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index bfeb78373..0c6b6a9d7 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -1140,7 +1140,7 @@ expired_reserve_cb (void *cls, left, closing_fee); else - ret = GNUNET_DB_STATUS_HARD_ERROR; + qs = GNUNET_DB_STATUS_HARD_ERROR; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Closing reserve %s over %s (%d, %d)\n", TALER_B2S (reserve_pub), diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c index 56e29adfb..7524c604a 100644 --- a/src/exchange/taler-exchange-httpd_refresh_reveal.c +++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c @@ -647,7 +647,6 @@ resolve_refresh_reveal_denominations (struct TEH_KS_StateHandle *key_state, GNUNET_JSON_spec_fixed_auto (NULL, &link_sigs[i]), GNUNET_JSON_spec_end () }; - int res; res = TALER_MHD_parse_json_array (connection, link_sigs_json, diff --git a/src/exchangedb/exchangedb_denomkeys.c b/src/exchangedb/exchangedb_denomkeys.c index 5a26ce6bd..815275e81 100644 --- a/src/exchangedb/exchangedb_denomkeys.c +++ b/src/exchangedb/exchangedb_denomkeys.c @@ -69,7 +69,6 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, int ret; struct RevocationFileP rd; - ret = GNUNET_SYSERR; GNUNET_asprintf (&fn, "%s" DIR_SEPARATOR_STR "%s.rev", diff --git a/src/json/json_wire.c b/src/json/json_wire.c index 229878ae4..74a0b75f4 100644 --- a/src/json/json_wire.c +++ b/src/json/json_wire.c @@ -233,7 +233,6 @@ validate_iban (const char *iban) unsigned long long dividend; unsigned long long remainder; int nread; - int ret; unsigned int i; unsigned int j; @@ -289,10 +288,10 @@ validate_iban (const char *iban) for (unsigned int i = 0; idenom_keys = GNUNET_new_array (len, struct TALER_EXCHANGE_AuditorDenominationInfo); - i = 0; off = 0; json_array_foreach (keys, i, key) { struct TALER_AuditorSignatureP auditor_sig; @@ -911,7 +910,6 @@ decode_keys_json (const json_t *resp_obj, key_data->sign_keys = GNUNET_new_array (key_data->num_sign_keys, struct TALER_EXCHANGE_SigningPublicKey); - index = 0; json_array_foreach (sign_keys_array, index, sign_key_obj) { EXITIF (GNUNET_SYSERR == parse_json_signkey (&key_data->sign_keys[index], @@ -933,7 +931,6 @@ decode_keys_json (const json_t *resp_obj, "denoms"))); EXITIF (JSON_ARRAY != json_typeof (denom_keys_array)); - index = 0; json_array_foreach (denom_keys_array, index, denom_key_obj) { struct TALER_EXCHANGE_DenomPublicKey dk; int found = GNUNET_NO; @@ -992,7 +989,6 @@ decode_keys_json (const json_t *resp_obj, EXITIF (JSON_ARRAY != json_typeof (auditors_array)); /* Merge with the existing auditor information we have (/keys cherry picking) */ - index = 0; json_array_foreach (auditors_array, index, auditor_info) { struct TALER_EXCHANGE_AuditorInformation ai; int found = GNUNET_NO; diff --git a/src/lib/exchange_api_payback.c b/src/lib/exchange_api_payback.c index b28dc1376..c20208055 100644 --- a/src/lib/exchange_api_payback.c +++ b/src/lib/exchange_api_payback.c @@ -219,6 +219,7 @@ handle_payback_finished (void *cls, { GNUNET_break_op (0); response_code = 0; + break; } TALER_EXCHANGE_payback_cancel (ph); return; diff --git a/src/lib/exchange_api_refresh_link.c b/src/lib/exchange_api_refresh_link.c index 1a2fc719c..6a747d1b6 100644 --- a/src/lib/exchange_api_refresh_link.c +++ b/src/lib/exchange_api_refresh_link.c @@ -203,7 +203,8 @@ parse_refresh_link_ok (struct TALER_EXCHANGE_RefreshLinkHandle *rlh, loop once for 'session=0' in most cases. num_coins tracks the size of the 1d array we return, - whilst 'i' and 'session' track the 2d array. */for (session = 0; sessionlabel); + (NULL != cmd) ? cmd->label : ""); GNUNET_assert (0); } else