major renaming of internal symbols for better consistency

This commit is contained in:
Christian Grothoff 2020-03-15 21:42:35 +01:00
parent d3f7cc1184
commit 9ee86d4da4
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
27 changed files with 113 additions and 113 deletions

View File

@ -189,19 +189,19 @@ handle_post_coins (const struct TEH_RequestHandler *rh,
} h[] = { } h[] = {
{ {
.op = "deposit", .op = "deposit",
.handler = &TEH_DEPOSIT_handler_deposit .handler = &TEH_handler_deposit
}, },
{ {
.op = "melt", .op = "melt",
.handler = &TEH_REFRESH_handler_melt .handler = &TEH_handler_melt
}, },
{ {
.op = "recoup", .op = "recoup",
.handler = &TEH_RECOUP_handler_recoup .handler = &TEH_handler_recoup
}, },
{ {
.op = "refund", .op = "refund",
.handler = &TEH_REFUND_handler_refund .handler = &TEH_handler_refund
}, },
{ {
.op = NULL, .op = NULL,
@ -276,8 +276,8 @@ handle_mhd_completion_callback (void *cls,
/** /**
* Return GNUNET_YES if given a valid correlation ID and * Return #GNUNET_YES if given a valid correlation ID and
* GNUNET_NO otherwise. * #GNUNET_NO otherwise.
* *
* @returns #GNUNET_YES iff given a valid correlation ID * @returns #GNUNET_YES iff given a valid correlation ID
*/ */
@ -447,7 +447,7 @@ handle_mhd_request (void *cls,
{ {
.url = "robots.txt", .url = "robots.txt",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_MHD_handler_static_response, .handler.get = &TEH_handler_static_response,
.mime_type = "text/plain", .mime_type = "text/plain",
.data = "User-agent: *\nDisallow: /\n", .data = "User-agent: *\nDisallow: /\n",
.response_code = MHD_HTTP_OK .response_code = MHD_HTTP_OK
@ -456,7 +456,7 @@ handle_mhd_request (void *cls,
{ {
.url = "", .url = "",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = TEH_MHD_handler_static_response, .handler.get = TEH_handler_static_response,
.mime_type = "text/plain", .mime_type = "text/plain",
.data = .data =
"Hello, I'm the Taler exchange. This HTTP server is not for humans.\n", "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", .url = "agpl",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_MHD_handler_agpl_redirect .handler.get = &TEH_handler_agpl_redirect
}, },
/* Terms of service */ /* Terms of service */
{ {
@ -487,25 +487,25 @@ handle_mhd_request (void *cls,
{ {
.url = "keys", .url = "keys",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_KS_handler_keys, .handler.get = &TEH_handler_keys,
}, },
/* Requests for wiring information */ /* Requests for wiring information */
{ {
.url = "wire", .url = "wire",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_WIRE_handler_wire .handler.get = &TEH_handler_wire
}, },
/* Withdrawing coins / interaction with reserves */ /* Withdrawing coins / interaction with reserves */
{ {
.url = "reserves", .url = "reserves",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_RESERVE_handler_reserve_status, .handler.get = &TEH_handler_reserves_get,
.nargs = 1 .nargs = 1
}, },
{ {
.url = "reserves", .url = "reserves",
.method = MHD_HTTP_METHOD_POST, .method = MHD_HTTP_METHOD_POST,
.handler.post = &TEH_RESERVE_handler_reserve_withdraw, .handler.post = &TEH_handler_withdraw,
.nargs = 2 .nargs = 2
}, },
/* coins */ /* coins */
@ -518,28 +518,28 @@ handle_mhd_request (void *cls,
{ {
.url = "coins", .url = "coins",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = TEH_REFRESH_handler_link, .handler.get = TEH_handler_link,
.nargs = 2, .nargs = 2,
}, },
/* refreshing */ /* refreshing */
{ {
.url = "refreshes", .url = "refreshes",
.method = MHD_HTTP_METHOD_POST, .method = MHD_HTTP_METHOD_POST,
.handler.post = &TEH_REFRESH_handler_reveal, .handler.post = &TEH_handler_reveal,
.nargs = 2 .nargs = 2
}, },
/* tracking transfers */ /* tracking transfers */
{ {
.url = "transfers", .url = "transfers",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_TRACKING_handler_track_transfer, .handler.get = &TEH_handler_transfers_get,
.nargs = 1 .nargs = 1
}, },
/* tracking deposits */ /* tracking deposits */
{ {
.url = "deposits", .url = "deposits",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_TRACKING_handler_track_transaction, .handler.get = &TEH_handler_deposits_get,
.nargs = 4 .nargs = 4
}, },
/* mark end of list */ /* mark end of list */
@ -892,7 +892,7 @@ static int do_terminate;
* @return child pid * @return child pid
*/ */
static pid_t static pid_t
run_fake_client () run_fake_client (void)
{ {
pid_t cld; pid_t cld;
char ports[6]; char ports[6];
@ -984,7 +984,7 @@ connection_done (void *cls,
* @return #GNUNET_OK on success * @return #GNUNET_OK on success
*/ */
static int static int
run_single_request () run_single_request (void)
{ {
pid_t cld; pid_t cld;
int status; int status;

View File

@ -393,9 +393,9 @@ check_timestamp_current (struct GNUNET_TIME_Absolute ts)
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection, TEH_handler_deposit (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root) const json_t *root)
{ {
int res; int res;
json_t *wire; json_t *wire;

View File

@ -41,9 +41,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection, TEH_handler_deposit (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root); const json_t *root);
#endif #endif

View File

@ -346,9 +346,9 @@ check_and_handle_track_transaction_request (struct MHD_Connection *connection,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_TRACKING_handler_track_transaction (const struct TEH_RequestHandler *rh, TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[4]) const char *const args[4])
{ {
int res; int res;
struct TALER_DepositTrackPS tps; struct TALER_DepositTrackPS tps;

View File

@ -37,9 +37,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_TRACKING_handler_track_transaction (const struct TEH_RequestHandler *rh, TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[4]); const char *const args[4]);
#endif #endif

View File

@ -2394,9 +2394,9 @@ krd_search_comparator (const void *key,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_KS_handler_keys (const struct TEH_RequestHandler *rh, TEH_handler_keys (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]) const char *const args[])
{ {
int ret; int ret;
const char *have_cherrypick; const char *have_cherrypick;

View File

@ -192,9 +192,9 @@ TEH_KS_sign (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_KS_handler_keys (const struct TEH_RequestHandler *rh, TEH_handler_keys (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]); const char *const args[]);
#endif #endif

View File

@ -180,9 +180,9 @@ refresh_link_transaction (void *cls,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_link (const struct TEH_RequestHandler *rh, TEH_handler_link (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[2]) const char *const args[2])
{ {
struct HTD_Context ctx; struct HTD_Context ctx;
int mhd_ret; int mhd_ret;

View File

@ -37,9 +37,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_link (const struct TEH_RequestHandler *rh, TEH_handler_link (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[2]); const char *const args[2]);
#endif #endif

View File

@ -588,9 +588,9 @@ check_for_denomination_key (struct MHD_Connection *connection,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_melt (struct MHD_Connection *connection, TEH_handler_melt (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root) const json_t *root)
{ {
struct RefreshMeltContext rmc; struct RefreshMeltContext rmc;
int res; int res;

View File

@ -40,9 +40,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_melt (struct MHD_Connection *connection, TEH_handler_melt (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root); const json_t *root);
#endif #endif

View File

@ -43,9 +43,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, TEH_handler_static_response (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]) const char *const args[])
{ {
struct MHD_Response *response; struct MHD_Response *response;
int ret; int ret;
@ -86,9 +86,9 @@ TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, TEH_handler_agpl_redirect (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]) const char *const args[])
{ {
(void) rh; (void) rh;
(void) args; (void) args;
@ -107,9 +107,9 @@ TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, TEH_handler_send_json_pack_error (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]) const char *const args[])
{ {
(void) args; (void) args;
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,

View File

@ -38,9 +38,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh, TEH_handler_static_response (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]); const char *const args[]);
/** /**
@ -53,9 +53,9 @@ TEH_MHD_handler_static_response (const struct TEH_RequestHandler *rh,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh, TEH_handler_agpl_redirect (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]); const char *const args[]);
/** /**
@ -68,9 +68,9 @@ TEH_MHD_handler_agpl_redirect (const struct TEH_RequestHandler *rh,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_MHD_handler_send_json_pack_error (const struct TEH_RequestHandler *rh, TEH_handler_send_json_pack_error (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]); const char *const args[]);
#endif #endif

View File

@ -573,9 +573,9 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RECOUP_handler_recoup (struct MHD_Connection *connection, TEH_handler_recoup (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root) const json_t *root)
{ {
int res; int res;
struct TALER_CoinPublicInfo coin; struct TALER_CoinPublicInfo coin;

View File

@ -38,9 +38,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RECOUP_handler_recoup (struct MHD_Connection *connection, TEH_handler_recoup (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root); const json_t *root);
#endif #endif

View File

@ -899,10 +899,10 @@ handle_refresh_reveal_json (struct MHD_Connection *connection,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_reveal (const struct TEH_RequestHandler *rh, TEH_handler_reveal (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const json_t *root, const json_t *root,
const char *const args[2]) const char *const args[2])
{ {
int res; int res;
json_t *coin_evs; json_t *coin_evs;

View File

@ -44,10 +44,10 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFRESH_handler_reveal (const struct TEH_RequestHandler *rh, TEH_handler_reveal (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const json_t *root, const json_t *root,
const char *const args[2]); const char *const args[2]);
#endif #endif

View File

@ -543,9 +543,9 @@ verify_and_execute_refund (struct MHD_Connection *connection,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFUND_handler_refund (struct MHD_Connection *connection, TEH_handler_refund (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root) const json_t *root)
{ {
int res; int res;
struct TALER_EXCHANGEDB_Refund refund; struct TALER_EXCHANGEDB_Refund refund;

View File

@ -40,8 +40,8 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_REFUND_handler_refund (struct MHD_Connection *connection, TEH_handler_refund (struct MHD_Connection *connection,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *root); const json_t *root);
#endif #endif

View File

@ -125,9 +125,9 @@ reserve_status_transaction (void *cls,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RESERVE_handler_reserve_status (const struct TEH_RequestHandler *rh, TEH_handler_reserves_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[1]) const char *const args[1])
{ {
struct ReserveStatusContext rsc; struct ReserveStatusContext rsc;
int mhd_ret; int mhd_ret;

View File

@ -39,8 +39,8 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RESERVE_handler_reserve_status (const struct TEH_RequestHandler *rh, TEH_handler_reserves_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[1]); const char *const args[1]);
#endif #endif

View File

@ -490,9 +490,9 @@ free_ctx (struct WtidTransactionContext *ctx)
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_TRACKING_handler_track_transfer (const struct TEH_RequestHandler *rh, TEH_handler_transfers_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[1]) const char *const args[1])
{ {
struct WtidTransactionContext ctx; struct WtidTransactionContext ctx;
int mhd_ret; int mhd_ret;

View File

@ -35,9 +35,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_TRACKING_handler_track_transfer (const struct TEH_RequestHandler *rh, TEH_handler_transfers_get (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[1]); const char *const args[1]);
#endif #endif

View File

@ -128,9 +128,9 @@ TEH_WIRE_get_fees (const char *method)
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_WIRE_handler_wire (const struct TEH_RequestHandler *rh, TEH_handler_wire (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]) const char *const args[])
{ {
(void) rh; (void) rh;
(void) args; (void) args;

View File

@ -55,9 +55,9 @@ TEH_WIRE_get_fees (const char *method);
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_WIRE_handler_wire (const struct TEH_RequestHandler *rh, TEH_handler_wire (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const char *const args[]); const char *const args[]);
#endif #endif

View File

@ -360,10 +360,10 @@ withdraw_transaction (void *cls,
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RESERVE_handler_reserve_withdraw (const struct TEH_RequestHandler *rh, TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const json_t *root, const json_t *root,
const char *const args[2]) const char *const args[2])
{ {
struct WithdrawContext wc; struct WithdrawContext wc;
int res; int res;

View File

@ -43,9 +43,9 @@
* @return MHD result code * @return MHD result code
*/ */
int int
TEH_RESERVE_handler_reserve_withdraw (const struct TEH_RequestHandler *rh, TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
struct MHD_Connection *connection, struct MHD_Connection *connection,
const json_t *root, const json_t *root,
const char *const args[2]); const char *const args[2]);
#endif #endif