From 9ee86d4da4abdfd8fa0da80ee4b6b6b4df823fad Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 15 Mar 2020 21:42:35 +0100 Subject: major renaming of internal symbols for better consistency --- src/exchange/taler-exchange-httpd.c | 38 +++++++++++----------- src/exchange/taler-exchange-httpd_deposit.c | 6 ++-- src/exchange/taler-exchange-httpd_deposit.h | 6 ++-- src/exchange/taler-exchange-httpd_deposits_get.c | 6 ++-- src/exchange/taler-exchange-httpd_deposits_get.h | 6 ++-- src/exchange/taler-exchange-httpd_keystate.c | 6 ++-- src/exchange/taler-exchange-httpd_keystate.h | 6 ++-- src/exchange/taler-exchange-httpd_link.c | 6 ++-- src/exchange/taler-exchange-httpd_link.h | 6 ++-- src/exchange/taler-exchange-httpd_melt.c | 6 ++-- src/exchange/taler-exchange-httpd_melt.h | 6 ++-- src/exchange/taler-exchange-httpd_mhd.c | 18 +++++----- src/exchange/taler-exchange-httpd_mhd.h | 18 +++++----- src/exchange/taler-exchange-httpd_recoup.c | 6 ++-- src/exchange/taler-exchange-httpd_recoup.h | 6 ++-- .../taler-exchange-httpd_refreshes_reveal.c | 8 ++--- .../taler-exchange-httpd_refreshes_reveal.h | 8 ++--- src/exchange/taler-exchange-httpd_refund.c | 6 ++-- src/exchange/taler-exchange-httpd_refund.h | 6 ++-- src/exchange/taler-exchange-httpd_reserves_get.c | 6 ++-- src/exchange/taler-exchange-httpd_reserves_get.h | 6 ++-- src/exchange/taler-exchange-httpd_transfers_get.c | 6 ++-- src/exchange/taler-exchange-httpd_transfers_get.h | 6 ++-- src/exchange/taler-exchange-httpd_wire.c | 6 ++-- src/exchange/taler-exchange-httpd_wire.h | 6 ++-- src/exchange/taler-exchange-httpd_withdraw.c | 8 ++--- src/exchange/taler-exchange-httpd_withdraw.h | 8 ++--- 27 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 9524c2cbf..3e25b0819 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -189,19 +189,19 @@ handle_post_coins (const struct TEH_RequestHandler *rh, } h[] = { { .op = "deposit", - .handler = &TEH_DEPOSIT_handler_deposit + .handler = &TEH_handler_deposit }, { .op = "melt", - .handler = &TEH_REFRESH_handler_melt + .handler = &TEH_handler_melt }, { .op = "recoup", - .handler = &TEH_RECOUP_handler_recoup + .handler = &TEH_handler_recoup }, { .op = "refund", - .handler = &TEH_REFUND_handler_refund + .handler = &TEH_handler_refund }, { .op = NULL, @@ -276,8 +276,8 @@ handle_mhd_completion_callback (void *cls, /** - * Return GNUNET_YES if given a valid correlation ID and - * GNUNET_NO otherwise. + * Return #GNUNET_YES if given a valid correlation ID and + * #GNUNET_NO otherwise. * * @returns #GNUNET_YES iff given a valid correlation ID */ @@ -447,7 +447,7 @@ handle_mhd_request (void *cls, { .url = "robots.txt", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_MHD_handler_static_response, + .handler.get = &TEH_handler_static_response, .mime_type = "text/plain", .data = "User-agent: *\nDisallow: /\n", .response_code = MHD_HTTP_OK @@ -456,7 +456,7 @@ handle_mhd_request (void *cls, { .url = "", .method = MHD_HTTP_METHOD_GET, - .handler.get = TEH_MHD_handler_static_response, + .handler.get = TEH_handler_static_response, .mime_type = "text/plain", .data = "Hello, I'm the Taler exchange. This HTTP server is not for humans.\n", @@ -469,7 +469,7 @@ handle_mhd_request (void *cls, { .url = "agpl", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_MHD_handler_agpl_redirect + .handler.get = &TEH_handler_agpl_redirect }, /* Terms of service */ { @@ -487,25 +487,25 @@ handle_mhd_request (void *cls, { .url = "keys", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_KS_handler_keys, + .handler.get = &TEH_handler_keys, }, /* Requests for wiring information */ { .url = "wire", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_WIRE_handler_wire + .handler.get = &TEH_handler_wire }, /* Withdrawing coins / interaction with reserves */ { .url = "reserves", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_RESERVE_handler_reserve_status, + .handler.get = &TEH_handler_reserves_get, .nargs = 1 }, { .url = "reserves", .method = MHD_HTTP_METHOD_POST, - .handler.post = &TEH_RESERVE_handler_reserve_withdraw, + .handler.post = &TEH_handler_withdraw, .nargs = 2 }, /* coins */ @@ -518,28 +518,28 @@ handle_mhd_request (void *cls, { .url = "coins", .method = MHD_HTTP_METHOD_GET, - .handler.get = TEH_REFRESH_handler_link, + .handler.get = TEH_handler_link, .nargs = 2, }, /* refreshing */ { .url = "refreshes", .method = MHD_HTTP_METHOD_POST, - .handler.post = &TEH_REFRESH_handler_reveal, + .handler.post = &TEH_handler_reveal, .nargs = 2 }, /* tracking transfers */ { .url = "transfers", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_TRACKING_handler_track_transfer, + .handler.get = &TEH_handler_transfers_get, .nargs = 1 }, /* tracking deposits */ { .url = "deposits", .method = MHD_HTTP_METHOD_GET, - .handler.get = &TEH_TRACKING_handler_track_transaction, + .handler.get = &TEH_handler_deposits_get, .nargs = 4 }, /* mark end of list */ @@ -892,7 +892,7 @@ static int do_terminate; * @return child pid */ static pid_t -run_fake_client () +run_fake_client (void) { pid_t cld; char ports[6]; @@ -984,7 +984,7 @@ connection_done (void *cls, * @return #GNUNET_OK on success */ static int -run_single_request () +run_single_request (void) { pid_t cld; int status; diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index 29a41ddec..02f41bf93 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -393,9 +393,9 @@ check_timestamp_current (struct GNUNET_TIME_Absolute ts) * @return MHD result code */ int -TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root) +TEH_handler_deposit (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root) { int res; json_t *wire; diff --git a/src/exchange/taler-exchange-httpd_deposit.h b/src/exchange/taler-exchange-httpd_deposit.h index 23c46c283..641a19778 100644 --- a/src/exchange/taler-exchange-httpd_deposit.h +++ b/src/exchange/taler-exchange-httpd_deposit.h @@ -41,9 +41,9 @@ * @return MHD result code */ int -TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root); +TEH_handler_deposit (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root); #endif diff --git a/src/exchange/taler-exchange-httpd_deposits_get.c b/src/exchange/taler-exchange-httpd_deposits_get.c index 73d21db7d..a5a29d69a 100644 --- a/src/exchange/taler-exchange-httpd_deposits_get.c +++ b/src/exchange/taler-exchange-httpd_deposits_get.c @@ -346,9 +346,9 @@ check_and_handle_track_transaction_request (struct MHD_Connection *connection, * @return MHD result code */ int -TEH_TRACKING_handler_track_transaction (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[4]) +TEH_handler_deposits_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[4]) { int res; struct TALER_DepositTrackPS tps; diff --git a/src/exchange/taler-exchange-httpd_deposits_get.h b/src/exchange/taler-exchange-httpd_deposits_get.h index 27f57e679..64aeedf64 100644 --- a/src/exchange/taler-exchange-httpd_deposits_get.h +++ b/src/exchange/taler-exchange-httpd_deposits_get.h @@ -37,9 +37,9 @@ * @return MHD result code */ int -TEH_TRACKING_handler_track_transaction (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[4]); +TEH_handler_deposits_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[4]); #endif diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index af0920c55..024c74563 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c @@ -2394,9 +2394,9 @@ krd_search_comparator (const void *key, * @return MHD result code */ int -TEH_KS_handler_keys (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]) +TEH_handler_keys (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]) { int ret; const char *have_cherrypick; diff --git a/src/exchange/taler-exchange-httpd_keystate.h b/src/exchange/taler-exchange-httpd_keystate.h index 1b8e820a9..03ccfb7bf 100644 --- a/src/exchange/taler-exchange-httpd_keystate.h +++ b/src/exchange/taler-exchange-httpd_keystate.h @@ -192,9 +192,9 @@ TEH_KS_sign (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, * @return MHD result code */ int -TEH_KS_handler_keys (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]); +TEH_handler_keys (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]); #endif diff --git a/src/exchange/taler-exchange-httpd_link.c b/src/exchange/taler-exchange-httpd_link.c index 8e43bd232..1de8e683d 100644 --- a/src/exchange/taler-exchange-httpd_link.c +++ b/src/exchange/taler-exchange-httpd_link.c @@ -180,9 +180,9 @@ refresh_link_transaction (void *cls, * @return MHD result code */ int -TEH_REFRESH_handler_link (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[2]) +TEH_handler_link (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[2]) { struct HTD_Context ctx; int mhd_ret; diff --git a/src/exchange/taler-exchange-httpd_link.h b/src/exchange/taler-exchange-httpd_link.h index 7a39e21df..7d4debae3 100644 --- a/src/exchange/taler-exchange-httpd_link.h +++ b/src/exchange/taler-exchange-httpd_link.h @@ -37,9 +37,9 @@ * @return MHD result code */ int -TEH_REFRESH_handler_link (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[2]); +TEH_handler_link (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[2]); #endif diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c index 05804ed5b..86d0b32b4 100644 --- a/src/exchange/taler-exchange-httpd_melt.c +++ b/src/exchange/taler-exchange-httpd_melt.c @@ -588,9 +588,9 @@ check_for_denomination_key (struct MHD_Connection *connection, * @return MHD result code */ int -TEH_REFRESH_handler_melt (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root) +TEH_handler_melt (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root) { struct RefreshMeltContext rmc; int res; diff --git a/src/exchange/taler-exchange-httpd_melt.h b/src/exchange/taler-exchange-httpd_melt.h index daf8ffc82..485304390 100644 --- a/src/exchange/taler-exchange-httpd_melt.h +++ b/src/exchange/taler-exchange-httpd_melt.h @@ -40,9 +40,9 @@ * @return MHD result code */ int -TEH_REFRESH_handler_melt (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root); +TEH_handler_melt (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root); #endif diff --git a/src/exchange/taler-exchange-httpd_mhd.c b/src/exchange/taler-exchange-httpd_mhd.c index 0d59fad1b..6d05aeb64 100644 --- a/src/exchange/taler-exchange-httpd_mhd.c +++ b/src/exchange/taler-exchange-httpd_mhd.c @@ -43,9 +43,9 @@ * @return MHD result code */ int -TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]) +TEH_handler_static_response (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]) { struct MHD_Response *response; int ret; @@ -86,9 +86,9 @@ TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, * @return MHD result code */ int -TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]) +TEH_handler_agpl_redirect (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]) { (void) rh; (void) args; @@ -107,9 +107,9 @@ TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, * @return MHD result code */ int -TEH_MHD_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]) +TEH_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]) { (void) args; return TALER_MHD_reply_with_error (connection, diff --git a/src/exchange/taler-exchange-httpd_mhd.h b/src/exchange/taler-exchange-httpd_mhd.h index 0364f0463..cffd0c299 100644 --- a/src/exchange/taler-exchange-httpd_mhd.h +++ b/src/exchange/taler-exchange-httpd_mhd.h @@ -38,9 +38,9 @@ * @return MHD result code */ int -TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]); +TEH_handler_static_response (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]); /** @@ -53,9 +53,9 @@ TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, * @return MHD result code */ int -TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]); +TEH_handler_agpl_redirect (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]); /** @@ -68,9 +68,9 @@ TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, * @return MHD result code */ int -TEH_MHD_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]); +TEH_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]); #endif diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c index b3fca6371..32bc81986 100644 --- a/src/exchange/taler-exchange-httpd_recoup.c +++ b/src/exchange/taler-exchange-httpd_recoup.c @@ -573,9 +573,9 @@ verify_and_execute_recoup (struct MHD_Connection *connection, * @return MHD result code */ int -TEH_RECOUP_handler_recoup (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root) +TEH_handler_recoup (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root) { int res; struct TALER_CoinPublicInfo coin; diff --git a/src/exchange/taler-exchange-httpd_recoup.h b/src/exchange/taler-exchange-httpd_recoup.h index f86bf60e7..85fdc1399 100644 --- a/src/exchange/taler-exchange-httpd_recoup.h +++ b/src/exchange/taler-exchange-httpd_recoup.h @@ -38,9 +38,9 @@ * @return MHD result code */ int -TEH_RECOUP_handler_recoup (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root); +TEH_handler_recoup (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root); #endif diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c index 88d535fcd..07f93c45e 100644 --- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c +++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c @@ -899,10 +899,10 @@ handle_refresh_reveal_json (struct MHD_Connection *connection, * @return MHD result code */ int -TEH_REFRESH_handler_reveal (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const json_t *root, - const char *const args[2]) +TEH_handler_reveal (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const json_t *root, + const char *const args[2]) { int res; json_t *coin_evs; diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.h b/src/exchange/taler-exchange-httpd_refreshes_reveal.h index 04b46b1f8..7fa6eb75f 100644 --- a/src/exchange/taler-exchange-httpd_refreshes_reveal.h +++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.h @@ -44,10 +44,10 @@ * @return MHD result code */ int -TEH_REFRESH_handler_reveal (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const json_t *root, - const char *const args[2]); +TEH_handler_reveal (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const json_t *root, + const char *const args[2]); #endif diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c index c66a7da47..f8b265c58 100644 --- a/src/exchange/taler-exchange-httpd_refund.c +++ b/src/exchange/taler-exchange-httpd_refund.c @@ -543,9 +543,9 @@ verify_and_execute_refund (struct MHD_Connection *connection, * @return MHD result code */ int -TEH_REFUND_handler_refund (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root) +TEH_handler_refund (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root) { int res; struct TALER_EXCHANGEDB_Refund refund; diff --git a/src/exchange/taler-exchange-httpd_refund.h b/src/exchange/taler-exchange-httpd_refund.h index b79419f16..ad6387d67 100644 --- a/src/exchange/taler-exchange-httpd_refund.h +++ b/src/exchange/taler-exchange-httpd_refund.h @@ -40,8 +40,8 @@ * @return MHD result code */ int -TEH_REFUND_handler_refund (struct MHD_Connection *connection, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const json_t *root); +TEH_handler_refund (struct MHD_Connection *connection, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const json_t *root); #endif diff --git a/src/exchange/taler-exchange-httpd_reserves_get.c b/src/exchange/taler-exchange-httpd_reserves_get.c index d06a871e7..bc3728ef1 100644 --- a/src/exchange/taler-exchange-httpd_reserves_get.c +++ b/src/exchange/taler-exchange-httpd_reserves_get.c @@ -125,9 +125,9 @@ reserve_status_transaction (void *cls, * @return MHD result code */ int -TEH_RESERVE_handler_reserve_status (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[1]) +TEH_handler_reserves_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[1]) { struct ReserveStatusContext rsc; int mhd_ret; diff --git a/src/exchange/taler-exchange-httpd_reserves_get.h b/src/exchange/taler-exchange-httpd_reserves_get.h index bc697dcd4..56ccef5c4 100644 --- a/src/exchange/taler-exchange-httpd_reserves_get.h +++ b/src/exchange/taler-exchange-httpd_reserves_get.h @@ -39,8 +39,8 @@ * @return MHD result code */ int -TEH_RESERVE_handler_reserve_status (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[1]); +TEH_handler_reserves_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[1]); #endif diff --git a/src/exchange/taler-exchange-httpd_transfers_get.c b/src/exchange/taler-exchange-httpd_transfers_get.c index e7fceb494..873bcaec7 100644 --- a/src/exchange/taler-exchange-httpd_transfers_get.c +++ b/src/exchange/taler-exchange-httpd_transfers_get.c @@ -490,9 +490,9 @@ free_ctx (struct WtidTransactionContext *ctx) * @return MHD result code */ int -TEH_TRACKING_handler_track_transfer (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[1]) +TEH_handler_transfers_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[1]) { struct WtidTransactionContext ctx; int mhd_ret; diff --git a/src/exchange/taler-exchange-httpd_transfers_get.h b/src/exchange/taler-exchange-httpd_transfers_get.h index 0f9e21a5e..ee5a056c6 100644 --- a/src/exchange/taler-exchange-httpd_transfers_get.h +++ b/src/exchange/taler-exchange-httpd_transfers_get.h @@ -35,9 +35,9 @@ * @return MHD result code */ int -TEH_TRACKING_handler_track_transfer (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[1]); +TEH_handler_transfers_get (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[1]); #endif diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c index de4e2db4d..bd6df87ca 100644 --- a/src/exchange/taler-exchange-httpd_wire.c +++ b/src/exchange/taler-exchange-httpd_wire.c @@ -128,9 +128,9 @@ TEH_WIRE_get_fees (const char *method) * @return MHD result code */ int -TEH_WIRE_handler_wire (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]) +TEH_handler_wire (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]) { (void) rh; (void) args; diff --git a/src/exchange/taler-exchange-httpd_wire.h b/src/exchange/taler-exchange-httpd_wire.h index ac4ea39cc..b51bfd781 100644 --- a/src/exchange/taler-exchange-httpd_wire.h +++ b/src/exchange/taler-exchange-httpd_wire.h @@ -55,9 +55,9 @@ TEH_WIRE_get_fees (const char *method); * @return MHD result code */ int -TEH_WIRE_handler_wire (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const char *const args[]); +TEH_handler_wire (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const char *const args[]); #endif diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c index 1abf1932c..0a334ec4c 100644 --- a/src/exchange/taler-exchange-httpd_withdraw.c +++ b/src/exchange/taler-exchange-httpd_withdraw.c @@ -360,10 +360,10 @@ withdraw_transaction (void *cls, * @return MHD result code */ int -TEH_RESERVE_handler_reserve_withdraw (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const json_t *root, - const char *const args[2]) +TEH_handler_withdraw (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const json_t *root, + const char *const args[2]) { struct WithdrawContext wc; int res; diff --git a/src/exchange/taler-exchange-httpd_withdraw.h b/src/exchange/taler-exchange-httpd_withdraw.h index b0d293ff2..9c7467664 100644 --- a/src/exchange/taler-exchange-httpd_withdraw.h +++ b/src/exchange/taler-exchange-httpd_withdraw.h @@ -43,9 +43,9 @@ * @return MHD result code */ int -TEH_RESERVE_handler_reserve_withdraw (const struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - const json_t *root, - const char *const args[2]); +TEH_handler_withdraw (const struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + const json_t *root, + const char *const args[2]); #endif -- cgit v1.2.3