From 163b23f27a7f6179489956de791794d4f475f61e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 27 Mar 2020 20:39:15 +0100 Subject: removing inappropriate i18n code --- src/auditor/taler-auditor-exchange.c | 2 +- src/auditor/taler-auditor-httpd.c | 2 +- src/auditor/taler-auditor-sign.c | 2 +- src/auditor/taler-helper-auditor-aggregation.c | 2 +- src/auditor/taler-helper-auditor-coins.c | 2 +- src/exchange-tools/taler-exchange-keyup.c | 2 +- src/exchange/taler-exchange-httpd.c | 2 +- src/exchangedb/exchangedb_denomkeys.c | 3 +-- src/lib/exchange_api_handle.c | 20 ++++++++------------ 9 files changed, 16 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c index 7e105bc69..41df335b3 100644 --- a/src/auditor/taler-auditor-exchange.c +++ b/src/auditor/taler-auditor-exchange.c @@ -109,7 +109,7 @@ main (int argc, cfgfile)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Malformed configuration file `%s', exit ...\n"), + "Malformed configuration file `%s', exit ...\n", cfgfile); GNUNET_free_non_null (cfgfile); return 1; diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c index d6b601573..c84327045 100644 --- a/src/auditor/taler-auditor-httpd.c +++ b/src/auditor/taler-auditor-httpd.c @@ -576,7 +576,7 @@ main (int argc, cfgfile)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Malformed configuration file `%s', exit ...\n"), + "Malformed configuration file `%s', exiting ...\n", cfgfile); GNUNET_free_non_null (cfgfile); return 1; diff --git a/src/auditor/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c index 0863282d6..62f565907 100644 --- a/src/auditor/taler-auditor-sign.c +++ b/src/auditor/taler-auditor-sign.c @@ -211,7 +211,7 @@ main (int argc, cfgfile)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Malformed configuration file `%s', exit ...\n"), + "Malformed configuration file `%s', exiting ...\n", cfgfile); GNUNET_free_non_null (cfgfile); return 1; diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c index e0fe1e2ce..190b7260e 100644 --- a/src/auditor/taler-helper-auditor-aggregation.c +++ b/src/auditor/taler-helper-auditor-aggregation.c @@ -1388,7 +1388,7 @@ analyze_aggregations (void *cls) return qs; } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ ("Concluded aggregation audit step at %llu\n"), + "Concluded aggregation audit step at %llu\n", (unsigned long long) ppa.last_wire_out_serial_id); return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c index 50e801d35..24d490343 100644 --- a/src/auditor/taler-helper-auditor-coins.c +++ b/src/auditor/taler-helper-auditor-coins.c @@ -2419,7 +2419,7 @@ analyze_coins (void *cls) return qs; } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ ("Concluded coin audit step at %llu/%llu/%llu/%llu/%llu\n"), + "Concluded coin audit step at %llu/%llu/%llu/%llu/%llu\n", (unsigned long long) ppc.last_deposit_serial_id, (unsigned long long) ppc.last_melt_serial_id, (unsigned long long) ppc.last_refund_serial_id, diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c index 70f74aa47..544e9634f 100644 --- a/src/exchange-tools/taler-exchange-keyup.c +++ b/src/exchange-tools/taler-exchange-keyup.c @@ -1395,7 +1395,7 @@ run (void *cls, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "exchange", "LOOKAHEAD_SIGN", - _ ("must not be zero")); + "must not be zero"); global_ret = 1; return; } diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index feb599bd0..f1777cf7f 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -1249,7 +1249,7 @@ main (int argc, cfgfile)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Malformed configuration file `%s', exit ...\n"), + "Malformed configuration file `%s', exit ...\n", cfgfile); GNUNET_free_non_null (cfgfile); return 1; diff --git a/src/exchangedb/exchangedb_denomkeys.c b/src/exchangedb/exchangedb_denomkeys.c index b7603df52..6c5465869 100644 --- a/src/exchangedb/exchangedb_denomkeys.c +++ b/src/exchangedb/exchangedb_denomkeys.c @@ -481,8 +481,7 @@ revocations_iterate_cb (void *cls, &ric->master_pub->eddsa_pub)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ( - "Invalid revocation file `%s' found and ignored (bad signature)\n"), + "Invalid revocation file `%s' found and ignored (bad signature)\n", filename); return GNUNET_OK; } diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index db74b156b..a9d28a6a1 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -282,8 +282,7 @@ TEAH_acc_confirmation_cb (void *cls, if (MHD_HTTP_OK != http_status) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ ( - "Failed to submit deposit confirmation to auditor `%s' with HTTP status %d (EC: %d). This is acceptable if it does not happen often.\n"), + "Failed to submit deposit confirmation to auditor `%s' with HTTP status %d (EC: %d). This is acceptable if it does not happen often.\n", ale->auditor_url, http_status, (int) ec); @@ -312,8 +311,7 @@ TEAH_get_auditors_for_dc (struct TALER_EXCHANGE_Handle *h, if (NULL == h->auditors_head) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ ( - "No auditor available for exchange `%s'. Not submitting deposit confirmations.\n"), + "No auditor available for exchange `%s'. Not submitting deposit confirmations.\n", h->url); return; } @@ -676,7 +674,7 @@ auditor_version_cb ( { /* In this case, we don't mark the auditor as 'up' */ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ ("Auditor `%s' gave unexpected version response.\n"), + "Auditor `%s' gave unexpected version response.\n", ale->auditor_url); return; } @@ -684,19 +682,18 @@ auditor_version_cb ( if (0 != (TALER_AUDITOR_VC_INCOMPATIBLE & compat)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ ("Auditor `%s' runs incompatible protocol version!\n"), + "Auditor `%s' runs incompatible protocol version!\n", ale->auditor_url); if (0 != (TALER_AUDITOR_VC_OLDER & compat)) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ ("Auditor `%s' runs outdated protocol version!\n"), + "Auditor `%s' runs outdated protocol version!\n", ale->auditor_url); } if (0 != (TALER_AUDITOR_VC_NEWER & compat)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ ( - "Auditor `%s' runs more recent incompatible version. We should upgrade!\n"), + "Auditor `%s' runs more recent incompatible version. We should upgrade!\n", ale->auditor_url); } return; @@ -1297,7 +1294,7 @@ keys_completed_cb (void *cls, for (unsigned int i = 0; iale == ale); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ ( - "Not sending deposit confirmation to auditor `%s' due to exchange disconnect\n"), + "Not sending deposit confirmation to auditor `%s' due to exchange disconnect\n", ale->auditor_url); TALER_AUDITOR_deposit_confirmation_cancel (aie->dch); GNUNET_CONTAINER_DLL_remove (ale->ai_head, -- cgit v1.2.3