From 2ba4773bc79ee6dff50a6322dbbf3569e47708eb Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 10 Mar 2022 02:20:49 +0100 Subject: -update to latest exchange API --- src/authorization/anastasis_authorization_plugin_iban.c | 4 ++-- src/backend/anastasis-httpd_truth-solve.c | 16 ++++++++-------- src/include/gettext.h | 4 ++-- src/lib/anastasis_backup.c | 8 ++++---- src/reducer/anastasis_api_recovery_redux.c | 4 ++-- src/restclient/anastasis_api_keyshare_lookup.c | 8 ++++---- src/restclient/anastasis_api_truth_solve.c | 4 ++-- src/testing/test_anastasis.c | 1 + src/testing/test_anastasis_api.c | 1 + 9 files changed, 26 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/authorization/anastasis_authorization_plugin_iban.c b/src/authorization/anastasis_authorization_plugin_iban.c index bd58c51..e557152 100644 --- a/src/authorization/anastasis_authorization_plugin_iban.c +++ b/src/authorization/anastasis_authorization_plugin_iban.c @@ -477,8 +477,8 @@ test_wire_transfers (struct ANASTASIS_AUTHORIZATION_State *as) MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, NULL)) - ? WTS_FAILED_WITH_REPLY - : WTS_FAILED_WITHOUT_REPLY; + ? WTS_FAILED_WITH_REPLY + : WTS_FAILED_WITHOUT_REPLY; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: return WTS_NOT_READY; case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: diff --git a/src/backend/anastasis-httpd_truth-solve.c b/src/backend/anastasis-httpd_truth-solve.c index 12f232a..2e4fea0 100644 --- a/src/backend/anastasis-httpd_truth-solve.c +++ b/src/backend/anastasis-httpd_truth-solve.c @@ -876,15 +876,15 @@ rate_limit (struct SolveContext *gc) MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, "create_challenge_code (for rate limiting)")) - ? GNUNET_NO - : GNUNET_SYSERR; + ? GNUNET_NO + : GNUNET_SYSERR; } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { return (MHD_YES == reply_rate_limited (gc)) - ? GNUNET_NO - : GNUNET_SYSERR; + ? GNUNET_NO + : GNUNET_SYSERR; } /* decrement trial counter */ ANASTASIS_hash_answer (code + 1, /* always use wrong answer */ @@ -907,13 +907,13 @@ rate_limit (struct SolveContext *gc) MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, "verify_challenge_code")) - ? GNUNET_NO - : GNUNET_SYSERR; + ? GNUNET_NO + : GNUNET_SYSERR; case ANASTASIS_DB_CODE_STATUS_NO_RESULTS: return (MHD_YES == reply_rate_limited (gc)) - ? GNUNET_NO - : GNUNET_SYSERR; + ? GNUNET_NO + : GNUNET_SYSERR; case ANASTASIS_DB_CODE_STATUS_VALID_CODE_STORED: /* this should be impossible, we used code+1 */ GNUNET_assert (0); diff --git a/src/include/gettext.h b/src/include/gettext.h index 705487b..3929b11 100644 --- a/src/include/gettext.h +++ b/src/include/gettext.h @@ -73,8 +73,8 @@ # undef ngettext # define ngettext(Msgid1, Msgid2, N) \ ((N) == 1 \ - ? ((void) (Msgid2), (const char *) (Msgid1)) \ - : ((void) (Msgid1), (const char *) (Msgid2))) + ? ((void) (Msgid2), (const char *) (Msgid1)) \ + : ((void) (Msgid1), (const char *) (Msgid2))) # undef dngettext # define dngettext(Domainname, Msgid1, Msgid2, N) \ ((void) (Domainname), ngettext (Msgid1, Msgid2, N)) diff --git a/src/lib/anastasis_backup.c b/src/lib/anastasis_backup.c index 2e769ca..0cb60dc 100644 --- a/src/lib/anastasis_backup.c +++ b/src/lib/anastasis_backup.c @@ -325,11 +325,11 @@ ANASTASIS_truth_upload2 ( t->url = GNUNET_strdup (provider_url); t->type = GNUNET_strdup (type); t->instructions = (NULL != instructions) - ? GNUNET_strdup (instructions) - : NULL; + ? GNUNET_strdup (instructions) + : NULL; t->mime_type = (NULL != mime_type) - ? GNUNET_strdup (mime_type) - : NULL; + ? GNUNET_strdup (mime_type) + : NULL; t->provider_salt = *provider_salt; t->salt = *salt; t->nonce = *nonce; diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c index 24bc2bc..6026fc0 100644 --- a/src/reducer/anastasis_api_recovery_redux.c +++ b/src/reducer/anastasis_api_recovery_redux.c @@ -2402,8 +2402,8 @@ return_no_policy (struct PolicyDownloadEntry *pd, { enum TALER_ErrorCode ec = TALER_EC_ANASTASIS_REDUCER_NETWORK_FAILED; const char *detail = (offline) - ? "could not contact provider (offline)" - : "provider does not know this policy"; + ? "could not contact provider (offline)" + : "provider does not know this policy"; json_t *estate; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, diff --git a/src/restclient/anastasis_api_keyshare_lookup.c b/src/restclient/anastasis_api_keyshare_lookup.c index 99924d1..5c19172 100644 --- a/src/restclient/anastasis_api_keyshare_lookup.c +++ b/src/restclient/anastasis_api_keyshare_lookup.c @@ -525,8 +525,8 @@ ANASTASIS_keyshare_lookup ( answer_s, "timeout_ms", (0 != timeout.rel_value_us) - ? timeout_ms - : NULL, + ? timeout_ms + : NULL, NULL); GNUNET_free (answer_s); } @@ -538,8 +538,8 @@ ANASTASIS_keyshare_lookup ( path, "timeout_ms", (0 != timeout.rel_value_us) - ? timeout_ms - : NULL, + ? timeout_ms + : NULL, NULL); } } diff --git a/src/restclient/anastasis_api_truth_solve.c b/src/restclient/anastasis_api_truth_solve.c index 971e917..9002a63 100644 --- a/src/restclient/anastasis_api_truth_solve.c +++ b/src/restclient/anastasis_api_truth_solve.c @@ -391,8 +391,8 @@ ANASTASIS_truth_solve ( path, "timeout_ms", (! GNUNET_TIME_relative_is_zero (timeout)) - ? timeout_ms - : NULL, + ? timeout_ms + : NULL, NULL); } GNUNET_free (path); diff --git a/src/testing/test_anastasis.c b/src/testing/test_anastasis.c index 7b127ac..4fa3fb9 100644 --- a/src/testing/test_anastasis.c +++ b/src/testing/test_anastasis.c @@ -340,6 +340,7 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", CONFIG_FILE, "EUR:0.01", + "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys", 1), diff --git a/src/testing/test_anastasis_api.c b/src/testing/test_anastasis_api.c index caa59c8..4d85fed 100644 --- a/src/testing/test_anastasis_api.c +++ b/src/testing/test_anastasis_api.c @@ -288,6 +288,7 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", CONFIG_FILE, "EUR:0.01", + "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys", 1), -- cgit v1.2.3