commit 9a10cd55a37993d538085a4577042e1ca1866f08 parent 9352178de88df325368c869e7108892ceec9ffbf Author: Christian Grothoff <christian@grothoff.org> Date: Thu, 16 Apr 2026 09:31:07 +0200 get rid of compatibility MHD_RESULT wrapper Diffstat:
214 files changed, 306 insertions(+), 306 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c @@ -442,7 +442,7 @@ full_url_track_callback (void *cls, * #MHD_NO if the socket must be closed due to a serious * error while handling the request */ -static MHD_RESULT +static enum MHD_Result process_upload_with_handler (struct TMH_HandlerContext *hc, const char *upload_data, size_t *upload_data_size) @@ -565,7 +565,7 @@ identify_instance (struct TMH_HandlerContext *hc, if (0 == strcmp (instance_id, "admin")) { - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *response; const char *rstart = hc->full_url + strlen (instance_prefix); const char *rslash = strchr (rstart, '/'); @@ -665,7 +665,7 @@ identify_instance (struct TMH_HandlerContext *hc, * #MHD_NO if the socket must be closed due to a serious * error while handling the request */ -static MHD_RESULT +static enum MHD_Result url_handler (void *cls, struct MHD_Connection *connection, const char *url, diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h @@ -537,10 +537,10 @@ struct TMH_RequestHandler * @param[in,out] hc context with further information about the request * @return MHD result code */ - MHD_RESULT - (*handler)(const struct TMH_RequestHandler *rh, - struct MHD_Connection *connection, - struct TMH_HandlerContext *hc); + enum MHD_Result + (*handler)(const struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + struct TMH_HandlerContext *hc); /** * Default response code to use. diff --git a/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.c @@ -36,7 +36,7 @@ * @param connection the MHD connection to handle * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result delete_instances_ID (struct TMH_HandlerContext *hc, bool mfa_check, struct TMH_MerchantInstance *mi, @@ -122,7 +122,7 @@ delete_instances_ID (struct TMH_HandlerContext *hc, } -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -138,7 +138,7 @@ TMH_private_delete_instances_ID ( } -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_default_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.h b/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -46,7 +46,7 @@ TMH_private_delete_instances_ID (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_default_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c @@ -26,7 +26,7 @@ #include "merchant-database/event_notify.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_account_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.h b/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_account_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_categories_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.h b/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_categories_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_donau_instance_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.h b/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.h @@ -34,7 +34,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_donau_instance_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.c b/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/delete_product_group.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_group (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.h b/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_group (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.c @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_orders_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.h b/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_orders_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.h b/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/delete_money_pot.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.h b/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.c @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_products_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.h b/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_products_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/delete_report.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.h b/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_templates_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.h b/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_templates_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-token.c b/src/backend/taler-merchant-httpd_delete-private-token.c @@ -29,7 +29,7 @@ #include "merchant-database/delete_login_token.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID_token (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-token.h b/src/backend/taler-merchant-httpd_delete-private-token.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID_token ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_token_families_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.h b/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_token_families_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c @@ -29,7 +29,7 @@ #include "merchant-database/delete_login_token.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID_token_SERIAL ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.h b/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.h @@ -34,7 +34,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_instances_ID_token_SERIAL ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-transfers-TID.c b/src/backend/taler-merchant-httpd_delete-private-transfers-TID.c @@ -25,7 +25,7 @@ #include "merchant-database/delete_transfer.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_transfers_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-transfers-TID.h b/src/backend/taler-merchant-httpd_delete-private-transfers-TID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_transfers_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-units-UNIT.c b/src/backend/taler-merchant-httpd_delete-private-units-UNIT.c @@ -23,7 +23,7 @@ #include "merchant-database/delete_unit.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-units-UNIT.h b/src/backend/taler-merchant-httpd_delete-private-units-UNIT.h @@ -24,7 +24,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_private_delete_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.h b/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_delete_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_dispatcher.c b/src/backend/taler-merchant-httpd_dispatcher.c @@ -135,7 +135,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_server_options (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -155,7 +155,7 @@ handle_server_options (const struct TMH_RequestHandler *rh, * @param hc handler context * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result spa_redirect (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -199,7 +199,7 @@ spa_redirect (const struct TMH_RequestHandler *rh, GNUNET_free (dst); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (connection, MHD_HTTP_FOUND, @@ -1503,7 +1503,7 @@ identify_handler (struct TMH_HandlerContext *hc, (url_found) ) { struct MHD_Response *reply; - MHD_RESULT ret; + enum MHD_Result ret; char *allowed = NULL; GNUNET_break_op (0); diff --git a/src/backend/taler-merchant-httpd_get-config.c b/src/backend/taler-merchant-httpd_get-config.c @@ -113,7 +113,7 @@ add_report_generator (void *cls, } -MHD_RESULT +enum MHD_Result MH_handler_config (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-config.h b/src/backend/taler-merchant-httpd_get-config.h @@ -31,7 +31,7 @@ * @param[in,out] hc handler context (can be updated) * @return MHD result code */ -MHD_RESULT +enum MHD_Result MH_handler_config (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-exchanges.c b/src/backend/taler-merchant-httpd_get-exchanges.c @@ -77,7 +77,7 @@ add_exchange ( } -MHD_RESULT +enum MHD_Result MH_handler_exchanges (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-exchanges.h b/src/backend/taler-merchant-httpd_get-exchanges.h @@ -32,7 +32,7 @@ * @param[in,out] hc handler context (can be updated) * @return MHD result code */ -MHD_RESULT +enum MHD_Result MH_handler_exchanges (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.c @@ -30,7 +30,7 @@ * @param connection the MHD connection to handle * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result get_instances_ID (struct TMH_MerchantInstance *mi, struct MHD_Connection *connection) { @@ -120,7 +120,7 @@ get_instances_ID (struct TMH_MerchantInstance *mi, } -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -132,7 +132,7 @@ TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_private_get_instances_default_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.h b/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -46,7 +46,7 @@ TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances_default_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-management-instances.c b/src/backend/taler-merchant-httpd_get-management-instances.c @@ -100,7 +100,7 @@ add_instance (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-management-instances.h b/src/backend/taler-merchant-httpd_get-management-instances.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c @@ -379,7 +379,7 @@ god_cleanup (void *cls) */ static void phase_end (struct GetOrderData *god, - MHD_RESULT mret) + enum MHD_Result mret) { god->phase = (MHD_YES == mret) ? GOP_RETURN_MHD_YES @@ -853,7 +853,7 @@ phase_check_client_access (struct GetOrderData *god) where the client may be able to pickup a fresh order -- or might be able authenticate via session ID */ struct MHD_Response *reply; - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Contract claimed, redirecting to fulfillment page for order %s\n", @@ -943,7 +943,7 @@ static bool send_pay_request (struct GetOrderData *god, const char *already_paid_order_id) { - MHD_RESULT ret; + enum MHD_Result ret; char *taler_pay_uri; char *order_status_url; struct GNUNET_TIME_Relative remaining; @@ -1589,7 +1589,7 @@ phase_return_status (struct GetOrderData *god) } -MHD_RESULT +enum MHD_Result TMH_get_orders_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.h b/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.h @@ -39,7 +39,7 @@ TMH_force_wallet_get_order_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_get_orders_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_accounts_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -77,7 +77,7 @@ TMH_private_get_accounts_ID (const struct TMH_RequestHandler *rh, hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.h b/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_accounts_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-accounts.c b/src/backend/taler-merchant-httpd_get-private-accounts.c @@ -52,7 +52,7 @@ add_account (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_accounts (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-accounts.h b/src/backend/taler-merchant-httpd_get-private-accounts.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_accounts (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_categories_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -83,7 +83,7 @@ TMH_private_get_categories_ID ( hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; json_t *jproducts; const char *pos = products; diff --git a/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.h b/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_categories_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-categories.c b/src/backend/taler-merchant-httpd_get-private-categories.c @@ -61,7 +61,7 @@ add_category (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_categories (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-categories.h b/src/backend/taler-merchant-httpd_get-private-categories.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_categories ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-donau.c b/src/backend/taler-merchant-httpd_get-private-donau.c @@ -92,7 +92,7 @@ add_donau_instance (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_donau_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-donau.h b/src/backend/taler-merchant-httpd_get-private-donau.h @@ -34,7 +34,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_donau_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-groups.c b/src/backend/taler-merchant-httpd_get-private-groups.c @@ -62,7 +62,7 @@ add_group (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_groups (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-groups.h b/src/backend/taler-merchant-httpd_get-private-groups.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_groups (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-incoming-ID.c b/src/backend/taler-merchant-httpd_get-private-incoming-ID.c @@ -60,7 +60,7 @@ reconciliation_cb (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -172,7 +172,7 @@ TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, { enum GNUNET_DB_QueryStatus qs; json_t *rd; - MHD_RESULT mret; + enum MHD_Result mret; rd = json_array (); GNUNET_assert (NULL != rd); diff --git a/src/backend/taler-merchant-httpd_get-private-incoming-ID.h b/src/backend/taler-merchant-httpd_get-private-incoming-ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-incoming.c b/src/backend/taler-merchant-httpd_get-private-incoming.c @@ -101,7 +101,7 @@ incoming_cb (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_incoming (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-incoming.h b/src/backend/taler-merchant-httpd_get-private-incoming.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_incoming (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-kyc.c b/src/backend/taler-merchant-httpd_get-private-kyc.c @@ -1338,7 +1338,7 @@ kyc_status_cb ( * @param[in,out] hc context with further information about the request * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result get_instances_ID_kyc ( struct TMH_MerchantInstance *mi, struct MHD_Connection *connection, @@ -1613,7 +1613,7 @@ get_instances_ID_kyc ( } -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID_kyc ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -1628,7 +1628,7 @@ TMH_private_get_instances_ID_kyc ( } -MHD_RESULT +enum MHD_Result TMH_private_get_instances_default_ID_kyc ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-kyc.h b/src/backend/taler-merchant-httpd_get-private-kyc.h @@ -44,7 +44,7 @@ TMH_force_kyc_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID_kyc (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -59,7 +59,7 @@ TMH_private_get_instances_ID_kyc (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances_default_ID_kyc (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c @@ -553,7 +553,7 @@ gorc_cleanup (void *cls) */ static void phase_end (struct GetOrderRequestContext *gorc, - MHD_RESULT mret) + enum MHD_Result mret) { gorc->phase = (MHD_YES == mret) ? GOP_END_YES @@ -954,7 +954,7 @@ check_reply (struct GetOrderRequestContext *gorc, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (gorc->sc.con, http_response_code, @@ -1701,7 +1701,7 @@ phase_error (struct GetOrderRequestContext *gorc) } -MHD_RESULT +enum MHD_Result TMH_private_get_orders_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.h b/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-orders.c b/src/backend/taler-merchant-httpd_get-private-orders.c @@ -1054,7 +1054,7 @@ pdf_cb (void *cls, * @param mi the merchant instance * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_orders (struct TMH_PendingOrder *po, struct MHD_Connection *connection, struct TMH_MerchantInstance *mi) @@ -1074,7 +1074,7 @@ reply_orders (struct TMH_PendingOrder *po, case POF_CSV: { struct MHD_Response *resp; - MHD_RESULT mret; + enum MHD_Result mret; for (unsigned int i = 0; i<po->total_amount.taa_size; i++) { @@ -1120,7 +1120,7 @@ reply_orders (struct TMH_PendingOrder *po, case POF_XML: { struct MHD_Response *resp; - MHD_RESULT mret; + enum MHD_Result mret; for (unsigned int i = 0; i<po->total_amount.taa_size; i++) { @@ -1255,7 +1255,7 @@ reply_orders (struct TMH_PendingOrder *po, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_orders (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-orders.h b/src/backend/taler-merchant-httpd_get-private-orders.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_orders (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -76,7 +76,7 @@ TMH_private_get_otp_devices_ID (const struct TMH_RequestHandler *rh, hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; char *pos_confirmation; pos_confirmation = (NULL == tp.otp_key) diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.h b/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices.c b/src/backend/taler-merchant-httpd_get-private-otp-devices.c @@ -48,7 +48,7 @@ add_otp (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_otp_devices (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices.h b/src/backend/taler-merchant-httpd_get-private-otp-devices.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_otp_devices (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-pos.c b/src/backend/taler-merchant-httpd_get-private-pos.c @@ -175,7 +175,7 @@ add_product (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_pos (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-pos.h b/src/backend/taler-merchant-httpd_get-private-pos.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_pos (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/select_money_pot.h" -MHD_RESULT +enum MHD_Result TMH_private_get_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -78,7 +78,7 @@ TMH_private_get_pot (const struct TMH_RequestHandler *rh, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.h b/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-pots.c b/src/backend/taler-merchant-httpd_get-private-pots.c @@ -69,7 +69,7 @@ add_pot (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_pots (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-pots.h b/src/backend/taler-merchant-httpd_get-private-pots.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_pots (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_products_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -79,7 +79,7 @@ TMH_private_get_products_ID ( GNUNET_free (categories); { - MHD_RESULT ret; + enum MHD_Result ret; int64_t total_stock_api; char unit_total_stock_buf[64]; diff --git a/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.h b/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_products_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-products.c b/src/backend/taler-merchant-httpd_get-private-products.c @@ -84,7 +84,7 @@ tr (const char *input) } -MHD_RESULT +enum MHD_Result TMH_private_get_products (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-products.h b/src/backend/taler-merchant-httpd_get-private-products.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_products (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/select_report.h" -MHD_RESULT +enum MHD_Result TMH_private_get_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.h b/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-reports.c b/src/backend/taler-merchant-httpd_get-private-reports.c @@ -64,7 +64,7 @@ add_report (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_reports (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-reports.h b/src/backend/taler-merchant-httpd_get-private-reports.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_reports (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c @@ -163,7 +163,7 @@ amount_by_interval (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_amount_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.h b/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_amount_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c @@ -136,7 +136,7 @@ counter_by_interval (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_counter_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.h b/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_counter_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c @@ -522,7 +522,7 @@ make_transaction_count_report (struct ResponseContext *rctx, } -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_report_transactions ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.h b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_statistics_report_transactions ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c @@ -24,7 +24,7 @@ #include "merchant-database/lookup_template.h" -MHD_RESULT +enum MHD_Result TMH_private_get_templates_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -57,7 +57,7 @@ TMH_private_get_templates_ID ( hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.h b/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_templates_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-private-templates.c b/src/backend/taler-merchant-httpd_get-private-templates.c @@ -47,7 +47,7 @@ add_template (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_templates (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-templates.h b/src/backend/taler-merchant-httpd_get-private-templates.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_templates (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_tokenfamilies_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -64,7 +64,7 @@ TMH_private_get_tokenfamilies_SLUG (const struct TMH_RequestHandler *rh, } { char *kind = NULL; - MHD_RESULT result; + enum MHD_Result result; if (TALER_MERCHANTDB_TFK_Subscription == details.kind) { diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.h b/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_tokenfamilies_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies.c b/src/backend/taler-merchant-httpd_get-private-tokenfamilies.c @@ -70,7 +70,7 @@ add_token_family (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_tokenfamilies (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies.h b/src/backend/taler-merchant-httpd_get-private-tokenfamilies.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_tokenfamilies (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-tokens.c b/src/backend/taler-merchant-httpd_get-private-tokens.c @@ -72,7 +72,7 @@ add_token (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID_tokens (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-tokens.h b/src/backend/taler-merchant-httpd_get-private-tokens.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_instances_ID_tokens (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-transfers.c b/src/backend/taler-merchant-httpd_get-private-transfers.c @@ -102,7 +102,7 @@ transfer_cb (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_transfers (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-transfers.h b/src/backend/taler-merchant-httpd_get-private-transfers.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_transfers (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-units-UNIT.c b/src/backend/taler-merchant-httpd_get-private-units-UNIT.c @@ -23,14 +23,14 @@ #include "merchant-database/select_unit.h" -MHD_RESULT +enum MHD_Result TMH_private_get_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) { struct TALER_MERCHANTDB_UnitDetails ud = { 0 }; enum GNUNET_DB_QueryStatus qs; - MHD_RESULT ret; + enum MHD_Result ret; (void) rh; GNUNET_assert (NULL != hc->infix); diff --git a/src/backend/taler-merchant-httpd_get-private-units-UNIT.h b/src/backend/taler-merchant-httpd_get-private-units-UNIT.h @@ -24,7 +24,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_private_get_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-units.c b/src/backend/taler-merchant-httpd_get-private-units.c @@ -58,7 +58,7 @@ add_unit (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_units (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-units.h b/src/backend/taler-merchant-httpd_get-private-units.h @@ -24,7 +24,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_private_get_units (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -62,7 +62,7 @@ TMH_private_get_webhooks_ID (const struct TMH_RequestHandler *rh, hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.h b/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks.c b/src/backend/taler-merchant-httpd_get-private-webhooks.c @@ -48,7 +48,7 @@ add_webhook (void *cls, } -MHD_RESULT +enum MHD_Result TMH_private_get_webhooks (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks.h b/src/backend/taler-merchant-httpd_get-private-webhooks.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_get_webhooks (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c b/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c @@ -25,7 +25,7 @@ #include "merchant-database/lookup_product_image.h" -MHD_RESULT +enum MHD_Result TMH_get_products_image (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -76,7 +76,7 @@ TMH_get_products_image (const struct TMH_RequestHandler *rh, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK (connection, MHD_HTTP_OK, diff --git a/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.h b/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.h @@ -23,7 +23,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_get_products_image (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c b/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c @@ -151,7 +151,7 @@ resume_by_event (void *cls, } -MHD_RESULT +enum MHD_Result TMH_get_sessions_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -277,7 +277,7 @@ TMH_get_sessions_ID ( if (paid) { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, @@ -290,7 +290,7 @@ TMH_get_sessions_ID ( if (is_past) { - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_assert (NULL != order_id); ret = TALER_MHD_REPLY_JSON_PACK ( diff --git a/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.h b/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.h @@ -39,7 +39,7 @@ TMH_force_get_sessions_ID_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_get_sessions_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c @@ -261,7 +261,7 @@ add_inventory_unit (void *cls, * @param tp template details * @return MHD result */ -static MHD_RESULT +static enum MHD_Result handle_get_templates_inventory ( struct MHD_Connection *connection, const struct TMH_MerchantInstance *mi, @@ -483,7 +483,7 @@ handle_get_templates_inventory ( "inventory_payload", inventory_payload)); { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( connection, @@ -502,7 +502,7 @@ handle_get_templates_inventory ( } -MHD_RESULT +enum MHD_Result TMH_get_templates_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -535,7 +535,7 @@ TMH_get_templates_ID ( hc->infix); } { - MHD_RESULT ret; + enum MHD_Result ret; switch (TALER_MERCHANT_template_type_from_contract (tp.template_contract)) { diff --git a/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.h b/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_get_templates_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_get-terms.c b/src/backend/taler-merchant-httpd_get-terms.c @@ -32,7 +32,7 @@ static struct TALER_MHD_Legal *tos; static struct TALER_MHD_Legal *pp; -MHD_RESULT +enum MHD_Result TMH_handler_terms (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *rc) @@ -44,7 +44,7 @@ TMH_handler_terms (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_handler_privacy (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *rc) diff --git a/src/backend/taler-merchant-httpd_get-terms.h b/src/backend/taler-merchant-httpd_get-terms.h @@ -31,7 +31,7 @@ * @param[in,out] rc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_handler_terms (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *rc); @@ -45,7 +45,7 @@ TMH_handler_terms (const struct TMH_RequestHandler *rh, * @param[in,out] rc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_handler_privacy (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *rc); diff --git a/src/backend/taler-merchant-httpd_get-webui.c b/src/backend/taler-merchant-httpd_get-webui.c @@ -34,7 +34,7 @@ static struct TALER_MHD_Spa *spa; -MHD_RESULT +enum MHD_Result TMH_return_spa (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_get-webui.h b/src/backend/taler-merchant-httpd_get-webui.h @@ -33,7 +33,7 @@ * @param hc handler context * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection) */ -MHD_RESULT +enum MHD_Result TMH_return_spa (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_mhd.c b/src/backend/taler-merchant-httpd_mhd.c @@ -27,7 +27,7 @@ #include "taler-merchant-httpd_mhd.h" -MHD_RESULT +enum MHD_Result TMH_MHD_handler_static_response (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -41,7 +41,7 @@ TMH_MHD_handler_static_response (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_MHD_handler_agpl_redirect (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_mhd.h b/src/backend/taler-merchant-httpd_mhd.h @@ -37,7 +37,7 @@ * @param[in,out] hc handler context (can be updated) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_MHD_handler_static_response (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -52,7 +52,7 @@ TMH_MHD_handler_static_response (const struct TMH_RequestHandler *rh, * @param[in,out] hc handler context (can be updated) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_MHD_handler_agpl_redirect (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -71,7 +71,7 @@ TMH_MHD_handler_agpl_redirect (const struct TMH_RequestHandler *rh, * @param ... varargs * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_MHD_helper_send_json_pack (struct TMH_RequestHandler *rh, struct MHD_Connection *connection, void *connection_cls, @@ -93,7 +93,7 @@ TMH_MHD_helper_send_json_pack (struct TMH_RequestHandler *rh, * @param mi merchant backend instance, never NULL * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_MHD_handler_send_json_pack_error (struct TMH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c @@ -61,7 +61,7 @@ free_wm (struct TMH_WireMethod *wm) * @param[in,out] hc context with further information about the request * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result patch_instances_ID (struct TMH_MerchantInstance *mi, bool mfa_check, struct MHD_Connection *connection, @@ -470,7 +470,7 @@ giveup: } -MHD_RESULT +enum MHD_Result TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -484,7 +484,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_private_patch_instances_default_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.h b/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -51,7 +51,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_instances_default_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.c @@ -38,7 +38,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_accounts_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -109,7 +109,7 @@ TMH_private_patch_accounts_ID (const struct TMH_RequestHandler *rh, cfu, cfc); { - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; switch (qs) { diff --git a/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.h b/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_accounts_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.c @@ -29,7 +29,7 @@ #include "merchant-database/update_category.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_categories_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -90,7 +90,7 @@ TMH_private_patch_categories_ID (const struct TMH_RequestHandler *rh, category_name_i18n); json_decref (oempty); { - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; switch (qs) { diff --git a/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.h b/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_categories_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.c b/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/update_product_group.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_group (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.h b/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_group (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.c b/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.c @@ -84,7 +84,7 @@ forget (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.h b/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.c @@ -29,7 +29,7 @@ #include "merchant-database/update_otp.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -74,7 +74,7 @@ TMH_private_patch_otp_devices_ID (const struct TMH_RequestHandler *rh, device_id, &tp); { - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; switch (qs) { diff --git a/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.h b/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_otp_devices_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.c @@ -26,7 +26,7 @@ #include "merchant-database/update_money_pot.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.h b/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_pot (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.c @@ -37,7 +37,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_products_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -137,7 +137,7 @@ TMH_private_patch_products_ID ( NULL), GNUNET_JSON_spec_end () }; - MHD_RESULT ret; + enum MHD_Result ret; size_t num_cats = 0; uint64_t *cats = NULL; bool no_instance; diff --git a/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.h b/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_products_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.c @@ -28,7 +28,7 @@ #include "merchant-database/event_notify.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.h b/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_report (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.c @@ -38,7 +38,7 @@ * @param template_id ID of the product to patch * @param tp template details we failed to set */ -static MHD_RESULT +static enum MHD_Result determine_cause (struct MHD_Connection *connection, const char *instance_id, const char *template_id, @@ -96,7 +96,7 @@ determine_cause (struct MHD_Connection *connection, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_templates_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -156,7 +156,7 @@ TMH_private_patch_templates_ID (const struct TMH_RequestHandler *rh, key)) { char *msg; - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_break_op (0); GNUNET_asprintf (&msg, @@ -178,7 +178,7 @@ TMH_private_patch_templates_ID (const struct TMH_RequestHandler *rh, template_id, &tp); { - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; switch (qs) { diff --git a/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.h b/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_templates_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -43,7 +43,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_token_family_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -115,7 +115,7 @@ TMH_private_patch_token_family_SLUG (const struct TMH_RequestHandler *rh, { enum GNUNET_DB_QueryStatus qs; - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; qs = TALER_MERCHANTDB_update_token_family (TMH_db, mi->settings.id, diff --git a/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.h b/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_token_family_SLUG (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-units-UNIT.c b/src/backend/taler-merchant-httpd_patch-private-units-UNIT.c @@ -27,7 +27,7 @@ #define TMH_MAX_UNIT_PRECISION_LEVEL 6 -MHD_RESULT +enum MHD_Result TMH_private_patch_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -77,7 +77,7 @@ TMH_private_patch_units_ID (const struct TMH_RequestHandler *rh, bool no_instance = false; bool no_unit = false; bool builtin_conflict = false; - MHD_RESULT ret = MHD_YES; + enum MHD_Result ret = MHD_YES; (void) rh; GNUNET_assert (NULL != mi); diff --git a/src/backend/taler-merchant-httpd_patch-private-units-UNIT.h b/src/backend/taler-merchant-httpd_patch-private-units-UNIT.h @@ -24,7 +24,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_private_patch_units_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.c @@ -44,7 +44,7 @@ * @param webhook_id ID of the webhook to patch * @param wb webhook details we failed to set */ -static MHD_RESULT +static enum MHD_Result determine_cause (struct MHD_Connection *connection, const char *instance_id, const char *webhook_id, @@ -102,7 +102,7 @@ determine_cause (struct MHD_Connection *connection, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -149,7 +149,7 @@ TMH_private_patch_webhooks_ID (const struct TMH_RequestHandler *rh, webhook_id, &wb); { - MHD_RESULT ret = MHD_NO; + enum MHD_Result ret = MHD_NO; switch (qs) { diff --git a/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.h b/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_patch_webhooks_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c b/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c @@ -29,7 +29,7 @@ #include "merchant-database/solve_mfa_challenge.h" -MHD_RESULT +enum MHD_Result TMH_post_challenge_ID_confirm (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.h b/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_challenge_ID_confirm (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID.c b/src/backend/taler-merchant-httpd_post-challenge-ID.c @@ -236,7 +236,7 @@ respond_to_challenge_with_response (struct MfaState *mfa, unsigned int response_code, struct MHD_Response *response) { - MHD_RESULT res; + enum MHD_Result res; res = MHD_queue_response (mfa->hc->connection, response_code, @@ -622,7 +622,7 @@ phase_parse (struct MfaState *mfa) } -MHD_RESULT +enum MHD_Result TMH_post_challenge_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID.h b/src/backend/taler-merchant-httpd_post-challenge-ID.h @@ -41,7 +41,7 @@ TMH_challenge_done (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_challenge_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c b/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c @@ -52,7 +52,7 @@ * @param tcs set of multi-factor authorizations required * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result post_instances_ID_auth (struct TMH_MerchantInstance *mi, struct MHD_Connection *connection, struct TMH_HandlerContext *hc, @@ -274,7 +274,7 @@ retry: } -MHD_RESULT +enum MHD_Result TMH_private_post_instances_ID_auth (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -289,7 +289,7 @@ TMH_private_post_instances_ID_auth (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_public_post_instances_ID_auth (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -314,14 +314,14 @@ TMH_public_post_instances_ID_auth (const struct TMH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TMH_private_post_instances_default_ID_auth ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) { struct TMH_MerchantInstance *mi; - MHD_RESULT ret; + enum MHD_Result ret; mi = TMH_lookup_instance (hc->infix); if (NULL == mi) diff --git a/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.h b/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.h @@ -37,7 +37,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_instances_ID_auth ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -53,7 +53,7 @@ TMH_private_post_instances_ID_auth ( * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_instances_default_ID_auth ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -72,7 +72,7 @@ TMH_private_post_instances_default_ID_auth ( * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_public_post_instances_ID_auth (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-management-instances.c b/src/backend/taler-merchant-httpd_post-management-instances.c @@ -55,7 +55,7 @@ * instance can become fully active * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result post_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc, @@ -505,7 +505,7 @@ post_instances (const struct TMH_RequestHandler *rh, { case GNUNET_DB_STATUS_HARD_ERROR: { - MHD_RESULT ret; + enum MHD_Result ret; TALER_MERCHANTDB_rollback (TMH_db); GNUNET_break (0); @@ -522,7 +522,7 @@ post_instances (const struct TMH_RequestHandler *rh, goto retry; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: { - MHD_RESULT ret; + enum MHD_Result ret; TALER_MERCHANTDB_rollback (TMH_db); GNUNET_break (0); @@ -605,7 +605,7 @@ retry: { char *tok; - MHD_RESULT ret; + enum MHD_Result ret; char *val; val = GNUNET_STRINGS_data_to_string_alloc (&btoken, @@ -643,7 +643,7 @@ retry: * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -665,7 +665,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_public_post_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-management-instances.h b/src/backend/taler-merchant-httpd_post-management-instances.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); @@ -50,7 +50,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_public_post_instances (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c @@ -978,7 +978,7 @@ handle_abort_timeout (void *cls) } -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_abort (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -1000,7 +1000,7 @@ TMH_post_orders_ID_abort (const struct TMH_RequestHandler *rh, return MHD_NO; /* during shutdown, we don't generate any more replies */ if (0 != ac->response_code) { - MHD_RESULT res; + enum MHD_Result res; /* We are *done* processing the request, just queue the response (!) */ diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.h @@ -41,7 +41,7 @@ TMH_force_ac_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_abort (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.c @@ -220,7 +220,7 @@ claim_order (struct TMH_HandlerContext *hc, } -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_claim (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.h @@ -34,7 +34,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_claim (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c @@ -66,7 +66,7 @@ trigger_session_notification (struct TMH_HandlerContext *hc, } -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c @@ -963,7 +963,7 @@ resume_pay_with_error (struct PayContext *pc, */ static void pay_end (struct PayContext *pc, - MHD_RESULT res) + enum MHD_Result res) { pc->phase = (MHD_YES == res) ? PP_END_YES @@ -5228,7 +5228,7 @@ pay_context_cleanup (void *cls) } -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_pay (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.h @@ -41,7 +41,7 @@ TMH_force_pc_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_pay (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.c @@ -558,7 +558,7 @@ process_refunds_cb (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_refund (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_refund (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.c @@ -33,7 +33,7 @@ #include "merchant-database/preflight.h" -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_unclaim (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.h b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_orders_ID_unclaim (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c b/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c @@ -652,7 +652,7 @@ phase_check_exchanges (struct KycAuthContext *kac) static void phase_return_response (struct KycAuthContext *kac) { - MHD_RESULT ret; + enum MHD_Result ret; if (UINT_MAX == kac->response_code) { @@ -668,7 +668,7 @@ phase_return_response (struct KycAuthContext *kac) } -MHD_RESULT +enum MHD_Result TMH_private_post_accounts_H_WIRE_kycauth ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.h b/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.h @@ -43,7 +43,7 @@ TMH_force_kac_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_accounts_H_WIRE_kycauth ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-private-accounts.c b/src/backend/taler-merchant-httpd_post-private-accounts.c @@ -147,7 +147,7 @@ account_cb ( } -MHD_RESULT +enum MHD_Result TMH_private_post_account (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -190,7 +190,7 @@ TMH_private_post_account (const struct TMH_RequestHandler *rh, if (NULL != (err = TALER_payto_validate (pac.uri))) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error ( diff --git a/src/backend/taler-merchant-httpd_post-private-accounts.h b/src/backend/taler-merchant-httpd_post-private-accounts.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_account (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-categories.c b/src/backend/taler-merchant-httpd_post-private-categories.c @@ -35,7 +35,7 @@ #define MAX_RETRIES 3 -MHD_RESULT +enum MHD_Result TMH_private_post_categories (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-categories.h b/src/backend/taler-merchant-httpd_post-private-categories.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_categories ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-private-donau.c b/src/backend/taler-merchant-httpd_post-private-donau.c @@ -248,7 +248,7 @@ post_donau_cleanup (void *cls) * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_donau_instance (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -342,7 +342,7 @@ TMH_private_post_donau_instance (const struct TMH_RequestHandler *rh, respond: if (NULL != pdc->response) { - MHD_RESULT res; + enum MHD_Result res; GNUNET_break (GNUNET_NO == pdc->suspended); res = MHD_queue_response (pdc->connection, diff --git a/src/backend/taler-merchant-httpd_post-private-donau.h b/src/backend/taler-merchant-httpd_post-private-donau.h @@ -41,7 +41,7 @@ TMH_force_post_donau_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_donau_instance (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-groups.c b/src/backend/taler-merchant-httpd_post-private-groups.c @@ -26,7 +26,7 @@ #include "merchant-database/insert_product_group.h" -MHD_RESULT +enum MHD_Result TMH_private_post_groups (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-groups.h b/src/backend/taler-merchant-httpd_post-private-groups.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_groups (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c b/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c @@ -163,7 +163,7 @@ get_refund_limit (void *cls, * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_orders_ID_refund ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, @@ -450,7 +450,7 @@ TMH_private_post_orders_ID_refund ( order_serial); } { - MHD_RESULT ret; + enum MHD_Result ret; char *taler_refund_uri; taler_refund_uri = make_taler_refund_uri (connection, diff --git a/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.h b/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.h @@ -34,7 +34,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-orders.c b/src/backend/taler-merchant-httpd_post-private-orders.c @@ -844,7 +844,7 @@ TMH_force_orders_resume () */ static void finalize_order (struct OrderContext *oc, - MHD_RESULT mret) + enum MHD_Result mret) { oc->phase = (MHD_YES == mret) ? ORDER_PHASE_FINISHED_MHD_YES @@ -885,7 +885,7 @@ reply_with_error (struct OrderContext *oc, enum TALER_ErrorCode ec, const char *detail) { - MHD_RESULT mret; + enum MHD_Result mret; mret = TALER_MHD_reply_with_error (oc->connection, http_status, @@ -1277,7 +1277,7 @@ static void yield_success_response (struct OrderContext *oc, const struct TALER_ClaimTokenP *claim_token) { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_REPLY_JSON_PACK ( oc->connection, @@ -1378,7 +1378,7 @@ phase_execute_order (struct OrderContext *oc) /* We had a product that has insufficient quantities, generate the details for the response. */ struct TALER_MERCHANTDB_ProductDetails pd; - MHD_RESULT ret; + enum MHD_Result ret; const struct InventoryProduct *ip; size_t num_categories = 0; uint64_t *categories = NULL; @@ -2586,7 +2586,7 @@ phase_select_wire_method (struct OrderContext *oc) if (NULL == best) { - MHD_RESULT mret; + enum MHD_Result mret; /* We actually do not have ANY workable exchange(s) */ mret = TALER_MHD_reply_json_steal ( @@ -4736,7 +4736,7 @@ phase_parse_request (struct OrderContext *oc) /* ***************** Main handler **************** */ -MHD_RESULT +enum MHD_Result TMH_private_post_orders ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-private-orders.h b/src/backend/taler-merchant-httpd_post-private-orders.h @@ -41,7 +41,7 @@ TMH_force_orders_resume (void); * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_orders (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-otp-devices.c b/src/backend/taler-merchant-httpd_post-private-otp-devices.c @@ -57,7 +57,7 @@ otp_devices_equal (const struct TALER_MERCHANTDB_OtpDeviceDetails *t1, } -MHD_RESULT +enum MHD_Result TMH_private_post_otp_devices (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-otp-devices.h b/src/backend/taler-merchant-httpd_post-private-otp-devices.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_otp_devices (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-pots.c b/src/backend/taler-merchant-httpd_post-private-pots.c @@ -26,7 +26,7 @@ #include "merchant-database/insert_money_pot.h" -MHD_RESULT +enum MHD_Result TMH_private_post_pots (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-pots.h b/src/backend/taler-merchant-httpd_post-private-pots.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_pots (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c b/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c @@ -31,7 +31,7 @@ #include "merchant-database/lookup_product.h" -MHD_RESULT +enum MHD_Result TMH_private_post_products_ID_lock ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.h b/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_products_ID_lock (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-products.c b/src/backend/taler-merchant-httpd_post-private-products.c @@ -28,7 +28,7 @@ #include <taler/taler_json_lib.h> #include "merchant-database/insert_product.h" -MHD_RESULT +enum MHD_Result TMH_private_post_products (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -135,7 +135,7 @@ TMH_private_post_products (const struct TMH_RequestHandler *rh, bool no_group; bool no_pot; enum GNUNET_DB_QueryStatus qs; - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_assert (NULL != mi); { diff --git a/src/backend/taler-merchant-httpd_post-private-products.h b/src/backend/taler-merchant-httpd_post-private-products.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_products (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-reports.c b/src/backend/taler-merchant-httpd_post-private-reports.c @@ -28,7 +28,7 @@ #include "merchant-database/event_notify.h" -MHD_RESULT +enum MHD_Result TMH_private_post_reports (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-reports.h b/src/backend/taler-merchant-httpd_post-private-reports.h @@ -33,7 +33,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_reports (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-templates.c b/src/backend/taler-merchant-httpd_post-private-templates.c @@ -61,7 +61,7 @@ templates_equal (const struct TALER_MERCHANTDB_TemplateDetails *t1, } -MHD_RESULT +enum MHD_Result TMH_private_post_templates (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -129,7 +129,7 @@ TMH_private_post_templates (const struct TMH_RequestHandler *rh, key)) { char *msg; - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_break_op (0); GNUNET_asprintf (&msg, diff --git a/src/backend/taler-merchant-httpd_post-private-templates.h b/src/backend/taler-merchant-httpd_post-private-templates.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_templates (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-token.c b/src/backend/taler-merchant-httpd_post-private-token.c @@ -37,7 +37,7 @@ #define DEFAULT_DURATION GNUNET_TIME_UNIT_DAYS -MHD_RESULT +enum MHD_Result TMH_private_post_instances_ID_token (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -162,7 +162,7 @@ TMH_private_post_instances_ID_token (const struct TMH_RequestHandler *rh, { char *tok; - MHD_RESULT ret; + enum MHD_Result ret; char *val; val = GNUNET_STRINGS_data_to_string_alloc (&btoken, diff --git a/src/backend/taler-merchant-httpd_post-private-token.h b/src/backend/taler-merchant-httpd_post-private-token.h @@ -36,7 +36,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_instances_ID_token (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c b/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c @@ -84,7 +84,7 @@ token_families_equal (const struct TALER_MERCHANTDB_TokenFamilyDetails *tf1, } -MHD_RESULT +enum MHD_Result TMH_private_post_token_families (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-tokenfamilies.h b/src/backend/taler-merchant-httpd_post-private-tokenfamilies.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_token_families (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-transfers.c b/src/backend/taler-merchant-httpd_post-private-transfers.c @@ -36,7 +36,7 @@ #define MAX_RETRIES 5 -MHD_RESULT +enum MHD_Result TMH_private_post_transfers (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-transfers.h b/src/backend/taler-merchant-httpd_post-private-transfers.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_transfers (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-units.c b/src/backend/taler-merchant-httpd_post-private-units.c @@ -25,7 +25,7 @@ #include "merchant-database/insert_unit.h" -MHD_RESULT +enum MHD_Result TMH_private_post_units (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) @@ -37,7 +37,7 @@ TMH_private_post_units (const struct TMH_RequestHandler *rh, bool unit_active_missing = true; enum GNUNET_GenericReturnValue res; enum GNUNET_DB_QueryStatus qs; - MHD_RESULT ret; + enum MHD_Result ret; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_string ("unit", (const char **) &nud.unit), diff --git a/src/backend/taler-merchant-httpd_post-private-units.h b/src/backend/taler-merchant-httpd_post-private-units.h @@ -24,7 +24,7 @@ #include "taler-merchant-httpd.h" -MHD_RESULT +enum MHD_Result TMH_private_post_units (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-private-webhooks.c b/src/backend/taler-merchant-httpd_post-private-webhooks.c @@ -68,7 +68,7 @@ webhooks_equal (const struct TALER_MERCHANTDB_WebhookDetails *w1, } -MHD_RESULT +enum MHD_Result TMH_private_post_webhooks (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_post-private-webhooks.h b/src/backend/taler-merchant-httpd_post-private-webhooks.h @@ -35,7 +35,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_private_post_webhooks (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c @@ -27,7 +27,7 @@ #include "merchant-database/check_report.h" -MHD_RESULT +enum MHD_Result TMH_post_reports_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.h b/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.h @@ -32,7 +32,7 @@ * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_reports_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c @@ -339,7 +339,7 @@ cleanup_use_context (void *cls) */ static void use_finalize (struct UseContext *uc, - MHD_RESULT ret) + enum MHD_Result ret) { uc->phase = (MHD_YES == ret) ? USE_PHASE_FINISHED_MHD_YES @@ -379,7 +379,7 @@ use_reply_with_error (struct UseContext *uc, enum TALER_ErrorCode ec, const char *detail) { - MHD_RESULT mret; + enum MHD_Result mret; mret = TALER_MHD_reply_with_error (uc->hc->connection, http_status, @@ -1720,7 +1720,7 @@ handle_phase_create_order (struct UseContext *uc) /* ***************** Main handler **************** */ -MHD_RESULT +enum MHD_Result TMH_post_using_templates_ID ( const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.h b/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.h @@ -24,14 +24,14 @@ #include "taler-merchant-httpd.h" /** - * Generate a template that customer can use it. Returns an MHD_RESULT. + * Generate a template that customer can use it. Returns an enum MHD_Result. * * @param rh details about this request handler * @param connection the MHD connection to handle * @param[in,out] hc context with further information about the request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TMH_post_using_templates_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/backend/taler-merchant-httpd_statics.c b/src/backend/taler-merchant-httpd_statics.c @@ -113,7 +113,7 @@ lookup_file (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TMH_return_static (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc) diff --git a/src/backend/taler-merchant-httpd_statics.h b/src/backend/taler-merchant-httpd_statics.h @@ -33,7 +33,7 @@ * @param hc handler context * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection) */ -MHD_RESULT +enum MHD_Result TMH_return_static (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, struct TMH_HandlerContext *hc); diff --git a/src/testing/testing_api_cmd_testserver.c b/src/testing/testing_api_cmd_testserver.c @@ -134,7 +134,7 @@ struct RequestCtx * #MHD_NO if the socket must be closed due to a serious * error while handling the request */ -static MHD_RESULT +static enum MHD_Result handler_cb (void *cls, struct MHD_Connection *connection, const char *url,