From 26ad7c8191a764ed94d81d88752352addeaeda55 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 20 Jan 2020 02:11:03 +0100 Subject: spelling of 'mismatch' --- src/auditor/taler-wire-auditor.c | 8 ++++---- src/auditor/test-auditor.sh | 4 ++-- src/exchange/taler-exchange-httpd_refresh_reveal.c | 8 ++++---- src/exchange/taler-exchange-httpd_refund.c | 2 +- src/exchangedb/plugin_exchangedb_postgres.c | 4 ++-- src/lib/exchange_api_refund.c | 2 +- src/testing/test_exchange_api_twisted.c | 4 ++-- src/testing/testing_api_cmd_bank_history_credit.c | 4 ++-- src/testing/testing_api_cmd_bank_history_debit.c | 2 +- src/testing/testing_api_cmd_recoup.c | 2 +- src/testing/testing_api_cmd_track.c | 4 ++-- src/testing/testing_api_cmd_wire.c | 2 +- src/util/test_amount.c | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c index 6821aedb2..94fd773c9 100644 --- a/src/auditor/taler-wire-auditor.c +++ b/src/auditor/taler-wire-auditor.c @@ -1008,7 +1008,7 @@ check_time_difference (const char *table, return; GNUNET_asprintf (&details, - "execution date missmatch (%s)", + "execution date mismatch (%s)", GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_YES)); report (report_row_minor_inconsistencies, @@ -1093,7 +1093,7 @@ wire_out_cb (void *cls, "amount_justified", TALER_JSON_from_amount (&zero), "wtid", GNUNET_JSON_from_data_auto (wtid), "timestamp", json_from_time_abs (date), - "diagnostic", "recevier account missmatch", + "diagnostic", "recevier account mismatch", "account_section", wa->section_name)); GNUNET_break (GNUNET_OK == TALER_amount_add (&total_bad_amount_out_plus, @@ -1106,7 +1106,7 @@ wire_out_cb (void *cls, "amount_justified", TALER_JSON_from_amount (amount), "wtid", GNUNET_JSON_from_data_auto (wtid), "timestamp", json_from_time_abs (date), - "diagnostic", "receiver account missmatch", + "diagnostic", "receiver account mismatch", "account_section", wa->section_name)); GNUNET_break (GNUNET_OK == TALER_amount_add (&total_bad_amount_out_minus, @@ -1805,7 +1805,7 @@ history_credit_cb (void *cls, "table", "reserves_in", "row", (json_int_t) rii->rowid, "bank_row", (json_int_t) row_off, - "diagnostic", "execution date missmatch")); + "diagnostic", "execution date mismatch")); } cleanup: GNUNET_assert (GNUNET_OK == diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index d945e4ead..00ed05230 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -697,7 +697,7 @@ run_audit echo -n "Testing inconsistency detection... " DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json` -if test "x$DIAG" != "xexecution date missmatch" +if test "x$DIAG" != "xexecution date mismatch" then exit_fail "Reported diagnostic wrong: $DIAG" fi @@ -1045,7 +1045,7 @@ then fi DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json` DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'` - if test "x$DIAG" != "xexecution date missmatch" + if test "x$DIAG" != "xexecution date mismatch" then exit_fail "Reported diagnostic wrong: $DIAG" fi diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c index 7524c604a..2503b5a4f 100644 --- a/src/exchange/taler-exchange-httpd_refresh_reveal.c +++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c @@ -102,8 +102,8 @@ reply_refresh_reveal_success (struct MHD_Connection *connection, * @return a MHD result code */ static int -reply_refresh_reveal_missmatch (struct MHD_Connection *connection, - const struct TALER_RefreshCommitmentP *rc) +reply_refresh_reveal_mismatch (struct MHD_Connection *connection, + const struct TALER_RefreshCommitmentP *rc) { return TALER_MHD_reply_json_pack (connection, MHD_HTTP_CONFLICT, @@ -410,8 +410,8 @@ refresh_reveal_transaction (void *cls, &rc_expected)) { GNUNET_break_op (0); - *mhd_ret = reply_refresh_reveal_missmatch (connection, - &rc_expected); + *mhd_ret = reply_refresh_reveal_mismatch (connection, + &rc_expected); return GNUNET_DB_STATUS_HARD_ERROR; } } /* end of checking "rc_expected" */ diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c index ebcd937c5..8c6e90302 100644 --- a/src/exchange/taler-exchange-httpd_refund.c +++ b/src/exchange/taler-exchange-httpd_refund.c @@ -316,7 +316,7 @@ refund_transaction (void *cls, TALER_amount_cmp_currency (&refund->details.refund_fee, &dep->deposit_fee)) ) { - GNUNET_break_op (0); /* currency missmatch */ + GNUNET_break_op (0); /* currency mismatch */ TEH_plugin->free_coin_transaction_list (TEH_plugin->cls, tl); *mhd_ret = reply_refund_failure (connection, diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 44cfdfab4..9f330cc8c 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -2140,7 +2140,7 @@ postgres_insert_withdraw_info (void *cls, left before we tried this; however, concurrent operations may have changed the situation by now. We should re-try the transaction. */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Withdrawal from reserve `%s' refused due to balance missmatch. Retrying.\n", + "Withdrawal from reserve `%s' refused due to balance mismatch. Retrying.\n", TALER_B2S (&collectable->reserve_pub)); return GNUNET_DB_STATUS_SOFT_ERROR; } @@ -5085,7 +5085,7 @@ postgres_insert_reserve_closed (void *cls, left before we tried this; however, concurrent operations may have changed the situation by now. We should re-try the transaction. */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Closing of reserve `%s' refused due to balance missmatch. Retrying.\n", + "Closing of reserve `%s' refused due to balance mismatch. Retrying.\n", TALER_B2S (reserve_pub)); return GNUNET_DB_STATUS_HARD_ERROR; } diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c index 371da0a5a..ef9a43596 100644 --- a/src/lib/exchange_api_refund.c +++ b/src/lib/exchange_api_refund.c @@ -183,7 +183,7 @@ handle_refund_finished (void *cls, (it was too late for the refund). */ break; case MHD_HTTP_PRECONDITION_FAILED: - /* Client request was inconsistent; might be a currency missmatch + /* Client request was inconsistent; might be a currency mismatch problem. */ break; case MHD_HTTP_CONFLICT: diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c index 46807e9c0..a3a038d40 100644 --- a/src/testing/test_exchange_api_twisted.c +++ b/src/testing/test_exchange_api_twisted.c @@ -187,7 +187,7 @@ run (void *cls, "EUR:5", MHD_HTTP_OK), TALER_TESTING_cmd_refund - ("refund-currency-missmatch", + ("refund-currency-mismatch", MHD_HTTP_PRECONDITION_FAILED, "USD:5", "USD:0.01", @@ -220,7 +220,7 @@ run (void *cls, bc.user42_payto, /* This parameter will make any comparison about h_contract_terms fail, when /refund will be handled. - So in other words, this is h_contract missmatch. */ + So in other words, this is h_contract mismatch. */ "{\"items\":[{\"name\":\"ice skate\"," "\"value\":\"EUR:5\"}]}", GNUNET_TIME_UNIT_MINUTES, diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c index 8fb16fc6f..aff50d830 100644 --- a/src/testing/testing_api_cmd_bank_history_credit.c +++ b/src/testing/testing_api_cmd_bank_history_credit.c @@ -142,7 +142,7 @@ history_traits (void *cls, * * @param h what we expected. * @param h_len number of entries in @a h. - * @param off position of the missmatch. + * @param off position of the mismatch. */ static void print_expected (struct History *h, @@ -296,7 +296,7 @@ build_history (struct TALER_TESTING_Interpreter *is, continue; /* skip until we find the marker */ if (0 != strcasecmp (hs->account_url, exchange_credit_url)) - continue; /* account missmatch */ + continue; /* account mismatch */ if (total >= GNUNET_MAX (hs->num_results, -hs->num_results) ) { diff --git a/src/testing/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c index dea6bee95..38d7ab95e 100644 --- a/src/testing/testing_api_cmd_bank_history_debit.c +++ b/src/testing/testing_api_cmd_bank_history_debit.c @@ -146,7 +146,7 @@ history_traits (void *cls, * * @param h what we expected. * @param h_len number of entries in @a h. - * @param off position of the missmatch. + * @param off position of the mismatch. */ static void print_expected (struct History *h, diff --git a/src/testing/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c index c12f67f6e..add54b87f 100644 --- a/src/testing/testing_api_cmd_recoup.c +++ b/src/testing/testing_api_cmd_recoup.c @@ -233,7 +233,7 @@ recoup_cb (void *cls, if (0 != TALER_amount_cmp (amount, &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Total amount missmatch to command %s\n", + "Total amount mismatch to command %s\n", cmd->label); json_dumpf (full_response, stderr, 0); TALER_TESTING_interpreter_fail (is); diff --git a/src/testing/testing_api_cmd_track.c b/src/testing/testing_api_cmd_track.c index e5c7160f6..2b7263cda 100644 --- a/src/testing/testing_api_cmd_track.c +++ b/src/testing/testing_api_cmd_track.c @@ -545,7 +545,7 @@ track_transfer_cb (void *cls, &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Total amount missmatch to command %s - " + "Total amount mismatch to command %s - " "%s vs %s\n", cmd->label, TALER_amount_to_string (total_amount), @@ -569,7 +569,7 @@ track_transfer_cb (void *cls, &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Wire fee missmatch to command %s\n", + "Wire fee mismatch to command %s\n", cmd->label); json_dumpf (json, stderr, 0); TALER_TESTING_interpreter_fail (is); diff --git a/src/testing/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c index 05ad604c1..609a875c5 100644 --- a/src/testing/testing_api_cmd_wire.c +++ b/src/testing/testing_api_cmd_wire.c @@ -125,7 +125,7 @@ wire_cb (void *cls, &expected_fee)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Wire fee missmatch to command %s\n", + "Wire fee mismatch to command %s\n", cmd->label); TALER_TESTING_interpreter_fail (ws->is); GNUNET_free (method); diff --git a/src/util/test_amount.c b/src/util/test_amount.c index 2fd8ce6a8..7bb47caf8 100644 --- a/src/util/test_amount.c +++ b/src/util/test_amount.c @@ -114,7 +114,7 @@ main (int argc, TALER_amount_cmp_currency (&a1, &a2)); - /* test subtraction failure (currency missmatch) */ + /* test subtraction failure (currency mismatch) */ GNUNET_assert (GNUNET_SYSERR == TALER_amount_subtract (&a3, &a3, -- cgit v1.2.3