commit ea05f99128f60ea4b993e9b28d0e7c86c5894ee3 parent a4d7bb85de8ed6dfb0a8072e2634a09f505774b7 Author: Christian Grothoff <christian@grothoff.org> Date: Sun, 19 Apr 2026 11:32:43 +0200 get rid of legacy MHD compatibility, use enum MHD_Result directly Diffstat:
245 files changed, 526 insertions(+), 531 deletions(-)
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c @@ -204,7 +204,7 @@ handle_mhd_completion_callback (void *cls, * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_config (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -318,7 +318,7 @@ check_auth (const char *token) * @param con_cls closure for request (a `struct Buffer *`) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_mhd_request (void *cls, struct MHD_Connection *connection, const char *url, diff --git a/src/auditor/taler-auditor-httpd.h b/src/auditor/taler-auditor-httpd.h @@ -90,7 +90,7 @@ struct TAH_RequestHandler * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ - MHD_RESULT (*handler)( + enum MHD_Result (*handler)( /* const */ struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_delete-generic.c b/src/auditor/taler-auditor-httpd_delete-generic.c @@ -26,7 +26,7 @@ #include "auditor-database/preflight.h" -MHD_RESULT +enum MHD_Result TAH_delete_generic ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_delete-generic.h b/src/auditor/taler-auditor-httpd_delete-generic.h @@ -25,7 +25,7 @@ /* * FIXME: add comment */ -MHD_RESULT +enum MHD_Result TAH_delete_generic ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-amount-arithmetic-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-amount-arithmetic-inconsistency.c @@ -64,7 +64,7 @@ add_amount_arithmetic_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_amount_arithmetic_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-amount-arithmetic-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-amount-arithmetic-inconsistency.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_amount_arithmetic_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_amount_arithmetic_inconsistency (struct TAH_RequestHandler * rh, struct MHD_Connection * diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-bad-sig-losses.c b/src/auditor/taler-auditor-httpd_get-monitoring-bad-sig-losses.c @@ -62,7 +62,7 @@ add_bad_sig_losses ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_bad_sig_losses ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-bad-sig-losses.h b/src/auditor/taler-auditor-httpd_get-monitoring-bad-sig-losses.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_bad_sig_losses_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_bad_sig_losses ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-balances.c b/src/auditor/taler-auditor-httpd_get-monitoring-balances.c @@ -53,7 +53,7 @@ process_balances ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_balances ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-balances.h b/src/auditor/taler-auditor-httpd_get-monitoring-balances.h @@ -32,7 +32,7 @@ * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_balances ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-closure-lags.c b/src/auditor/taler-auditor-httpd_get-monitoring-closure-lags.c @@ -66,7 +66,7 @@ process_closure_lags ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_closure_lags ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-closure-lags.h b/src/auditor/taler-auditor-httpd_get-monitoring-closure-lags.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_closure_lags_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_closure_lags ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-coin-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-coin-inconsistency.c @@ -57,7 +57,7 @@ add_coin_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_coin_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-coin-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-coin-inconsistency.h @@ -44,7 +44,7 @@ TEAH_get_monitoring_coin_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_coin_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denomination-key-validity-withdraw-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-denomination-key-validity-withdraw-inconsistency.c @@ -65,7 +65,7 @@ process_denomination_key_validity_withdraw_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denomination_key_validity_withdraw_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denomination-key-validity-withdraw-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-denomination-key-validity-withdraw-inconsistency.h @@ -49,7 +49,7 @@ TEAH_get_monitoring_denomination_key_validity_withdraw_inconsistency_done (void) * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denomination_key_validity_withdraw_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denomination-pending.c b/src/auditor/taler-auditor-httpd_get-monitoring-denomination-pending.c @@ -63,7 +63,7 @@ process_denomination_pending ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denomination_pending ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denomination-pending.h b/src/auditor/taler-auditor-httpd_get-monitoring-denomination-pending.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_denomination_pending_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denomination_pending ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denominations-without-sigs.c b/src/auditor/taler-auditor-httpd_get-monitoring-denominations-without-sigs.c @@ -62,7 +62,7 @@ process_denominations_without_sigs ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denominations_without_sigs ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-denominations-without-sigs.h b/src/auditor/taler-auditor-httpd_get-monitoring-denominations-without-sigs.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_denominations_without_sigs_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_denominations_without_sigs ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-deposit-confirmations.c b/src/auditor/taler-auditor-httpd_get-monitoring-deposit-confirmations.c @@ -105,7 +105,7 @@ add_deposit_confirmation ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_deposit_confirmations ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-deposit-confirmations.h b/src/auditor/taler-auditor-httpd_get-monitoring-deposit-confirmations.h @@ -48,7 +48,7 @@ TEAH_get_monitoring_deposit_confirmations_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_deposit_confirmations ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-early-aggregation.c b/src/auditor/taler-auditor-httpd_get-monitoring-early-aggregation.c @@ -60,7 +60,7 @@ add_early_aggregation ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_early_aggregation ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-early-aggregation.h b/src/auditor/taler-auditor-httpd_get-monitoring-early-aggregation.h @@ -32,7 +32,7 @@ * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_early_aggregation ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-emergency-by-count.c b/src/auditor/taler-auditor-httpd_get-monitoring-emergency-by-count.c @@ -67,7 +67,7 @@ process_emergency_by_count ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_emergency_by_count ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-emergency-by-count.h b/src/auditor/taler-auditor-httpd_get-monitoring-emergency-by-count.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_emergency_by_count_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_emergency_by_count ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-emergency.c b/src/auditor/taler-auditor-httpd_get-monitoring-emergency.c @@ -66,7 +66,7 @@ process_emergency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_emergency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-emergency.h b/src/auditor/taler-auditor-httpd_get-monitoring-emergency.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_emergency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_emergency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-fee-time-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-fee-time-inconsistency.c @@ -60,7 +60,7 @@ process_fee_time_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_fee_time_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-fee-time-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-fee-time-inconsistency.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_fee_time_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_fee_time_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-historic-denomination-revenue.c b/src/auditor/taler-auditor-httpd_get-monitoring-historic-denomination-revenue.c @@ -72,7 +72,7 @@ process_historic_denomination_revenue ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_historic_denomination_revenue ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-historic-denomination-revenue.h b/src/auditor/taler-auditor-httpd_get-monitoring-historic-denomination-revenue.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_historic_denomination_revenue_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_historic_denomination_revenue ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-historic-reserve-summary.c b/src/auditor/taler-auditor-httpd_get-monitoring-historic-reserve-summary.c @@ -66,7 +66,7 @@ process_historic_reserve_summary ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_historic_reserve_summary ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-historic-reserve-summary.h b/src/auditor/taler-auditor-httpd_get-monitoring-historic-reserve-summary.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_historic_reserve_summary_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_historic_reserve_summary ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-misattribution-in-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-misattribution-in-inconsistency.c @@ -60,7 +60,7 @@ process_misattribution_in_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_misattribution_in_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-misattribution-in-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-misattribution-in-inconsistency.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_misattribution_in_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_misattribution_in_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-pending-deposits.c b/src/auditor/taler-auditor-httpd_get-monitoring-pending-deposits.c @@ -70,7 +70,7 @@ add_pending_deposit ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_pending_deposits ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-pending-deposits.h b/src/auditor/taler-auditor-httpd_get-monitoring-pending-deposits.h @@ -31,7 +31,7 @@ * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_pending_deposits ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-progress.c b/src/auditor/taler-auditor-httpd_get-monitoring-progress.c @@ -54,7 +54,7 @@ process_progress ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_progress ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-progress.h b/src/auditor/taler-auditor-httpd_get-monitoring-progress.h @@ -21,7 +21,7 @@ #include "taler-auditor-httpd.h" -MHD_RESULT +enum MHD_Result TAH_get_monitoring_progress ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-purse-not-closed-inconsistencies.c b/src/auditor/taler-auditor-httpd_get-monitoring-purse-not-closed-inconsistencies.c @@ -59,7 +59,7 @@ process_purse_not_closed_inconsistencies ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_purse_not_closed_inconsistencies ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-purse-not-closed-inconsistencies.h b/src/auditor/taler-auditor-httpd_get-monitoring-purse-not-closed-inconsistencies.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_purse_not_closed_inconsistencies_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_purse_not_closed_inconsistencies ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-purses.c b/src/auditor/taler-auditor-httpd_get-monitoring-purses.c @@ -63,7 +63,7 @@ process_purses ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_purses ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-purses.h b/src/auditor/taler-auditor-httpd_get-monitoring-purses.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_purses_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_purses ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-insufficient-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-insufficient-inconsistency.c @@ -62,7 +62,7 @@ process_reserve_balance_insufficient_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_balance_insufficient_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-insufficient-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-insufficient-inconsistency.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_reserve_balance_insufficient_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_balance_insufficient_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-summary-wrong-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-summary-wrong-inconsistency.c @@ -57,7 +57,7 @@ process_reserve_balance_summary_wrong_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_balance_summary_wrong_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-summary-wrong-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-balance-summary-wrong-inconsistency.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_reserve_balance_summary_wrong_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_balance_summary_wrong_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-in-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-in-inconsistency.c @@ -70,7 +70,7 @@ process_reserve_in_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_in_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-in-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-in-inconsistency.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_reserve_in_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_in_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-not-closed-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-not-closed-inconsistency.c @@ -62,7 +62,7 @@ process_reserve_not_closed_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_not_closed_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserve-not-closed-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-reserve-not-closed-inconsistency.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_reserve_not_closed_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserve_not_closed_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserves.c b/src/auditor/taler-auditor-httpd_get-monitoring-reserves.c @@ -74,7 +74,7 @@ process_reserves ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserves ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-reserves.h b/src/auditor/taler-auditor-httpd_get-monitoring-reserves.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_reserves_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_reserves ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-row-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-row-inconsistency.c @@ -60,7 +60,7 @@ add_row_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_row_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-row-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-row-inconsistency.h @@ -44,7 +44,7 @@ TEAH_get_monitoring_row_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_row_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-row-minor-inconsistencies.c b/src/auditor/taler-auditor-httpd_get-monitoring-row-minor-inconsistencies.c @@ -60,7 +60,7 @@ process_row_minor_inconsistencies ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_row_minor_inconsistencies ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-row-minor-inconsistencies.h b/src/auditor/taler-auditor-httpd_get-monitoring-row-minor-inconsistencies.h @@ -43,7 +43,7 @@ TEAH_get_monitoring_row_minor_inconsistencies_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_row_minor_inconsistencies ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-wire-format-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-wire-format-inconsistency.c @@ -62,7 +62,7 @@ process_wire_format_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_wire_format_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-wire-format-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-wire-format-inconsistency.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_wire_format_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_wire_format_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-wire-out-inconsistency.c b/src/auditor/taler-auditor-httpd_get-monitoring-wire-out-inconsistency.c @@ -64,7 +64,7 @@ process_wire_out_inconsistency ( } -MHD_RESULT +enum MHD_Result TAH_get_monitoring_wire_out_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_get-monitoring-wire-out-inconsistency.h b/src/auditor/taler-auditor-httpd_get-monitoring-wire-out-inconsistency.h @@ -45,7 +45,7 @@ TEAH_get_monitoring_wire_out_inconsistency_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_get_monitoring_wire_out_inconsistency ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_mhd.c b/src/auditor/taler-auditor-httpd_mhd.c @@ -32,7 +32,7 @@ #include "taler-auditor-httpd_mhd.h" -MHD_RESULT +enum MHD_Result TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -56,7 +56,7 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, } -MHD_RESULT +enum MHD_Result TAH_MHD_handler_agpl_redirect (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_mhd.h b/src/auditor/taler-auditor-httpd_mhd.h @@ -40,7 +40,7 @@ * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -61,7 +61,7 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_MHD_handler_agpl_redirect (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_patch-generic-suppressed.c b/src/auditor/taler-auditor-httpd_patch-generic-suppressed.c @@ -26,7 +26,7 @@ #include "auditor-database/update_generic_suppressed.h" -MHD_RESULT +enum MHD_Result TAH_patch_generic_suppressed ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_patch-generic-suppressed.h b/src/auditor/taler-auditor-httpd_patch-generic-suppressed.h @@ -22,7 +22,7 @@ #include <microhttpd.h> #include "taler-auditor-httpd.h" -MHD_RESULT +enum MHD_Result TAH_patch_generic_suppressed ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_put-deposit-confirmation.c b/src/auditor/taler-auditor-httpd_put-deposit-confirmation.c @@ -102,7 +102,7 @@ static pthread_mutex_t lock; * @param es information about the exchange's signing key * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result verify_and_execute_deposit_confirmation ( struct MHD_Connection *connection, const struct TALER_AUDITORDB_DepositConfirmation *dc, @@ -272,7 +272,7 @@ verify_and_execute_deposit_confirmation ( } -MHD_RESULT +enum MHD_Result TAH_put_deposit_confirmation ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, @@ -382,7 +382,7 @@ TAH_put_deposit_confirmation ( { struct TALER_CoinSpendPublicKeyP coin_pubs[num_coins]; struct TALER_CoinSpendSignatureP coin_sigs[num_coins]; - MHD_RESULT res; + enum MHD_Result res; for (unsigned int i = 0; i < num_coins; i++) { diff --git a/src/auditor/taler-auditor-httpd_put-deposit-confirmation.h b/src/auditor/taler-auditor-httpd_put-deposit-confirmation.h @@ -50,7 +50,7 @@ TEAH_put_deposit_confirmation_done (void); * @param args NULL-terminated array of remaining parts of the URI broken up at '/' * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_put_deposit_confirmation ( struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_spa.c b/src/auditor/taler-auditor-httpd_spa.c @@ -32,7 +32,7 @@ static struct TALER_MHD_Spa *spa; -MHD_RESULT +enum MHD_Result TAH_spa_handler ( /* const */ struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/auditor/taler-auditor-httpd_spa.h b/src/auditor/taler-auditor-httpd_spa.h @@ -37,7 +37,7 @@ * @param args request URL broken up into tokens at '/' characters * @return MHD result code */ -MHD_RESULT +enum MHD_Result TAH_spa_handler ( /* const */ struct TAH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c @@ -84,7 +84,7 @@ handle_mhd_completion_callback (void *cls, * @param con_cls closure for request * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_mhd_request (void *cls, struct MHD_Connection *connection, const char *url, diff --git a/src/bank-lib/fakebank_bank.c b/src/bank-lib/fakebank_bank.c @@ -38,7 +38,7 @@ #include "fakebank_bank_testing_register.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_main_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -200,7 +200,7 @@ TALER_FAKEBANK_bank_main_ ( { /* $METHOD /accounts/$ACCOUNT/taler-wire-gateway/ */ char *acc; - MHD_RESULT ret; + enum MHD_Result ret; acc = GNUNET_strndup (acc_name, end_acc - acc_name); @@ -224,7 +224,7 @@ TALER_FAKEBANK_bank_main_ ( { /* $METHOD /accounts/$ACCOUNT/taler-revenue/ */ char *acc; - MHD_RESULT ret; + enum MHD_Result ret; acc = GNUNET_strndup (acc_name, end_acc - acc_name); @@ -250,7 +250,7 @@ TALER_FAKEBANK_bank_main_ ( { /* POST /accounts/$ACCOUNT/token */ char *acc; - MHD_RESULT ret; + enum MHD_Result ret; acc = GNUNET_strndup (acc_name, end_acc - acc_name); @@ -460,7 +460,7 @@ TALER_FAKEBANK_bank_main_ ( "/withdrawals")) { /* POST /accounts/$ACCOUNT/withdrawals */ - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_FAKEBANK_bank_post_account_withdrawals_ ( h, @@ -478,7 +478,7 @@ TALER_FAKEBANK_bank_main_ ( strlen ("/withdrawals/"))) { /* POST /accounts/$ACCOUNT/withdrawals/$WID/$OP */ - MHD_RESULT ret; + enum MHD_Result ret; const char *pos = &end_acc[strlen ("/withdrawals/")]; const char *op = strchr (pos, '/'); diff --git a/src/bank-lib/fakebank_bank.h b/src/bank-lib/fakebank_bank.h @@ -42,7 +42,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_main_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, const char *url, diff --git a/src/bank-lib/fakebank_bank_accounts_withdrawals.c b/src/bank-lib/fakebank_bank_accounts_withdrawals.c @@ -31,7 +31,7 @@ #include "fakebank_common_lookup.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_account_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_accounts_withdrawals.h b/src/bank-lib/fakebank_bank_accounts_withdrawals.h @@ -39,7 +39,7 @@ * @param withdrawal_id withdrawal ID to return status of * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_account_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_get_accounts.c b/src/bank-lib/fakebank_bank_get_accounts.c @@ -38,7 +38,7 @@ * @param account_name name of the account * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_accounts_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, const char *account_name) diff --git a/src/bank-lib/fakebank_bank_get_accounts.h b/src/bank-lib/fakebank_bank_get_accounts.h @@ -38,7 +38,7 @@ * @param account_name name of the account * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_accounts_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, const char *account_name); diff --git a/src/bank-lib/fakebank_bank_get_root.c b/src/bank-lib/fakebank_bank_get_root.c @@ -36,11 +36,11 @@ * @param connection the connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_root_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection) { - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *resp; #define HELLOMSG "Hello, Fakebank!" diff --git a/src/bank-lib/fakebank_bank_get_root.h b/src/bank-lib/fakebank_bank_get_root.h @@ -36,7 +36,7 @@ * @param connection the connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_root_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection); diff --git a/src/bank-lib/fakebank_bank_get_withdrawals.c b/src/bank-lib/fakebank_bank_get_withdrawals.c @@ -40,7 +40,7 @@ * @param withdrawal_id withdrawal ID to return status of * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_get_withdrawals.h b/src/bank-lib/fakebank_bank_get_withdrawals.h @@ -40,7 +40,7 @@ * @param withdrawal_id withdrawal ID to return status of * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_get_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_post_accounts_token.c b/src/bank-lib/fakebank_bank_post_accounts_token.c @@ -43,7 +43,7 @@ * @param duration how long should the token be valid * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result do_post_account_token ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -55,7 +55,7 @@ do_post_account_token ( struct Account *acc; char *tok; struct GNUNET_TIME_Absolute expiration; - MHD_RESULT res; + enum MHD_Result res; expiration = GNUNET_TIME_relative_to_absolute (duration); GNUNET_assert (0 == @@ -108,7 +108,7 @@ do_post_account_token ( * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_post_accounts_token_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -120,7 +120,7 @@ TALER_FAKEBANK_bank_post_accounts_token_ ( struct ConnectionContext *cc = *con_cls; enum GNUNET_MHD_PostResult pr; json_t *json; - MHD_RESULT res; + enum MHD_Result res; if (NULL == cc) { diff --git a/src/bank-lib/fakebank_bank_post_accounts_token.h b/src/bank-lib/fakebank_bank_post_accounts_token.h @@ -42,7 +42,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_post_accounts_token_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c @@ -41,7 +41,7 @@ * @param amount amount to withdraw * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result do_post_account_withdrawals ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -95,7 +95,7 @@ do_post_account_withdrawals ( { char *wopids; char *uri; - MHD_RESULT res; + enum MHD_Result res; wopids = GNUNET_STRINGS_data_to_string_alloc (&wo->wopid, sizeof (wo->wopid)); @@ -131,7 +131,7 @@ do_post_account_withdrawals ( * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_post_account_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -143,7 +143,7 @@ TALER_FAKEBANK_bank_post_account_withdrawals_ ( struct ConnectionContext *cc = *con_cls; enum GNUNET_MHD_PostResult pr; json_t *json; - MHD_RESULT res; + enum MHD_Result res; if (NULL == cc) { diff --git a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.h b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.h @@ -42,7 +42,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_post_account_withdrawals_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_id_op.c b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.c @@ -44,7 +44,7 @@ * @param body uploaded JSON body, NULL if none * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result bank_withdrawals_confirm ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -197,7 +197,7 @@ bank_withdrawals_confirm ( * @param body uploaded JSON body, NULL if none * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result bank_withdrawals_abort ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -259,7 +259,7 @@ bank_withdrawals_abort ( } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_withdrawals_id_op_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -310,7 +310,7 @@ TALER_FAKEBANK_bank_withdrawals_id_op_ ( if (0 == strcmp (op, "/confirm")) { - MHD_RESULT res; + enum MHD_Result res; res = bank_withdrawals_confirm (h, connection, @@ -323,7 +323,7 @@ TALER_FAKEBANK_bank_withdrawals_id_op_ ( if (0 == strcmp (op, "/abort")) { - MHD_RESULT res; + enum MHD_Result res; res = bank_withdrawals_abort (h, connection, diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_id_op.h b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.h @@ -44,7 +44,7 @@ * @param[in,out] con_cls application context that can be used * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_withdrawals_id_op_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_bank_testing_register.c b/src/bank-lib/fakebank_bank_testing_register.c @@ -30,7 +30,7 @@ #include "fakebank_bank_testing_register.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_testing_register_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -41,7 +41,7 @@ TALER_FAKEBANK_bank_testing_register_ ( struct ConnectionContext *cc = *con_cls; enum GNUNET_MHD_PostResult pr; json_t *json; - MHD_RESULT res; + enum MHD_Result res; if (NULL == cc) { diff --git a/src/bank-lib/fakebank_bank_testing_register.h b/src/bank-lib/fakebank_bank_testing_register.h @@ -42,7 +42,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_bank_testing_register_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbi.c b/src/bank-lib/fakebank_tbi.c @@ -31,7 +31,7 @@ #include "fakebank_tbi_post_withdrawal_operation.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, const char *url, diff --git a/src/bank-lib/fakebank_tbi.h b/src/bank-lib/fakebank_tbi.h @@ -42,7 +42,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, const char *url, diff --git a/src/bank-lib/fakebank_tbi_get_withdrawal_operation.c b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.c @@ -45,7 +45,7 @@ withdraw_cleanup (void *cls) } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_get_withdrawal_operation_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbi_get_withdrawal_operation.h b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.h @@ -40,7 +40,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_get_withdrawal_operation_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbi_post_withdrawal_operation.c b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.c @@ -44,7 +44,7 @@ * pre-determined amount * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result do_post_withdrawal ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -123,7 +123,7 @@ do_post_withdrawal ( NULL); if (NULL == credit_account) { - MHD_RESULT res; + enum MHD_Result res; GNUNET_break_op (0); GNUNET_assert (0 == @@ -197,7 +197,7 @@ do_post_withdrawal ( } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_post_withdrawal ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -209,7 +209,7 @@ TALER_FAKEBANK_tbi_post_withdrawal ( struct ConnectionContext *cc = *con_cls; enum GNUNET_MHD_PostResult pr; json_t *json; - MHD_RESULT res; + enum MHD_Result res; if (NULL == cc) { diff --git a/src/bank-lib/fakebank_tbi_post_withdrawal_operation.h b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.h @@ -41,7 +41,7 @@ * @param con_cls closure for request * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbi_post_withdrawal ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbr.c b/src/bank-lib/fakebank_tbr.c @@ -31,7 +31,7 @@ #include "fakebank_tbr_get_root.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_main_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbr.h b/src/bank-lib/fakebank_tbr.h @@ -44,7 +44,7 @@ * @param con_cls closure * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_main_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbr_get_history.c b/src/bank-lib/fakebank_tbr_get_history.c @@ -48,7 +48,7 @@ history_cleanup (void *cls) } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_get_history ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbr_get_history.h b/src/bank-lib/fakebank_tbr_get_history.h @@ -42,7 +42,7 @@ * @param con_cls closure for request (NULL or &special_ptr) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_get_history ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_tbr_get_root.c b/src/bank-lib/fakebank_tbr_get_root.c @@ -29,11 +29,11 @@ #include "fakebank_tbr_get_root.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_get_root (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection) { - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *resp; #define HELLOMSG "Hello, Fakebank (Bank Revenue API here)!" diff --git a/src/bank-lib/fakebank_tbr_get_root.h b/src/bank-lib/fakebank_tbr_get_root.h @@ -37,7 +37,7 @@ * @param connection the connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_tbr_get_root (struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection); diff --git a/src/bank-lib/fakebank_twg.c b/src/bank-lib/fakebank_twg.c @@ -35,7 +35,7 @@ #include "fakebank_twg_transfer.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_main_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg.h b/src/bank-lib/fakebank_twg.h @@ -42,7 +42,7 @@ * @param con_cls closure * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_main_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_admin_add_incoming.c b/src/bank-lib/fakebank_twg_admin_add_incoming.c @@ -30,7 +30,7 @@ #include "fakebank_common_make_admin_transfer.h" #include "fakebank_twg_admin_add_incoming.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_admin_add_incoming_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_admin_add_incoming.h b/src/bank-lib/fakebank_twg_admin_add_incoming.h @@ -40,7 +40,7 @@ * @param con_cls closure for request (a `struct ConnectionContext *`) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_admin_add_incoming_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_admin_add_kycauth.c b/src/bank-lib/fakebank_twg_admin_add_kycauth.c @@ -31,7 +31,7 @@ #include "fakebank_twg_admin_add_kycauth.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_admin_add_kycauth_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_admin_add_kycauth.h b/src/bank-lib/fakebank_twg_admin_add_kycauth.h @@ -40,7 +40,7 @@ * @param con_cls closure for request (a `struct ConnectionContext *`) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_admin_add_kycauth_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_get_root.c b/src/bank-lib/fakebank_twg_get_root.c @@ -36,12 +36,12 @@ * @param connection the connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_root_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection) { - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *resp; #define HELLOMSG "Hello, Fakebank (Taler Wire Gateway)!" diff --git a/src/bank-lib/fakebank_twg_get_root.h b/src/bank-lib/fakebank_twg_get_root.h @@ -37,7 +37,7 @@ * @param connection the connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_root_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection); diff --git a/src/bank-lib/fakebank_twg_get_transfers.c b/src/bank-lib/fakebank_twg_get_transfers.c @@ -33,7 +33,7 @@ #include "fakebank_twg_get_transfers.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_transfers_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_get_transfers.h b/src/bank-lib/fakebank_twg_get_transfers.h @@ -39,7 +39,7 @@ * @param account which account the request is about * @param con_cls closure for request */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_transfers_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -56,7 +56,7 @@ TALER_FAKEBANK_twg_get_transfers_ ( * @param id the transfer ID the request is about * @param con_cls closure for request */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_transfers_id_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_get_transfers_id.c b/src/bank-lib/fakebank_twg_get_transfers_id.c @@ -33,7 +33,7 @@ #include "fakebank_twg_get_transfers.h" -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_transfers_id_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_history.c b/src/bank-lib/fakebank_twg_history.c @@ -47,7 +47,7 @@ history_cleanup (void *cls) } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_debit_history_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -304,7 +304,7 @@ finish: } -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_credit_history_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_history.h b/src/bank-lib/fakebank_twg_history.h @@ -39,7 +39,7 @@ * @param account which account the request is about * @param con_cls closure for request */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_debit_history_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -56,7 +56,7 @@ TALER_FAKEBANK_twg_get_debit_history_ ( * @param con_cls closure for request (NULL or &special_ptr) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_twg_get_credit_history_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/bank-lib/fakebank_twg_transfer.c b/src/bank-lib/fakebank_twg_transfer.c @@ -42,7 +42,7 @@ * @param con_cls closure for request (a `struct ConnectionContext *`) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_handle_transfer_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, @@ -138,7 +138,7 @@ TALER_FAKEBANK_handle_transfer_ ( &ts); if (GNUNET_OK != ret) { - MHD_RESULT res; + enum MHD_Result res; char *uids; GNUNET_break (0); diff --git a/src/bank-lib/fakebank_twg_transfer.h b/src/bank-lib/fakebank_twg_transfer.h @@ -43,7 +43,7 @@ * @param con_cls closure for request (a `struct ConnectionContext *`) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_FAKEBANK_handle_transfer_ ( struct TALER_FAKEBANK_Handle *h, struct MHD_Connection *connection, diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c @@ -274,7 +274,7 @@ static struct GNUNET_CURL_RescheduleContext *exchange_curl_rc; * @param root uploaded JSON data * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*CoinOpHandler)(struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root); @@ -287,7 +287,7 @@ typedef MHD_RESULT * @param connection where to send the reply on * @param details details for the error message, can be NULL */ -static MHD_RESULT +static enum MHD_Result r404 (struct MHD_Connection *connection, const char *details) { @@ -307,7 +307,7 @@ r404 (struct MHD_Connection *connection, * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_coins (struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]) @@ -377,7 +377,7 @@ handle_post_coins (struct TEH_RequestContext *rc, * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_coins (struct TEH_RequestContext *rc, const char *const args[2]) { @@ -425,7 +425,7 @@ handle_get_coins (struct TEH_RequestContext *rc, * @param root uploaded JSON data * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*AmlOpPostHandler)(struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, const json_t *root); @@ -440,7 +440,7 @@ typedef MHD_RESULT * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_aml (struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]) @@ -537,7 +537,7 @@ handle_post_aml (struct TEH_RequestContext *rc, * @param args remaining arguments * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*AmlOpGetHandler)(struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, const char *const args[]); @@ -552,7 +552,7 @@ typedef MHD_RESULT * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_aml (struct TEH_RequestContext *rc, const char *const args[]) { @@ -724,7 +724,7 @@ handle_get_aml (struct TEH_RequestContext *rc, * @param root uploaded JSON data * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*ReserveOpHandler)(struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); @@ -739,7 +739,7 @@ typedef MHD_RESULT * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_reserves (struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]) @@ -810,7 +810,7 @@ handle_post_reserves (struct TEH_RequestContext *rc, * @param reserve_pub the public key of the reserve * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*ReserveGetOpHandler)(struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub); @@ -823,7 +823,7 @@ typedef MHD_RESULT * @param args NULL-terminated array of additional options, zero, one or two * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_reserves (struct TEH_RequestContext *rc, const char *const args[]) { @@ -896,7 +896,7 @@ handle_get_reserves (struct TEH_RequestContext *rc, * @param root uploaded JSON data * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*PurseOpHandler)(struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, const json_t *root); @@ -911,7 +911,7 @@ typedef MHD_RESULT * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_purses (struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]) @@ -1102,7 +1102,7 @@ handle_mhd_completion_callback (void *cls, * @param[in,out] upload_data_size number of bytes in @a upload_data * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result proceed_with_handler (struct TEH_RequestContext *rc, const char *url, const char *upload_data, @@ -1111,7 +1111,7 @@ proceed_with_handler (struct TEH_RequestContext *rc, const struct TEH_RequestHandler *rh = rc->rh; const char *args[rh->nargs + 2]; size_t ulen = strlen (url) + 1; - MHD_RESULT ret; + enum MHD_Result ret; /* We do check for "ulen" here, because we'll later stack-allocate a buffer of that size and don't want to enable malicious clients to cause us @@ -1220,13 +1220,13 @@ proceed_with_handler (struct TEH_RequestContext *rc, * @param args array of additional options (must be empty for this function) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handler_seed (struct TEH_RequestContext *rc, const char *const args[]) { #define SEED_SIZE 32 char *body; - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *resp; (void) args; @@ -1259,7 +1259,7 @@ handler_seed (struct TEH_RequestContext *rc, * @param root uploaded JSON data * @return MHD result code */ -typedef MHD_RESULT +typedef enum MHD_Result (*ManagementPostHandler)( struct MHD_Connection *connection, const json_t *root); @@ -1273,7 +1273,7 @@ typedef MHD_RESULT * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_management (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]) @@ -1452,7 +1452,7 @@ handle_post_management (struct TEH_RequestContext *rc, * @param args array of additional options (must be [0] == "keys") * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_management (struct TEH_RequestContext *rc, const char *const args[2]) { @@ -1478,7 +1478,7 @@ handle_get_management (struct TEH_RequestContext *rc, * @param args array of additional options * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_post_auditors (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]) @@ -1534,7 +1534,7 @@ handle_post_auditors (struct TEH_RequestContext *rc, * @param args remaining arguments (should be empty) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result toplevel_redirect (struct TEH_RequestContext *rc, const char *const args[]) { @@ -1566,7 +1566,7 @@ toplevel_redirect (struct TEH_RequestContext *rc, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (rc->connection, MHD_HTTP_FOUND, @@ -1590,7 +1590,7 @@ toplevel_redirect (struct TEH_RequestContext *rc, * @param con_cls closure for request (a `struct TEH_RequestContext *`) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_mhd_request (void *cls, struct MHD_Connection *connection, const char *url, @@ -1937,7 +1937,7 @@ handle_mhd_request (void *cls, /* on repeated requests, check our cache first */ if (NULL != rc->rh) { - MHD_RESULT ret; + enum MHD_Result ret; const char *start; if ('\0' == url[0]) @@ -2014,7 +2014,7 @@ handle_mhd_request (void *cls, if (0 == strcasecmp (method, rh->method)) { - MHD_RESULT ret; + enum MHD_Result ret; /* cache to avoid the loop next time */ rc->rh = rh; @@ -2040,7 +2040,7 @@ handle_mhd_request (void *cls, { /* we found a matching address, but the method is wrong */ struct MHD_Response *reply; - MHD_RESULT ret; + enum MHD_Result ret; char *allowed = NULL; GNUNET_break_op (0); @@ -2099,7 +2099,7 @@ handle_mhd_request (void *cls, /* No handler matches, generate not found */ { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, diff --git a/src/exchange/taler-exchange-httpd.h b/src/exchange/taler-exchange-httpd.h @@ -290,7 +290,7 @@ struct TEH_RequestHandler * @param args array of arguments, needs to be of length @e args_expected * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*get)(struct TEH_RequestContext *rc, const char *const args[]); @@ -303,7 +303,7 @@ struct TEH_RequestHandler * @param args array of arguments, needs to be of length @e nargs * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*post)(struct TEH_RequestContext *rc, const json_t *root, const char *const args[]); @@ -315,7 +315,7 @@ struct TEH_RequestHandler * @param args array of arguments, needs to be of length @e nargs * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*delete)(struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_common_deposit.c b/src/exchange/taler-exchange-httpd_common_deposit.c @@ -70,7 +70,7 @@ TEH_common_purse_deposit_parse_coin ( /* check denomination exists and is valid */ { struct TEH_DenominationKey *dk; - MHD_RESULT mret; + enum MHD_Result mret; dk = TEH_keys_denomination_by_hash (&coin->cpi.denom_pub_hash, connection, diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c @@ -40,7 +40,7 @@ enum GNUNET_DB_QueryStatus TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin, struct MHD_Connection *connection, uint64_t *known_coin_id, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { enum TALER_EXCHANGEDB_CoinKnownStatus cks; struct TALER_DenominationHashP h_denom_pub; @@ -124,7 +124,7 @@ enum GNUNET_GenericReturnValue TEH_DB_run_transaction (struct MHD_Connection *connection, const char *name, enum TEH_MetricTypeRequest mt, - MHD_RESULT *mhd_ret, + enum MHD_Result *mhd_ret, TEH_DB_TransactionCallback cb, void *cb_cls) { diff --git a/src/exchange/taler-exchange-httpd_db.h b/src/exchange/taler-exchange-httpd_db.h @@ -53,7 +53,7 @@ enum GNUNET_DB_QueryStatus TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin, struct MHD_Connection *connection, uint64_t *known_coin_id, - MHD_RESULT *mhd_ret); + enum MHD_Result *mhd_ret); /** @@ -73,7 +73,7 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin, typedef enum GNUNET_DB_QueryStatus (*TEH_DB_TransactionCallback)(void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret); + enum MHD_Result *mhd_ret); /** @@ -97,7 +97,7 @@ enum GNUNET_GenericReturnValue TEH_DB_run_transaction (struct MHD_Connection *connection, const char *name, enum TEH_MetricTypeRequest mt, - MHD_RESULT *mhd_ret, + enum MHD_Result *mhd_ret, TEH_DB_TransactionCallback cb, void *cb_cls); diff --git a/src/exchange/taler-exchange-httpd_delete-purses-PURSE_PUB.c b/src/exchange/taler-exchange-httpd_delete-purses-PURSE_PUB.c @@ -36,7 +36,7 @@ #include "exchange-database/event_notify.h" -MHD_RESULT +enum MHD_Result TEH_handler_purses_delete ( struct TEH_RequestContext *rc, const char *const args[1]) diff --git a/src/exchange/taler-exchange-httpd_delete-purses-PURSE_PUB.h b/src/exchange/taler-exchange-httpd_delete-purses-PURSE_PUB.h @@ -33,7 +33,7 @@ * @param args argument with the public key of the purse * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_purses_delete ( struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_extensions.c b/src/exchange/taler-exchange-httpd_extensions.c @@ -258,7 +258,7 @@ static enum GNUNET_DB_QueryStatus policy_fulfillment_transaction ( void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct TALER_PolicyFulfillmentTransactionData *fulfillment = cls; @@ -272,7 +272,7 @@ policy_fulfillment_transaction ( /* FIXME[oec]-#7999: In this handler: do we transition correctly between states? */ -MHD_RESULT +enum MHD_Result TEH_extensions_post_handler ( struct TEH_RequestContext *rc, const json_t *root, @@ -417,7 +417,7 @@ TEH_extensions_post_handler ( /* execute fulfillment transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; struct TALER_PolicyFulfillmentTransactionData fulfillment = { .proof = root, .timestamp = GNUNET_TIME_timestamp_get (), diff --git a/src/exchange/taler-exchange-httpd_extensions.h b/src/exchange/taler-exchange-httpd_extensions.h @@ -49,7 +49,7 @@ TEH_extensions_done (void); * @param args array of additional options * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_extensions_post_handler ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_get-SPA.c b/src/exchange/taler-exchange-httpd_get-SPA.c @@ -38,7 +38,7 @@ static struct TALER_MHD_Spa *aml_spa; static struct TALER_MHD_Spa *kyc_spa; -MHD_RESULT +enum MHD_Result TEH_handler_aml_spa (struct TEH_RequestContext *rc, const char *const args[]) { @@ -50,7 +50,7 @@ TEH_handler_aml_spa (struct TEH_RequestContext *rc, } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_spa (struct TEH_RequestContext *rc, const char *const args[]) { diff --git a/src/exchange/taler-exchange-httpd_get-SPA.h b/src/exchange/taler-exchange-httpd_get-SPA.h @@ -33,7 +33,7 @@ * @param[in,out] args remaining arguments (ignored) * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection) */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_spa (struct TEH_RequestContext *rc, const char *const args[]); @@ -46,7 +46,7 @@ TEH_handler_aml_spa (struct TEH_RequestContext *rc, * @param[in,out] args remaining arguments (ignored) * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection) */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_spa (struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_get-TERMS.c b/src/exchange/taler-exchange-httpd_get-TERMS.c @@ -38,7 +38,7 @@ static struct TALER_MHD_Legal *tos; static struct TALER_MHD_Legal *pp; -MHD_RESULT +enum MHD_Result TEH_handler_terms (struct TEH_RequestContext *rc, const char *const args[]) { @@ -48,7 +48,7 @@ TEH_handler_terms (struct TEH_RequestContext *rc, } -MHD_RESULT +enum MHD_Result TEH_handler_privacy (struct TEH_RequestContext *rc, const char *const args[]) { diff --git a/src/exchange/taler-exchange-httpd_get-TERMS.h b/src/exchange/taler-exchange-httpd_get-TERMS.h @@ -35,7 +35,7 @@ * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_terms (struct TEH_RequestContext *rc, const char *const args[]); @@ -47,7 +47,7 @@ TEH_handler_terms (struct TEH_RequestContext *rc, * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_privacy (struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-accounts.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-accounts.c @@ -290,7 +290,7 @@ record_cb ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_accounts_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -432,7 +432,7 @@ TEH_handler_aml_accounts_get ( case RCF_XML: { struct MHD_Response *resp; - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_buffer_write_str (&rctx.details.xml, XML_FOOTER); @@ -455,7 +455,7 @@ TEH_handler_aml_accounts_get ( case RCF_CSV: { struct MHD_Response *resp; - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_buffer_write_str (&rctx.details.csv, CSV_FOOTER); diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-accounts.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-accounts.h @@ -35,7 +35,7 @@ * @param args GET arguments (should be the state) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_accounts_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-attributes-H_NORMALIZED_PAYTO.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-attributes-H_NORMALIZED_PAYTO.c @@ -541,7 +541,7 @@ build_cover_page ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_attributes_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-attributes-H_NORMALIZED_PAYTO.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-attributes-H_NORMALIZED_PAYTO.h @@ -35,7 +35,7 @@ * @param args GET arguments (should be the state) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_attributes_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-decisions.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-decisions.c @@ -99,7 +99,7 @@ record_cb ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_decisions_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-kyc-statistics-NAMES.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-kyc-statistics-NAMES.c @@ -62,7 +62,7 @@ add_stat ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_kyc_statistics_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-kyc-statistics-NAMES.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-kyc-statistics-NAMES.h @@ -35,7 +35,7 @@ * @param args GET arguments (name of the statistic) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_kyc_statistics_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-legitimizations.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-legitimizations.c @@ -75,7 +75,7 @@ record_cb ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_legitimization_measures_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-legitimizations.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-legitimizations.h @@ -34,7 +34,7 @@ * @param args GET arguments (should be the state) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_legitimization_measures_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-measures.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-measures.c @@ -29,7 +29,7 @@ #include "taler-exchange-httpd_get-aml-OFFICER_PUB-measures.h" -MHD_RESULT +enum MHD_Result TEH_handler_aml_measures_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-measures.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-measures.h @@ -35,7 +35,7 @@ * @param args GET arguments (should be empty) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_measures_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-transfers.c b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-transfers.c @@ -91,7 +91,7 @@ record_cb ( * @param args further arguments provided (should be empty) * @return MHD status */ -static MHD_RESULT +static enum MHD_Result aml_transfer_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -216,7 +216,7 @@ aml_transfer_get ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_credit_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -229,7 +229,7 @@ TEH_handler_aml_transfer_credit_get ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_kycauth_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -242,7 +242,7 @@ TEH_handler_aml_transfer_kycauth_get ( } -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_debit_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-transfers.h b/src/exchange/taler-exchange-httpd_get-aml-OFFICER_PUB-transfers.h @@ -35,7 +35,7 @@ * @param args GET arguments (should be empty) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_credit_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -52,7 +52,7 @@ TEH_handler_aml_transfer_credit_get ( * @param args GET arguments (should be empty) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_kycauth_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -69,7 +69,7 @@ TEH_handler_aml_transfer_kycauth_get ( * @param args GET arguments (should be empty) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_transfer_debit_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_get-coins-COIN_PUB-history.c b/src/exchange/taler-exchange-httpd_get-coins-COIN_PUB-history.c @@ -585,7 +585,7 @@ compile_transaction_history ( } -MHD_RESULT +enum MHD_Result TEH_handler_coins_get (struct TEH_RequestContext *rc, const struct TALER_CoinSpendPublicKeyP *coin_pub) { @@ -745,7 +745,7 @@ TEH_handler_coins_get (struct TEH_RequestContext *rc, MHD_HTTP_HEADER_ETAG, etagp)); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (rc->connection, http_status, diff --git a/src/exchange/taler-exchange-httpd_get-coins-COIN_PUB-history.h b/src/exchange/taler-exchange-httpd_get-coins-COIN_PUB-history.h @@ -46,7 +46,7 @@ TEH_reserves_get_cleanup (void); * @param coin_pub public key of the coin * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_coins_get (struct TEH_RequestContext *rc, const struct TALER_CoinSpendPublicKeyP *coin_pub); diff --git a/src/exchange/taler-exchange-httpd_get-config.c b/src/exchange/taler-exchange-httpd_get-config.c @@ -26,7 +26,7 @@ #include <jansson.h> -MHD_RESULT +enum MHD_Result TEH_handler_config (struct TEH_RequestContext *rc, const char *const args[]) { diff --git a/src/exchange/taler-exchange-httpd_get-config.h b/src/exchange/taler-exchange-httpd_get-config.h @@ -51,7 +51,7 @@ * @param[in,out] args remaining arguments (ignored) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_config (struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_get-contracts-CONTRACT_PUB.c b/src/exchange/taler-exchange-httpd_get-contracts-CONTRACT_PUB.c @@ -28,7 +28,7 @@ #include "exchange-database/select_contract.h" -MHD_RESULT +enum MHD_Result TEH_handler_contracts_get (struct TEH_RequestContext *rc, const char *const args[1]) { @@ -38,7 +38,7 @@ TEH_handler_contracts_get (struct TEH_RequestContext *rc, size_t econtract_size; enum GNUNET_DB_QueryStatus qs; struct TALER_PurseContractSignatureP econtract_sig; - MHD_RESULT res; + enum MHD_Result res; if (GNUNET_OK != GNUNET_STRINGS_string_to_data (args[0], diff --git a/src/exchange/taler-exchange-httpd_get-contracts-CONTRACT_PUB.h b/src/exchange/taler-exchange-httpd_get-contracts-CONTRACT_PUB.h @@ -36,7 +36,7 @@ * @param args array of additional options (length: 1, first is the contract_pub) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_contracts_get (struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_get-deposits.c b/src/exchange/taler-exchange-httpd_get-deposits.c @@ -186,7 +186,7 @@ TEH_deposits_get_cleanup () * @param ctx details to respond with * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_deposit_details ( const struct DepositWtidContext *ctx) { @@ -270,7 +270,7 @@ db_event_cb (void *cls, * @param ctx context of the signed request to execute * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_track_transaction_request ( struct DepositWtidContext *ctx) { @@ -400,7 +400,7 @@ dwc_cleaner (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_deposits_get (struct TEH_RequestContext *rc, const char *const args[4]) { diff --git a/src/exchange/taler-exchange-httpd_get-deposits.h b/src/exchange/taler-exchange-httpd_get-deposits.h @@ -42,7 +42,7 @@ TEH_deposits_get_cleanup (void); * h_wire, merchant_pub, h_contract_terms and coin_pub) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_deposits_get (struct TEH_RequestContext *rc, const char *const args[4]); diff --git a/src/exchange/taler-exchange-httpd_get-keys.c b/src/exchange/taler-exchange-httpd_get-keys.c @@ -1052,7 +1052,7 @@ keys_timeout_cb (void *cls) * * @param[in] connection to suspend */ -static MHD_RESULT +static enum MHD_Result suspend_request (struct MHD_Connection *connection) { struct SuspendedKeysRequests *skr; @@ -3452,7 +3452,7 @@ struct TEH_DenominationKey * TEH_keys_denomination_by_hash ( const struct TALER_DenominationHashP *h_denom_pub, struct MHD_Connection *conn, - MHD_RESULT *mret) + enum MHD_Result *mret) { struct TEH_KeyStateHandle *ksh; @@ -3478,7 +3478,7 @@ TEH_keys_denomination_by_hash_from_state ( const struct TEH_KeyStateHandle *ksh, const struct TALER_DenominationHashP *h_denom_pub, struct MHD_Connection *conn, - MHD_RESULT *mret) + enum MHD_Result *mret) { struct TEH_DenominationKey *dk; @@ -3933,7 +3933,7 @@ krd_search_comparator (const void *key, } -MHD_RESULT +enum MHD_Result TEH_keys_get_handler (struct TEH_RequestContext *rc, const char *const args[]) { @@ -4345,7 +4345,7 @@ add_future_signkey_cb (void *cls, } -MHD_RESULT +enum MHD_Result TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh, struct MHD_Connection *connection) { diff --git a/src/exchange/taler-exchange-httpd_get-keys.h b/src/exchange/taler-exchange-httpd_get-keys.h @@ -244,7 +244,7 @@ struct TEH_DenominationKey * TEH_keys_denomination_by_hash ( const struct TALER_DenominationHashP *h_denom_pub, struct MHD_Connection *conn, - MHD_RESULT *mret); + enum MHD_Result *mret); /** @@ -265,7 +265,7 @@ TEH_keys_denomination_by_hash_from_state ( const struct TEH_KeyStateHandle *ksh, const struct TALER_DenominationHashP *h_denom_pub, struct MHD_Connection *conn, - MHD_RESULT *mret); + enum MHD_Result *mret); /** @@ -551,7 +551,7 @@ TEH_keys_exchange_revoke (const struct TALER_ExchangePublicKeyP *exchange_pub); * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_keys_get_handler (struct TEH_RequestContext *rc, const char *const args[]); @@ -564,7 +564,7 @@ TEH_keys_get_handler (struct TEH_RequestContext *rc, * @param connection the MHD connection to handle * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh, struct MHD_Connection *connection); diff --git a/src/exchange/taler-exchange-httpd_get-kyc-check-H_NORMALIZED_PAYTO.c b/src/exchange/taler-exchange-httpd_get-kyc-check-H_NORMALIZED_PAYTO.c @@ -208,7 +208,7 @@ db_event_cb (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_check ( struct TEH_RequestContext *rc, const char *const args[1]) diff --git a/src/exchange/taler-exchange-httpd_get-kyc-check-H_NORMALIZED_PAYTO.h b/src/exchange/taler-exchange-httpd_get-kyc-check-H_NORMALIZED_PAYTO.h @@ -33,7 +33,7 @@ * @param args one argument with the legitimization_uuid * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_check ( struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_get-kyc-info-ACCESS_TOKEN.c b/src/exchange/taler-exchange-httpd_get-kyc-info-ACCESS_TOKEN.c @@ -695,7 +695,7 @@ current_rules_cb ( } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_info ( struct TEH_RequestContext *rc, const char *const args[1]) diff --git a/src/exchange/taler-exchange-httpd_get-kyc-info-ACCESS_TOKEN.h b/src/exchange/taler-exchange-httpd_get-kyc-info-ACCESS_TOKEN.h @@ -40,7 +40,7 @@ TEH_kyc_info_cleanup (void); * @param args one argument with the legitimization_uuid * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_info ( struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_get-kyc-proof-PROVIDER_NAME.c b/src/exchange/taler-exchange-httpd_get-kyc-proof-PROVIDER_NAME.c @@ -285,7 +285,7 @@ proof_finish ( * @param message additional message to return * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result respond_html_ec (struct TEH_RequestContext *rc, unsigned int http_status, const char *template, @@ -293,7 +293,7 @@ respond_html_ec (struct TEH_RequestContext *rc, const char *message) { struct MHD_Response *response; - MHD_RESULT res; + enum MHD_Result res; response = make_html_error (rc->connection, template, @@ -484,7 +484,7 @@ clean_kpc (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_proof ( struct TEH_RequestContext *rc, const char *const args[1]) diff --git a/src/exchange/taler-exchange-httpd_get-kyc-proof-PROVIDER_NAME.h b/src/exchange/taler-exchange-httpd_get-kyc-proof-PROVIDER_NAME.h @@ -40,7 +40,7 @@ TEH_kyc_proof_cleanup (void); * @param args one argument with the legitimization_uuid * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_proof ( struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_get-metrics.c b/src/exchange/taler-exchange-httpd_get-metrics.c @@ -42,13 +42,13 @@ unsigned long long TEH_METRICS_num_keyexchanges[TEH_MT_KEYX_COUNT]; unsigned long long TEH_METRICS_num_success[TEH_MT_SUCCESS_COUNT]; -MHD_RESULT +enum MHD_Result TEH_handler_metrics (struct TEH_RequestContext *rc, const char *const args[]) { char *reply; struct MHD_Response *resp; - MHD_RESULT ret; + enum MHD_Result ret; (void) args; GNUNET_asprintf (&reply, diff --git a/src/exchange/taler-exchange-httpd_get-metrics.h b/src/exchange/taler-exchange-httpd_get-metrics.h @@ -124,7 +124,7 @@ extern unsigned long long TEH_METRICS_num_keyexchanges[TEH_MT_KEYX_COUNT]; * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_metrics (struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_get-purses-PURSE_PUB-merge.c b/src/exchange/taler-exchange-httpd_get-purses-PURSE_PUB-merge.c @@ -214,14 +214,14 @@ db_event_cb (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_purses_get (struct TEH_RequestContext *rc, const char *const args[2]) { struct GetContext *gc = rc->rh_ctx; bool purse_deleted; bool purse_refunded; - MHD_RESULT res; + enum MHD_Result res; if (NULL == gc) { diff --git a/src/exchange/taler-exchange-httpd_get-purses-PURSE_PUB-merge.h b/src/exchange/taler-exchange-httpd_get-purses-PURSE_PUB-merge.h @@ -44,7 +44,7 @@ TEH_purses_get_cleanup (void); * @param args array of additional options (length: 2, the purse_pub and a target) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_purses_get (struct TEH_RequestContext *rc, const char *const args[2]); diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-attest.c b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-attest.c @@ -106,7 +106,7 @@ kyc_process_cb (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_get_reserves_attest ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub) diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-attest.h b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-attest.h @@ -38,7 +38,7 @@ * attributes for * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_get_reserves_attest ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub); diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-history.c b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-history.c @@ -478,7 +478,7 @@ add_response_headers (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_history ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub) @@ -632,7 +632,7 @@ TEH_handler_reserves_history ( MHD_HTTP_HEADER_ETAG, etagp)); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (rc->connection, http_status, diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-history.h b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB-history.h @@ -34,7 +34,7 @@ * @param reserve_pub public key of the reserve * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_history ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub); diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB.c b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB.c @@ -181,7 +181,7 @@ db_event_cb (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_get ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub) diff --git a/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB.h b/src/exchange/taler-exchange-httpd_get-reserves-RESERVE_PUB.h @@ -46,7 +46,7 @@ TEH_reserves_get_cleanup (void); * @param reserve_pub public key of the reserve * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_get ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub); diff --git a/src/exchange/taler-exchange-httpd_get-transfers-WTID.c b/src/exchange/taler-exchange-httpd_get-transfers-WTID.c @@ -90,7 +90,7 @@ struct AggregatedDepositDetail * @param wdd_head linked list with details about the combined deposits * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_transfer_details (struct MHD_Connection *connection, const struct TALER_Amount *total, const struct TALER_MerchantPublicKeyP *merchant_pub, @@ -497,7 +497,7 @@ free_ctx (struct WtidTransactionContext *ctx) static enum GNUNET_DB_QueryStatus get_transfer_deposits (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct WtidTransactionContext *ctx = cls; enum GNUNET_DB_QueryStatus qs; @@ -600,12 +600,12 @@ get_transfer_deposits (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_transfers_get (struct TEH_RequestContext *rc, const char *const args[1]) { struct WtidTransactionContext ctx; - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; memset (&ctx, 0, diff --git a/src/exchange/taler-exchange-httpd_get-transfers-WTID.h b/src/exchange/taler-exchange-httpd_get-transfers-WTID.h @@ -33,7 +33,7 @@ * @param args array of additional options (length: 1, just the wtid) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_transfers_get (struct TEH_RequestContext *rc, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_kyc-webhook.c b/src/exchange/taler-exchange-httpd_kyc-webhook.c @@ -353,7 +353,7 @@ clean_kwh (struct TEH_RequestContext *rc) * @param args one argument with the legitimization_uuid * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handler_kyc_webhook_generic ( struct TEH_RequestContext *rc, const char *method, @@ -421,7 +421,7 @@ handler_kyc_webhook_generic ( if (NULL != kwh->response) { - MHD_RESULT res; + enum MHD_Result res; res = MHD_queue_response (rc->connection, kwh->response_code, @@ -441,7 +441,7 @@ handler_kyc_webhook_generic ( } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_webhook_get ( struct TEH_RequestContext *rc, const char *const args[]) @@ -454,7 +454,7 @@ TEH_handler_kyc_webhook_get ( } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_webhook_post ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_kyc-webhook.h b/src/exchange/taler-exchange-httpd_kyc-webhook.h @@ -40,7 +40,7 @@ TEH_kyc_webhook_cleanup (void); * @param args one argument with the legitimization_uuid * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_webhook_get ( struct TEH_RequestContext *rc, const char *const args[]); @@ -54,7 +54,7 @@ TEH_handler_kyc_webhook_get ( * @param args one argument with the legitimization_uuid * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_webhook_post ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_management.h b/src/exchange/taler-exchange-httpd_management.h @@ -32,7 +32,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_auditors ( struct MHD_Connection *connection, const json_t *root); @@ -46,7 +46,7 @@ TEH_handler_management_auditors ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_auditors_AP_disable ( struct MHD_Connection *connection, const struct TALER_AuditorPublicKeyP *auditor_pub, @@ -61,7 +61,7 @@ TEH_handler_management_auditors_AP_disable ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_denominations_HDP_revoke ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *h_denom_pub, @@ -76,7 +76,7 @@ TEH_handler_management_denominations_HDP_revoke ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_signkeys_EP_revoke ( struct MHD_Connection *connection, const struct TALER_ExchangePublicKeyP *exchange_pub, @@ -90,7 +90,7 @@ TEH_handler_management_signkeys_EP_revoke ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_keys ( struct MHD_Connection *connection, const json_t *root); @@ -103,7 +103,7 @@ TEH_handler_management_post_keys ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire ( struct MHD_Connection *connection, const json_t *root); @@ -116,7 +116,7 @@ TEH_handler_management_post_wire ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire_disable ( struct MHD_Connection *connection, const json_t *root); @@ -129,7 +129,7 @@ TEH_handler_management_post_wire_disable ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire_fees ( struct MHD_Connection *connection, const json_t *root); @@ -142,7 +142,7 @@ TEH_handler_management_post_wire_fees ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_global_fees ( struct MHD_Connection *connection, const json_t *root); @@ -155,7 +155,7 @@ TEH_handler_management_post_global_fees ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_extensions ( struct MHD_Connection *connection, const json_t *root); @@ -168,7 +168,7 @@ TEH_handler_management_post_extensions ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_post_drain ( struct MHD_Connection *connection, const json_t *root); @@ -181,7 +181,7 @@ TEH_handler_management_post_drain ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_aml_officers ( struct MHD_Connection *connection, const json_t *root); @@ -194,7 +194,7 @@ TEH_handler_management_aml_officers ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_management_partners ( struct MHD_Connection *connection, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_mhd.c b/src/exchange/taler-exchange-httpd_mhd.c @@ -33,7 +33,7 @@ #include "taler-exchange-httpd_mhd.h" -MHD_RESULT +enum MHD_Result TEH_handler_static_response (struct TEH_RequestContext *rc, const char *const args[]) { @@ -52,7 +52,7 @@ TEH_handler_static_response (struct TEH_RequestContext *rc, } -MHD_RESULT +enum MHD_Result TEH_handler_agpl_redirect (struct TEH_RequestContext *rc, const char *const args[]) { diff --git a/src/exchange/taler-exchange-httpd_mhd.h b/src/exchange/taler-exchange-httpd_mhd.h @@ -36,7 +36,7 @@ * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_static_response (struct TEH_RequestContext *rc, const char *const args[]); @@ -49,7 +49,7 @@ TEH_handler_static_response (struct TEH_RequestContext *rc, * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_agpl_redirect (struct TEH_RequestContext *rc, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_post-aml-OFFICER_PUB-decision.c b/src/exchange/taler-exchange-httpd_post-aml-OFFICER_PUB-decision.c @@ -166,7 +166,7 @@ aml_trigger_callback ( } -MHD_RESULT +enum MHD_Result TEH_handler_post_aml_decision ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -191,7 +191,7 @@ TEH_handler_post_aml_decision ( struct TALER_AmlOfficerSignatureP officer_sig; struct TALER_KYCLOGIC_LegitimizationRuleSet *lrs = NULL; uint64_t legi_measure_serial_id = 0; - MHD_RESULT ret; + enum MHD_Result ret; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_string ( diff --git a/src/exchange/taler-exchange-httpd_post-aml-OFFICER_PUB-decision.h b/src/exchange/taler-exchange-httpd_post-aml-OFFICER_PUB-decision.h @@ -35,7 +35,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_post_aml_decision ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, @@ -52,7 +52,7 @@ TEH_handler_post_aml_decision ( * @param args GET arguments (should be the state) * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_aml_decisions_get ( struct TEH_RequestContext *rc, const struct TALER_AmlOfficerPublicKeyP *officer_pub, diff --git a/src/exchange/taler-exchange-httpd_post-auditors-AUDITOR_PUB-H_DENOM_PUB.c b/src/exchange/taler-exchange-httpd_post-auditors-AUDITOR_PUB-H_DENOM_PUB.c @@ -73,7 +73,7 @@ struct AddAuditorDenomContext static enum GNUNET_DB_QueryStatus add_auditor_denom_sig (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddAuditorDenomContext *awc = cls; struct TALER_EXCHANGEDB_DenominationKeyMetaData meta; @@ -185,7 +185,7 @@ add_auditor_denom_sig (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_auditors ( struct MHD_Connection *connection, const struct TALER_AuditorPublicKeyP *auditor_pub, @@ -201,7 +201,7 @@ TEH_handler_auditors ( &awc.auditor_sig), GNUNET_JSON_spec_end () }; - MHD_RESULT res; + enum MHD_Result res; enum GNUNET_GenericReturnValue ret; ret = TALER_MHD_parse_json_data (connection, diff --git a/src/exchange/taler-exchange-httpd_post-auditors-AUDITOR_PUB-H_DENOM_PUB.h b/src/exchange/taler-exchange-httpd_post-auditors-AUDITOR_PUB-H_DENOM_PUB.h @@ -35,7 +35,7 @@ * @param h_denom_pub hash of the denomination public key * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_auditors ( struct MHD_Connection *connection, const struct TALER_AuditorPublicKeyP *auditor_pub, diff --git a/src/exchange/taler-exchange-httpd_post-batch-deposit.c b/src/exchange/taler-exchange-httpd_post-batch-deposit.c @@ -216,7 +216,7 @@ TEH_batch_deposit_cleanup () */ static void finish_loop (struct BatchDepositContext *bdc, - MHD_RESULT mres) + enum MHD_Result mres) { bdc->phase = (MHD_YES == mres) ? BDC_PHASE_RETURN_YES @@ -299,7 +299,7 @@ bdc_phase_reply_success ( static enum GNUNET_DB_QueryStatus batch_deposit_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct BatchDepositContext *bdc = cls; const struct TALER_EXCHANGEDB_BatchDeposit *bd = &bdc->bd; @@ -426,7 +426,7 @@ batch_deposit_transaction (void *cls, static void bdc_phase_transact (struct BatchDepositContext *bdc) { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_SYSERR == TALER_EXCHANGEDB_preflight (TEH_pg)) @@ -732,7 +732,7 @@ parse_coin (const struct BatchDepositContext *bdc, /* check denomination exists and is valid */ { struct TEH_DenominationKey *dk; - MHD_RESULT mret; + enum MHD_Result mret; dk = TEH_keys_denomination_by_hash ( &cdi->coin.denom_pub_hash, @@ -1006,7 +1006,7 @@ bdc_phase_parse (struct BatchDepositContext *bdc, emsg = TALER_payto_validate (bd->receiver_wire_account); if (NULL != emsg) { - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_break_op (0); GNUNET_JSON_parse_free (spec); @@ -1147,7 +1147,7 @@ bdc_cleaner (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_batch_deposit (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/exchange/taler-exchange-httpd_post-batch-deposit.h b/src/exchange/taler-exchange-httpd_post-batch-deposit.h @@ -48,7 +48,7 @@ TEH_batch_deposit_cleanup (void); * @param args arguments, empty in this case * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_batch_deposit (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_post-blinding-prepare.c b/src/exchange/taler-exchange-httpd_post-blinding-prepare.c @@ -29,7 +29,7 @@ #include "taler-exchange-httpd_responses.h" #include "taler-exchange-httpd_get-keys.h" -MHD_RESULT +enum MHD_Result TEH_handler_blinding_prepare (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/exchange/taler-exchange-httpd_post-blinding-prepare.h b/src/exchange/taler-exchange-httpd_post-blinding-prepare.h @@ -32,7 +32,7 @@ * @param args empty array * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_blinding_prepare (struct TEH_RequestContext *rc, const json_t *root, const char *const args[]); diff --git a/src/exchange/taler-exchange-httpd_post-coins-COIN_PUB-refund.c b/src/exchange/taler-exchange-httpd_post-coins-COIN_PUB-refund.c @@ -50,7 +50,7 @@ * @param refund details about the successful refund * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_refund_success (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_EXCHANGEDB_RefundListEntry *refund) @@ -126,7 +126,7 @@ struct RefundContext static enum GNUNET_DB_QueryStatus refund_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct RefundContext *rctx = cls; const struct TALER_EXCHANGEDB_Refund *refund = rctx->refund; @@ -207,7 +207,7 @@ refund_transaction (void *cls, * @param[in,out] refund information about the refund * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result verify_and_execute_refund (struct MHD_Connection *connection, struct TALER_EXCHANGEDB_Refund *refund) { @@ -256,7 +256,7 @@ verify_and_execute_refund (struct MHD_Connection *connection, "get_coin_denomination"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: { - MHD_RESULT res; + enum MHD_Result res; char *dhs; GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs); @@ -279,7 +279,7 @@ verify_and_execute_refund (struct MHD_Connection *connection, { /* Obtain information about the coin's denomination! */ struct TEH_DenominationKey *dk; - MHD_RESULT mret; + enum MHD_Result mret; dk = TEH_keys_denomination_by_hash (&refund->coin.denom_pub_hash, connection, @@ -297,7 +297,7 @@ verify_and_execute_refund (struct MHD_Connection *connection, /* Finally run the actual transaction logic */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -327,7 +327,7 @@ verify_and_execute_refund (struct MHD_Connection *connection, * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_refund (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root) @@ -363,7 +363,7 @@ TEH_handler_refund (struct MHD_Connection *connection, return MHD_YES; /* failure */ } { - MHD_RESULT res; + enum MHD_Result res; res = verify_and_execute_refund (connection, &refund); diff --git a/src/exchange/taler-exchange-httpd_post-coins-COIN_PUB-refund.h b/src/exchange/taler-exchange-httpd_post-coins-COIN_PUB-refund.h @@ -39,7 +39,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_refund (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_post-kyc-start-ID.c b/src/exchange/taler-exchange-httpd_post-kyc-start-ID.c @@ -263,7 +263,7 @@ initiate_cb ( } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_start ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-kyc-start-ID.h b/src/exchange/taler-exchange-httpd_post-kyc-start-ID.h @@ -40,7 +40,7 @@ TEH_kyc_start_cleanup (void); * @param args array with the ID * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_start ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-kyc-upload-ID.c b/src/exchange/taler-exchange-httpd_post-kyc-upload-ID.c @@ -212,7 +212,7 @@ aml_trigger_callback ( static enum GNUNET_DB_QueryStatus transact (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct UploadContext *uc = cls; struct TEH_RequestContext *rc = uc->rc; @@ -441,7 +441,7 @@ transact (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_upload ( struct TEH_RequestContext *rc, const json_t *root, @@ -534,7 +534,7 @@ TEH_handler_kyc_upload ( } { - MHD_RESULT mhd_ret = -1; + enum MHD_Result mhd_ret = -1; if (GNUNET_OK != TEH_DB_run_transaction (rc->connection, diff --git a/src/exchange/taler-exchange-httpd_post-kyc-upload-ID.h b/src/exchange/taler-exchange-httpd_post-kyc-upload-ID.h @@ -44,7 +44,7 @@ TEH_kyc_upload_cleanup (void); * @param args includes the ID from the URL (without "/") * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_upload (struct TEH_RequestContext *rc, const json_t *root, const char *const args[1]); diff --git a/src/exchange/taler-exchange-httpd_post-kyc-wallet.c b/src/exchange/taler-exchange-httpd_post-kyc-wallet.c @@ -219,7 +219,7 @@ krc_cleaner (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_kyc_wallet ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-kyc-wallet.h b/src/exchange/taler-exchange-httpd_post-kyc-wallet.h @@ -42,7 +42,7 @@ TEH_kyc_wallet_cleanup (void); * @param args empty array * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_kyc_wallet ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-management-aml-officers.c b/src/exchange/taler-exchange-httpd_post-management-aml-officers.c @@ -36,7 +36,7 @@ #define MAX_RETRIES 10 -MHD_RESULT +enum MHD_Result TEH_handler_management_aml_officers ( struct MHD_Connection *connection, const json_t *root) diff --git a/src/exchange/taler-exchange-httpd_post-management-auditors-AUDITOR_PUB-disable.c b/src/exchange/taler-exchange-httpd_post-management-auditors-AUDITOR_PUB-disable.c @@ -73,7 +73,7 @@ struct DelAuditorContext static enum GNUNET_DB_QueryStatus del_auditor (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct DelAuditorContext *dac = cls; struct GNUNET_TIME_Timestamp last_date; @@ -135,7 +135,7 @@ del_auditor (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_auditors_AP_disable ( struct MHD_Connection *connection, const struct TALER_AuditorPublicKeyP *auditor_pub, @@ -152,7 +152,7 @@ TEH_handler_management_auditors_AP_disable ( &dac.validity_end), GNUNET_JSON_spec_end () }; - MHD_RESULT res; + enum MHD_Result res; enum GNUNET_GenericReturnValue ret; ret = TALER_MHD_parse_json_data (connection, diff --git a/src/exchange/taler-exchange-httpd_post-management-auditors.c b/src/exchange/taler-exchange-httpd_post-management-auditors.c @@ -83,7 +83,7 @@ struct AddAuditorContext static enum GNUNET_DB_QueryStatus add_auditor (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddAuditorContext *aac = cls; struct GNUNET_TIME_Timestamp last_date; @@ -144,7 +144,7 @@ add_auditor (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_auditors ( struct MHD_Connection *connection, const json_t *root) @@ -163,7 +163,7 @@ TEH_handler_management_auditors ( &aac.validity_start), GNUNET_JSON_spec_end () }; - MHD_RESULT res; + enum MHD_Result res; enum GNUNET_GenericReturnValue ret; ret = TALER_MHD_parse_json_data (connection, diff --git a/src/exchange/taler-exchange-httpd_post-management-denominations-H_DENOM_PUB-revoke.c b/src/exchange/taler-exchange-httpd_post-management-denominations-H_DENOM_PUB-revoke.c @@ -31,7 +31,7 @@ #include "exchange-database/insert_denomination_revocation.h" -MHD_RESULT +enum MHD_Result TEH_handler_management_denominations_HDP_revoke ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *h_denom_pub, diff --git a/src/exchange/taler-exchange-httpd_post-management-drain.c b/src/exchange/taler-exchange-httpd_post-management-drain.c @@ -86,7 +86,7 @@ struct DrainContext static enum GNUNET_DB_QueryStatus drain (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct DrainContext *dc = cls; enum GNUNET_DB_QueryStatus qs; @@ -114,7 +114,7 @@ drain (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_drain ( struct MHD_Connection *connection, const json_t *root) @@ -171,7 +171,7 @@ TEH_handler_management_post_drain ( { enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; + enum MHD_Result ret; res = TEH_DB_run_transaction (connection, "insert drain profit", diff --git a/src/exchange/taler-exchange-httpd_post-management-extensions.c b/src/exchange/taler-exchange-httpd_post-management-extensions.c @@ -71,7 +71,7 @@ struct SetExtensionsContext static enum GNUNET_DB_QueryStatus set_extensions (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct SetExtensionsContext *sec = cls; @@ -195,12 +195,12 @@ verify_extensions_from_json ( } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_extensions ( struct MHD_Connection *connection, const json_t *root) { - MHD_RESULT ret; + enum MHD_Result ret; const json_t *extensions; struct SetExtensionsContext sec = {0}; struct GNUNET_JSON_Specification top_spec[] = { diff --git a/src/exchange/taler-exchange-httpd_post-management-global-fees.c b/src/exchange/taler-exchange-httpd_post-management-global-fees.c @@ -92,7 +92,7 @@ struct AddFeeContext static enum GNUNET_DB_QueryStatus add_fee (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddFeeContext *afc = cls; enum GNUNET_DB_QueryStatus qs; @@ -166,7 +166,7 @@ add_fee (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_global_fees ( struct MHD_Connection *connection, const json_t *root) @@ -232,7 +232,7 @@ TEH_handler_management_post_global_fees ( { enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; + enum MHD_Result ret; res = TEH_DB_run_transaction (connection, "add global fee", diff --git a/src/exchange/taler-exchange-httpd_post-management-keys.c b/src/exchange/taler-exchange-httpd_post-management-keys.c @@ -203,7 +203,7 @@ signkey_meta_cmp ( static enum GNUNET_DB_QueryStatus add_keys (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddKeysContext *akc = cls; @@ -355,7 +355,7 @@ cleanup_akc (struct AddKeysContext *akc) } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_keys ( struct MHD_Connection *connection, const json_t *root) @@ -370,7 +370,7 @@ TEH_handler_management_post_keys ( &signkey_sigs), GNUNET_JSON_spec_end () }; - MHD_RESULT ret; + enum MHD_Result ret; { enum GNUNET_GenericReturnValue res; diff --git a/src/exchange/taler-exchange-httpd_post-management-partners.c b/src/exchange/taler-exchange-httpd_post-management-partners.c @@ -30,7 +30,7 @@ #include "exchange-database/insert_partner.h" -MHD_RESULT +enum MHD_Result TEH_handler_management_partners ( struct MHD_Connection *connection, const json_t *root) diff --git a/src/exchange/taler-exchange-httpd_post-management-signkeys-EXCHANGE_PUB-revoke.c b/src/exchange/taler-exchange-httpd_post-management-signkeys-EXCHANGE_PUB-revoke.c @@ -31,7 +31,7 @@ #include "exchange-database/insert_signkey_revocation.h" -MHD_RESULT +enum MHD_Result TEH_handler_management_signkeys_EP_revoke ( struct MHD_Connection *connection, const struct TALER_ExchangePublicKeyP *exchange_pub, diff --git a/src/exchange/taler-exchange-httpd_post-management-wire-disable.c b/src/exchange/taler-exchange-httpd_post-management-wire-disable.c @@ -73,7 +73,7 @@ struct DelWireContext static enum GNUNET_DB_QueryStatus del_wire (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct DelWireContext *awc = cls; struct GNUNET_TIME_Timestamp last_date; @@ -140,7 +140,7 @@ del_wire (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire_disable ( struct MHD_Connection *connection, const json_t *root) @@ -184,7 +184,7 @@ TEH_handler_management_post_wire_disable ( { enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; + enum MHD_Result ret; res = TEH_DB_run_transaction (connection, "del wire", diff --git a/src/exchange/taler-exchange-httpd_post-management-wire-fee.c b/src/exchange/taler-exchange-httpd_post-management-wire-fee.c @@ -82,7 +82,7 @@ struct AddFeeContext static enum GNUNET_DB_QueryStatus add_fee (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddFeeContext *afc = cls; enum GNUNET_DB_QueryStatus qs; @@ -149,7 +149,7 @@ add_fee (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire_fees ( struct MHD_Connection *connection, const json_t *root) @@ -206,7 +206,7 @@ TEH_handler_management_post_wire_fees ( { enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; + enum MHD_Result ret; res = TEH_DB_run_transaction (connection, "add wire fee", diff --git a/src/exchange/taler-exchange-httpd_post-management-wire.c b/src/exchange/taler-exchange-httpd_post-management-wire.c @@ -115,7 +115,7 @@ struct AddWireContext static enum GNUNET_DB_QueryStatus add_wire (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct AddWireContext *awc = cls; struct GNUNET_TIME_Timestamp last_date; @@ -187,7 +187,7 @@ add_wire (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_management_post_wire ( struct MHD_Connection *connection, const json_t *root) @@ -248,7 +248,7 @@ TEH_handler_management_post_wire ( if (NULL != msg) { - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_break_op (0); ret = TALER_MHD_reply_with_error ( @@ -322,7 +322,7 @@ TEH_handler_management_post_wire ( { enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; + enum MHD_Result ret; res = TEH_DB_run_transaction (connection, "add wire", diff --git a/src/exchange/taler-exchange-httpd_post-melt.c b/src/exchange/taler-exchange-httpd_post-melt.c @@ -335,7 +335,7 @@ TEH_melt_cleanup () */ static void finish_loop (struct MeltContext *mc, - MHD_RESULT mres) + enum MHD_Result mres) { mc->phase = (MHD_YES == mres) ? MELT_PHASE_RETURN_YES @@ -1628,7 +1628,7 @@ static enum GNUNET_DB_QueryStatus melt_transaction ( void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct MeltContext *mc = cls; enum GNUNET_DB_QueryStatus qs; @@ -1728,7 +1728,7 @@ phase_run_transaction ( /* first, make sure coin is known */ if (! mc->coin_is_known) { - MHD_RESULT mhd_ret = -1; + enum MHD_Result mhd_ret = -1; enum GNUNET_DB_QueryStatus qs; for (unsigned int tries = 0; tries<MAX_TRANSACTION_COMMIT_RETRIES; tries++) @@ -1763,7 +1763,7 @@ phase_run_transaction ( /* run main database transaction */ { - MHD_RESULT mhd_ret = -1; + enum MHD_Result mhd_ret = -1; enum GNUNET_GenericReturnValue ret; enum MeltPhase current_phase = mc->phase; @@ -1806,7 +1806,7 @@ phase_run_transaction ( } -MHD_RESULT +enum MHD_Result TEH_handler_melt ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-melt.h b/src/exchange/taler-exchange-httpd_post-melt.h @@ -42,7 +42,7 @@ TEH_melt_cleanup (void); * @param args array of additional options, not used * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_melt ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-create.c b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-create.c @@ -116,7 +116,7 @@ struct PurseCreateContext static enum GNUNET_DB_QueryStatus create_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct PurseCreateContext *pcc = cls; enum GNUNET_DB_QueryStatus qs; @@ -427,7 +427,7 @@ parse_coin (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TEH_handler_purses_create ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, @@ -633,7 +633,7 @@ TEH_handler_purses_create ( /* execute transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -653,7 +653,7 @@ TEH_handler_purses_create ( /* generate regular response */ { - MHD_RESULT res; + enum MHD_Result res; res = TEH_RESPONSE_reply_purse_created (connection, pcc.exchange_timestamp, diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-create.h b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-create.h @@ -37,7 +37,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_purses_create ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-deposit.c b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-deposit.c @@ -100,7 +100,7 @@ struct PurseDepositContext * @param pcc details about the request that succeeded * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_deposit_success (struct MHD_Connection *connection, const struct PurseDepositContext *pcc) { @@ -161,7 +161,7 @@ reply_deposit_success (struct MHD_Connection *connection, static enum GNUNET_DB_QueryStatus deposit_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct PurseDepositContext *pcc = cls; enum GNUNET_DB_QueryStatus qs; @@ -325,7 +325,7 @@ parse_coin (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TEH_handler_purses_deposit ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, @@ -466,7 +466,7 @@ TEH_handler_purses_deposit ( /* execute transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -500,7 +500,7 @@ TEH_handler_purses_deposit ( /* generate regular response */ { - MHD_RESULT res; + enum MHD_Result res; res = reply_deposit_success (connection, &pcc); diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-deposit.h b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-deposit.h @@ -37,7 +37,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_purses_deposit ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-merge.c b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-merge.c @@ -233,7 +233,7 @@ legi_result_cb ( * @param pmc details about the request that succeeded * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_merge_success (const struct PurseMergeContext *pmc) { struct MHD_Connection *connection = pmc->rc->connection; @@ -375,7 +375,7 @@ amount_iterator (void *cls, static enum GNUNET_DB_QueryStatus merge_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct PurseMergeContext *pmc = cls; enum GNUNET_DB_QueryStatus qs; @@ -514,7 +514,7 @@ clean_purse_merge_rc (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_purses_merge ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, @@ -700,7 +700,7 @@ TEH_handler_purses_merge ( method); if (NULL == pmc->wf) { - MHD_RESULT res; + enum MHD_Result res; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot merge purse: wire fees not configured!\n"); @@ -783,7 +783,7 @@ TEH_handler_purses_merge ( /* execute merge transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (rc->connection, diff --git a/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-merge.h b/src/exchange/taler-exchange-httpd_post-purses-PURSE_PUB-merge.h @@ -44,7 +44,7 @@ TEH_purses_merge_cleanup (void); * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_purses_merge ( struct TEH_RequestContext *rc, const struct TALER_PurseContractPublicKeyP *purse_pub, diff --git a/src/exchange/taler-exchange-httpd_post-recoup-refresh.c b/src/exchange/taler-exchange-httpd_post-recoup-refresh.c @@ -102,7 +102,7 @@ struct RecoupContext static enum GNUNET_DB_QueryStatus recoup_refresh_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct RecoupContext *pc = cls; enum GNUNET_DB_QueryStatus qs; @@ -171,7 +171,7 @@ recoup_refresh_transaction (void *cls, * @param coin_sig signature of the coin * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result verify_and_execute_recoup_refresh ( struct MHD_Connection *connection, const struct TALER_CoinPublicInfo *coin, @@ -182,7 +182,7 @@ verify_and_execute_recoup_refresh ( { struct RecoupContext pc; const struct TEH_DenominationKey *dk; - MHD_RESULT mret; + enum MHD_Result mret; struct TALER_BlindedCoinHashP h_blind; /* check denomination exists and is in recoup mode */ @@ -291,7 +291,7 @@ verify_and_execute_recoup_refresh ( pc.coin = coin; { - MHD_RESULT mhd_ret = MHD_NO; + enum MHD_Result mhd_ret = MHD_NO; enum GNUNET_DB_QueryStatus qs; /* make sure coin is 'known' in database */ @@ -336,7 +336,7 @@ verify_and_execute_recoup_refresh ( /* Perform actual recoup transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -367,7 +367,7 @@ verify_and_execute_recoup_refresh ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_recoup_refresh (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root) @@ -413,7 +413,7 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection, if (GNUNET_NO == ret) return MHD_YES; /* failure */ { - MHD_RESULT res; + enum MHD_Result res; res = verify_and_execute_recoup_refresh (connection, &coin, diff --git a/src/exchange/taler-exchange-httpd_post-recoup-refresh.h b/src/exchange/taler-exchange-httpd_post-recoup-refresh.h @@ -37,7 +37,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_recoup_refresh (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_post-recoup-withdraw.c b/src/exchange/taler-exchange-httpd_post-recoup-withdraw.c @@ -105,7 +105,7 @@ struct RecoupContext static enum GNUNET_DB_QueryStatus recoup_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct RecoupContext *pc = cls; enum GNUNET_DB_QueryStatus qs; @@ -175,7 +175,7 @@ recoup_transaction (void *cls, * @param coin_sig signature of the coin * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result verify_and_execute_recoup ( struct MHD_Connection *connection, const struct TALER_CoinPublicInfo *coin, @@ -187,7 +187,7 @@ verify_and_execute_recoup ( { struct RecoupContext pc; const struct TEH_DenominationKey *dk; - MHD_RESULT mret; + enum MHD_Result mret; /* check denomination exists and is in recoup mode */ dk = TEH_keys_denomination_by_hash (&coin->denom_pub_hash, @@ -298,7 +298,7 @@ verify_and_execute_recoup ( pc.coin = coin; { - MHD_RESULT mhd_ret = MHD_NO; + enum MHD_Result mhd_ret = MHD_NO; enum GNUNET_DB_QueryStatus qs; /* make sure coin is 'known' in database */ @@ -344,7 +344,7 @@ verify_and_execute_recoup ( /* Perform actual recoup transaction */ { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -375,7 +375,7 @@ verify_and_execute_recoup ( * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_recoup (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root) @@ -424,7 +424,7 @@ TEH_handler_recoup (struct MHD_Connection *connection, if (GNUNET_NO == ret) return MHD_YES; /* failure */ { - MHD_RESULT res; + enum MHD_Result res; res = verify_and_execute_recoup (connection, &coin, diff --git a/src/exchange/taler-exchange-httpd_post-recoup-withdraw.h b/src/exchange/taler-exchange-httpd_post-recoup-withdraw.h @@ -37,7 +37,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_recoup (struct MHD_Connection *connection, const struct TALER_CoinSpendPublicKeyP *coin_pub, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-attest.c b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-attest.c @@ -99,7 +99,7 @@ struct ReserveAttestContext * @param rhc reserve attest to return * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_reserve_attest_success (struct MHD_Connection *connection, const struct ReserveAttestContext *rhc) { @@ -245,7 +245,7 @@ kyc_process_cb (void *cls, static enum GNUNET_DB_QueryStatus reserve_attest_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct ReserveAttestContext *rsc = cls; enum GNUNET_DB_QueryStatus qs; @@ -280,7 +280,7 @@ reserve_attest_transaction (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_attest ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, @@ -290,7 +290,7 @@ TEH_handler_reserves_attest ( .etime = GNUNET_TIME_UNIT_FOREVER_TS, .reserve_pub = reserve_pub }; - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_timestamp ("request_timestamp", &rsc.timestamp), diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-attest.h b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-attest.h @@ -33,7 +33,7 @@ * @param root uploaded body from the client * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_attest ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-close.c b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-close.c @@ -175,7 +175,7 @@ TEH_reserves_close_cleanup () * @param rhc reserve close to return * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_reserve_close_success ( const struct ReserveCloseContext *rhc) { @@ -277,7 +277,7 @@ static enum GNUNET_DB_QueryStatus reserve_close_transaction ( void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct ReserveCloseContext *rcc = cls; enum GNUNET_DB_QueryStatus qs; @@ -449,14 +449,14 @@ reserve_close_cleanup (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_close ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { struct ReserveCloseContext *rcc = rc->rh_ctx; - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (NULL == rcc) { diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-close.h b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-close.h @@ -39,7 +39,7 @@ TEH_reserves_close_cleanup (void); * @param root uploaded body from the client * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_close ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-open.c b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-open.c @@ -121,7 +121,7 @@ struct ReserveOpenContext * @param rsc reserve open data to return * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_reserve_open_success (struct MHD_Connection *connection, const struct ReserveOpenContext *rsc) { @@ -186,7 +186,7 @@ cleanup_rsc (struct ReserveOpenContext *rsc) static enum GNUNET_DB_QueryStatus reserve_open_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct ReserveOpenContext *rsc = cls; enum GNUNET_DB_QueryStatus qs; @@ -302,7 +302,7 @@ reserve_open_transaction (void *cls, } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_open (struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) @@ -444,7 +444,7 @@ TEH_handler_reserves_open (struct TEH_RequestContext *rc, } { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (rc->connection, @@ -460,7 +460,7 @@ TEH_handler_reserves_open (struct TEH_RequestContext *rc, } { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; mhd_ret = reply_reserve_open_success (rc->connection, &rsc); diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-open.h b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-open.h @@ -33,7 +33,7 @@ * @param root uploaded body from the client * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_open (struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-purse.c b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-purse.c @@ -288,7 +288,7 @@ reserve_purse_legi_cb ( static enum GNUNET_DB_QueryStatus purse_transaction (void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct ReservePurseContext *rpc = cls; enum GNUNET_DB_QueryStatus qs; @@ -592,7 +592,7 @@ rpc_cleaner (struct TEH_RequestContext *rc) } -MHD_RESULT +enum MHD_Result TEH_handler_reserves_purse ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, @@ -682,7 +682,7 @@ TEH_handler_reserves_purse ( &rpc->merge_pub, &rpc->merge_sig)) { - MHD_RESULT ret; + enum MHD_Result ret; GNUNET_break_op (0); ret = TALER_MHD_reply_with_error ( @@ -870,7 +870,7 @@ TEH_handler_reserves_purse ( } { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; if (GNUNET_OK != TEH_DB_run_transaction (connection, @@ -886,7 +886,7 @@ TEH_handler_reserves_purse ( /* generate regular response */ { - MHD_RESULT res; + enum MHD_Result res; res = TEH_RESPONSE_reply_purse_created ( connection, diff --git a/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-purse.h b/src/exchange/taler-exchange-httpd_post-reserves-RESERVE_PUB-purse.h @@ -44,7 +44,7 @@ TEH_reserves_purse_cleanup (void); * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reserves_purse ( struct TEH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, diff --git a/src/exchange/taler-exchange-httpd_post-reveal-melt.c b/src/exchange/taler-exchange-httpd_post-reveal-melt.c @@ -109,7 +109,7 @@ find_original_refresh ( struct MHD_Connection *connection, const struct TALER_RefreshCommitmentP *rc, struct TALER_EXCHANGEDB_Refresh_vDOLDPLUS *refresh, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_DB_QueryStatus qs; @@ -172,7 +172,7 @@ static enum GNUNET_GenericReturnValue compare_age_commitment ( struct MHD_Connection *connection, struct MeltRevealContext *actx, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { if (actx->no_age_commitment != actx->refresh.coin.no_age_commitment) @@ -233,7 +233,7 @@ calculate_blinded_detail ( union GNUNET_CRYPTO_BlindSessionNonce *nonce, const struct TALER_AgeCommitment *old_age_commitment, struct TALER_PlanchetDetail *detail, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_GenericReturnValue ret; struct TALER_AgeCommitmentHashP ach; @@ -339,7 +339,7 @@ verify_commitment ( const struct TALER_AgeCommitment *old_age_commitment, const struct TALER_PrivateRefreshNonceSignatureP (*signatures)[KAPPA_MINUS_1], const struct TALER_PrivateRefreshBatchSeedP (*rev_batch_seeds)[KAPPA_MINUS_1], - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_GenericReturnValue ret; struct TEH_KeyStateHandle *keys; @@ -701,7 +701,7 @@ static enum GNUNET_GenericReturnValue commit_reveal ( struct MHD_Connection *con, const struct TALER_RefreshCommitmentP *rc, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_DB_QueryStatus qs; @@ -758,7 +758,7 @@ commit_reveal ( * @param refresh The data from the previous call to /melt with signatures * @return a MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_melt_reveal_success ( struct MHD_Connection *connection, const struct TALER_EXCHANGEDB_Refresh_vDOLDPLUS *refresh) @@ -784,13 +784,13 @@ reply_melt_reveal_success ( } -MHD_RESULT +enum MHD_Result TEH_handler_reveal_melt ( struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]) { - MHD_RESULT result = MHD_NO; + enum MHD_Result result = MHD_NO; enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR; struct MeltRevealContext actx = {0}; struct GNUNET_JSON_Specification sig_tuple[] = { diff --git a/src/exchange/taler-exchange-httpd_post-reveal-melt.h b/src/exchange/taler-exchange-httpd_post-reveal-melt.h @@ -49,7 +49,7 @@ * @param args not used * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reveal_melt ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-reveal-withdraw.c b/src/exchange/taler-exchange-httpd_post-reveal-withdraw.c @@ -72,7 +72,7 @@ parse_withdraw_reveal_json ( struct MHD_Connection *connection, const json_t *j_disclosed_batch_seeds, struct WithdrawRevealContext *actx, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { size_t num_entries; const char *error; @@ -147,7 +147,7 @@ find_original_withdraw ( struct MHD_Connection *connection, const struct TALER_HashBlindedPlanchetsP *planchets_h, struct TALER_EXCHANGEDB_Withdraw *withdraw, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_DB_QueryStatus qs; @@ -220,7 +220,7 @@ calculate_blinded_hash ( union GNUNET_CRYPTO_BlindSessionNonce *nonce, uint8_t max_age, struct TALER_BlindedCoinHashP *bch, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_GenericReturnValue ret; struct TALER_AgeCommitmentHashP ach; @@ -320,7 +320,7 @@ verify_commitment_and_max_age ( struct MHD_Connection *con, const struct TALER_EXCHANGEDB_Withdraw *wd, const struct TALER_RevealWithdrawMasterSeedsP *disclosed_batch_seeds, - MHD_RESULT *result) + enum MHD_Result *result) { enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR; struct GNUNET_HashContext *hash_context; @@ -544,7 +544,7 @@ verify_commitment_and_max_age ( * @param commitment The data from the commitment with signatures * @return a MHD result code */ -static MHD_RESULT +static enum MHD_Result reply_withdraw_reveal_success ( struct MHD_Connection *connection, const struct TALER_EXCHANGEDB_Withdraw *commitment) @@ -570,13 +570,13 @@ reply_withdraw_reveal_success ( } -MHD_RESULT +enum MHD_Result TEH_handler_reveal_withdraw ( struct TEH_RequestContext *rc, const json_t *root, const char *const args[0]) { - MHD_RESULT result = MHD_NO; + enum MHD_Result result = MHD_NO; enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR; struct WithdrawRevealContext actx = {0}; const json_t *j_disclosed_batch_seeds; diff --git a/src/exchange/taler-exchange-httpd_post-reveal-withdraw.h b/src/exchange/taler-exchange-httpd_post-reveal-withdraw.h @@ -47,7 +47,7 @@ * @param args not used * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reveal_withdraw ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-withdraw.c b/src/exchange/taler-exchange-httpd_post-withdraw.c @@ -350,7 +350,7 @@ TEH_withdraw_cleanup () */ static void finish_loop (struct WithdrawContext *wc, - MHD_RESULT mres) + enum MHD_Result mres) { wc->phase = (MHD_YES == mres) ? WITHDRAW_PHASE_RETURN_YES @@ -428,7 +428,7 @@ static enum GNUNET_DB_QueryStatus withdraw_transaction ( void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret) + enum MHD_Result *mhd_ret) { struct WithdrawContext *wc = cls; enum GNUNET_DB_QueryStatus qs; @@ -531,7 +531,7 @@ static void phase_run_transaction ( struct WithdrawContext *wc) { - MHD_RESULT mhd_ret; + enum MHD_Result mhd_ret; enum GNUNET_GenericReturnValue qs; GNUNET_assert (WITHDRAW_PHASE_RUN_TRANSACTION == @@ -1764,7 +1764,7 @@ withdraw_phase_parse ( } -MHD_RESULT +enum MHD_Result TEH_handler_withdraw ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_post-withdraw.h b/src/exchange/taler-exchange-httpd_post-withdraw.h @@ -52,7 +52,7 @@ TEH_withdraw_cleanup (void); * @param args array of additional options, not used. * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_withdraw ( struct TEH_RequestContext *rc, const json_t *root, diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.h b/src/exchange/taler-exchange-httpd_refreshes_reveal.h @@ -42,7 +42,7 @@ * @param args array of additional options (length: 2, session hash and the string "reveal") * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_handler_reveal (struct TEH_RequestContext *rc, const json_t *root, const char *const args[2]); diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c @@ -32,7 +32,7 @@ #include "taler-exchange-httpd_get-keys.h" -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_unknown_denom_pub_hash ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph) @@ -72,7 +72,7 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_expired_denom_pub_hash ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph, @@ -118,7 +118,7 @@ TEH_RESPONSE_reply_expired_denom_pub_hash ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_invalid_denom_cipher_for_operation ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph) @@ -159,7 +159,7 @@ TEH_RESPONSE_reply_invalid_denom_cipher_for_operation ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_insufficient_funds ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -178,7 +178,7 @@ TEH_RESPONSE_reply_coin_insufficient_funds ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_conflicting_contract ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -193,7 +193,7 @@ TEH_RESPONSE_reply_coin_conflicting_contract ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_denomination_conflict ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -216,7 +216,7 @@ TEH_RESPONSE_reply_coin_denomination_conflict ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_age_commitment_conflict ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -261,7 +261,7 @@ TEH_RESPONSE_reply_coin_age_commitment_conflict ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_reserve_insufficient_balance ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -280,7 +280,7 @@ TEH_RESPONSE_reply_reserve_insufficient_balance ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_reserve_age_restriction_required ( struct MHD_Connection *connection, uint16_t maximum_allowed_age) @@ -294,7 +294,7 @@ TEH_RESPONSE_reply_reserve_age_restriction_required ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_purse_created ( struct MHD_Connection *connection, struct GNUNET_TIME_Timestamp exchange_timestamp, @@ -336,7 +336,7 @@ TEH_RESPONSE_reply_purse_created ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_kyc_required ( struct MHD_Connection *connection, const struct TALER_NormalizedPaytoHashP *h_payto, @@ -366,14 +366,14 @@ TEH_RESPONSE_reply_kyc_required ( } -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_not_modified ( struct MHD_Connection *connection, const char *etags, TEH_RESPONSE_SetHeaders cb, void *cb_cls) { - MHD_RESULT ret; + enum MHD_Result ret; struct MHD_Response *resp; resp = MHD_create_response_from_buffer (0, diff --git a/src/exchange/taler-exchange-httpd_responses.h b/src/exchange/taler-exchange-httpd_responses.h @@ -43,7 +43,7 @@ * @param dph denomination public key hash * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_unknown_denom_pub_hash ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph); @@ -60,7 +60,7 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash ( * @param reserve_pub the reserve with insufficient balance * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_reserve_insufficient_balance ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -77,7 +77,7 @@ TEH_RESPONSE_reply_reserve_insufficient_balance ( * @param maximum_allowed_age the balance required for the operation * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_reserve_age_restriction_required ( struct MHD_Connection *connection, uint16_t maximum_allowed_age); @@ -96,7 +96,7 @@ TEH_RESPONSE_reply_reserve_age_restriction_required ( * required * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_kyc_required ( struct MHD_Connection *connection, const struct TALER_NormalizedPaytoHashP *h_payto, @@ -114,7 +114,7 @@ TEH_RESPONSE_reply_kyc_required ( * @param oper name of the operation that is not allowed at this time * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_expired_denom_pub_hash ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph, @@ -129,7 +129,7 @@ TEH_RESPONSE_reply_expired_denom_pub_hash ( * @param dph denomination public key hash * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_invalid_denom_cipher_for_operation ( struct MHD_Connection *connection, const struct TALER_DenominationHashP *dph); @@ -147,7 +147,7 @@ TEH_RESPONSE_reply_invalid_denom_cipher_for_operation ( * @param coin_pub public key of the coin * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_insufficient_funds ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -168,7 +168,7 @@ TEH_RESPONSE_reply_coin_insufficient_funds ( * @param prev_denom_sig the signature with the denomination key over the coin * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_denomination_conflict ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -187,7 +187,7 @@ TEH_RESPONSE_reply_coin_denomination_conflict ( * @param h_wire the salted hash of the merchant's bank account * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_conflicting_contract ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -207,7 +207,7 @@ TEH_RESPONSE_reply_coin_conflicting_contract ( * @param h_age_commitment hash of the age commitment as found in the database * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_coin_age_commitment_conflict ( struct MHD_Connection *connection, enum TALER_ErrorCode ec, @@ -253,7 +253,7 @@ struct TEH_PurseDetails * @param purse_balance current balance in the purse * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_purse_created ( struct MHD_Connection *connection, struct GNUNET_TIME_Timestamp exchange_timestamp, @@ -282,7 +282,7 @@ typedef void * @param cb_cls closure for @a cb * @return MHD result code */ -MHD_RESULT +enum MHD_Result TEH_RESPONSE_reply_not_modified ( struct MHD_Connection *connection, const char *etags, diff --git a/src/exchangedb/meson.build b/src/exchangedb/meson.build @@ -311,6 +311,7 @@ pkg.generate( # install: false, #) +subdir('tests') executable( 'bench-db-postgres', diff --git a/src/exchangedb/select_contract.c b/src/exchangedb/select_contract.c @@ -23,15 +23,13 @@ #include "helper.h" enum GNUNET_DB_QueryStatus -TALER_EXCHANGEDB_select_contract (struct TALER_EXCHANGEDB_PostgresContext *pg, - const struct TALER_ContractDiffiePublicP * - pub_ckey, - struct TALER_PurseContractPublicKeyP * - purse_pub, - struct TALER_PurseContractSignatureP * - econtract_sig, - size_t *econtract_size, - void **econtract) +TALER_EXCHANGEDB_select_contract ( + struct TALER_EXCHANGEDB_PostgresContext *pg, + const struct TALER_ContractDiffiePublicP *pub_ckey, + struct TALER_PurseContractPublicKeyP *purse_pub, + struct TALER_PurseContractSignatureP *econtract_sig, + size_t *econtract_size, + void **econtract) { struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (pub_ckey), @@ -48,7 +46,6 @@ TALER_EXCHANGEDB_select_contract (struct TALER_EXCHANGEDB_PostgresContext *pg, GNUNET_PQ_result_spec_end }; - /* Used in #postgres_select_contract */ PREPARE (pg, "select_contract", "SELECT " diff --git a/src/include/taler/taler_extensions.h b/src/include/taler/taler_extensions.h @@ -200,7 +200,7 @@ struct TALER_Extension * @param args Additional query parameters of the request. * @return MDH result */ - MHD_RESULT (*policy_get_handler)( + enum MHD_Result (*policy_get_handler)( struct MHD_Connection *connection, const char *const args[]); }; diff --git a/src/include/taler/taler_mhd_lib.h b/src/include/taler/taler_mhd_lib.h @@ -26,7 +26,6 @@ #include <jansson.h> #include <microhttpd.h> #include <gnunet/gnunet_json_lib.h> -#include <gnunet/gnunet_mhd_compat.h> #include <taler/taler_error_codes.h> #include <taler/taler_util.h> @@ -130,7 +129,7 @@ TALER_MHD_add_global_headers (struct MHD_Response *response, * @param[in,out] buf_size pointer to initial size of @a buf * @return #MHD_YES if @a buf was compressed */ -MHD_RESULT +enum MHD_Result TALER_MHD_body_compress (void **buf, size_t *buf_size); @@ -188,7 +187,7 @@ TALER_MHD_can_compress (struct MHD_Connection *connection, * @param response_code the http response code * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_json (struct MHD_Connection *connection, const json_t *json, unsigned int response_code); @@ -203,7 +202,7 @@ TALER_MHD_reply_json (struct MHD_Connection *connection, * @param response_code the http response code * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_json_steal (struct MHD_Connection *connection, json_t *json, unsigned int response_code); @@ -232,7 +231,7 @@ TALER_MHD_reply_json_steal (struct MHD_Connection *connection, * @param detail additional optional detail about the error * @return a MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_with_error (struct MHD_Connection *connection, unsigned int http_status, enum TALER_ErrorCode ec, @@ -248,7 +247,7 @@ TALER_MHD_reply_with_error (struct MHD_Connection *connection, * @param detail additional optional detail about the error * @return a MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_with_ec (struct MHD_Connection *connection, enum TALER_ErrorCode ec, const char *detail); @@ -325,7 +324,7 @@ TALER_MHD_make_error (enum TALER_ErrorCode ec, * @param connection the MHD connection to use * @return a MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_request_too_large (struct MHD_Connection *connection); @@ -337,7 +336,7 @@ TALER_MHD_reply_request_too_large (struct MHD_Connection *connection); * @param url where to redirect for the sources * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_agpl (struct MHD_Connection *connection, const char *url); @@ -353,7 +352,7 @@ TALER_MHD_reply_agpl (struct MHD_Connection *connection, * @param body_size number of bytes in @a body * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_static (struct MHD_Connection *connection, unsigned int http_status, const char *mime_type, @@ -1014,8 +1013,6 @@ TALER_MHD_listen_bind (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Start to run an event loop for @a daemon. - * Only one daemon can be running per process - * using this API. * * @param daemon the MHD service to run */ @@ -1096,7 +1093,7 @@ TALER_MHD_legal_free (struct TALER_MHD_Legal *legal); * @param legal legal document to serve * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_legal (struct MHD_Connection *conn, struct TALER_MHD_Legal *legal); @@ -1108,7 +1105,7 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn, * @param connection the MHD connection * @return MHD result code */ -MHD_RESULT +enum MHD_Result TALER_MHD_reply_cors_preflight (struct MHD_Connection *connection); @@ -1155,7 +1152,7 @@ TALER_MHD_spa_free (struct TALER_MHD_Spa *spa); * @param path request path to match against the @a spa * @return MHD status code to give to MHD */ -MHD_RESULT +enum MHD_Result TALER_MHD_spa_handler (const struct TALER_MHD_Spa *spa, struct MHD_Connection *connection, const char *path); diff --git a/src/include/taler/taler_templating_lib.h b/src/include/taler/taler_templating_lib.h @@ -122,7 +122,7 @@ TALER_TEMPLATING_reply (struct MHD_Connection *connection, * @param detail optional text to add to the template * @return #MHD_YES on success, #MHD_NO to just close the connection */ -MHD_RESULT +enum MHD_Result TALER_TEMPLATING_reply_error (struct MHD_Connection *connection, const char *template_basename, unsigned int http_status, diff --git a/src/kyclogic/taler-exchange-kyc-tester.c b/src/kyclogic/taler-exchange-kyc-tester.c @@ -127,7 +127,7 @@ struct TEKT_RequestHandler * @param args array of arguments, needs to be of length @e args_expected * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*get)(struct TEKT_RequestContext *rc, const char *const args[]); @@ -140,7 +140,7 @@ struct TEKT_RequestHandler * @param args array of arguments, needs to be of length @e args_expected * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*post)(struct TEKT_RequestContext *rc, const json_t *root, const char *const args[]); @@ -595,7 +595,7 @@ kyc_provider_account_lookup ( * @param args one argument with the legitimization_uuid * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handler_kyc_webhook_generic ( struct TEKT_RequestContext *rc, const char *method, @@ -681,7 +681,7 @@ handler_kyc_webhook_generic ( * @param args one argument with the legitimization_uuid * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handler_kyc_webhook_get ( struct TEKT_RequestContext *rc, const char *const args[]) @@ -703,7 +703,7 @@ handler_kyc_webhook_get ( * @param args one argument with the legitimization_uuid * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handler_kyc_webhook_post ( struct TEKT_RequestContext *rc, const json_t *root, @@ -788,7 +788,7 @@ proof_cb ( * @param args remaining URL arguments; * args[0] should be the logic plugin name */ -static MHD_RESULT +static enum MHD_Result handler_kyc_proof_get ( struct TEKT_RequestContext *rc, const char *const args[1]) @@ -949,7 +949,7 @@ handle_mhd_completion_callback (void *cls, * @param[in,out] upload_data_size number of bytes in @a upload_data * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result proceed_with_handler (struct TEKT_RequestContext *rc, const char *url, const char *upload_data, @@ -958,7 +958,7 @@ proceed_with_handler (struct TEKT_RequestContext *rc, const struct TEKT_RequestHandler *rh = rc->rh; const char *args[rh->nargs + 2]; size_t ulen = strlen (url) + 1; - MHD_RESULT ret; + enum MHD_Result ret; /* We do check for "ulen" here, because we'll later stack-allocate a buffer of that size and don't want to enable malicious clients to cause us @@ -1089,7 +1089,7 @@ rh_cleaner_cb (struct TEKT_RequestContext *rc) * @param con_cls closure for request (a `struct TEKT_RequestContext *`) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_mhd_request (void *cls, struct MHD_Connection *connection, const char *url, @@ -1228,7 +1228,7 @@ handle_mhd_request (void *cls, { /* we found a matching address, but the method is wrong */ struct MHD_Response *reply; - MHD_RESULT ret; + enum MHD_Result ret; char *allowed = NULL; GNUNET_break_op (0); diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c @@ -121,7 +121,7 @@ struct TALER_MHD_Legal }; -MHD_RESULT +enum MHD_Result TALER_MHD_reply_legal (struct MHD_Connection *conn, struct TALER_MHD_Legal *legal) { @@ -245,7 +245,7 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn, (0 == strcasecmp (etag, t->terms_etag)) ) { - MHD_RESULT ret; + enum MHD_Result ret; resp = MHD_create_response_from_buffer (0, NULL, @@ -350,7 +350,7 @@ return_t: MHD_HTTP_HEADER_CONTENT_LANGUAGE, t->language)); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (conn, t == &none diff --git a/src/mhd/mhd_parsing.c b/src/mhd/mhd_parsing.c @@ -199,7 +199,7 @@ TALER_MHD_parse_request_arg_rel_time ( &tms, &dummy)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error (connection, @@ -239,7 +239,7 @@ TALER_MHD_parse_request_arg_timeout ( &tms, &dummy)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error (connection, @@ -274,7 +274,7 @@ TALER_MHD_parse_request_arg_timestamp ( GNUNET_STRINGS_fancy_time_to_timestamp (s, ts)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error ( @@ -310,7 +310,7 @@ TALER_MHD_parse_request_arg_number (struct MHD_Connection *connection, &num, &dummy)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error (connection, @@ -346,7 +346,7 @@ TALER_MHD_parse_request_arg_snumber (struct MHD_Connection *connection, &num, &dummy)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error (connection, @@ -378,7 +378,7 @@ TALER_MHD_parse_request_arg_amount (struct MHD_Connection *connection, TALER_string_to_amount (ts, val)) { - MHD_RESULT mret; + enum MHD_Result mret; GNUNET_break_op (0); mret = TALER_MHD_reply_with_error (connection, diff --git a/src/mhd/mhd_responses.c b/src/mhd/mhd_responses.c @@ -117,13 +117,13 @@ TALER_MHD_can_compress (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_body_compress (void **buf, size_t *buf_size) { Bytef *cbuf; uLongf cbuf_size; - MHD_RESULT ret; + enum MHD_Result ret; cbuf_size = compressBound (*buf_size); cbuf = malloc (cbuf_size); @@ -190,7 +190,7 @@ TALER_MHD_make_json_steal (json_t *json) } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_json (struct MHD_Connection *connection, const json_t *json, unsigned int response_code) @@ -198,7 +198,7 @@ TALER_MHD_reply_json (struct MHD_Connection *connection, struct MHD_Response *response; void *json_str; size_t json_len; - MHD_RESULT is_compressed; + enum MHD_Result is_compressed; json_str = json_dumps (json, JSON_INDENT (2)); @@ -252,7 +252,7 @@ TALER_MHD_reply_json (struct MHD_Connection *connection, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (connection, response_code, @@ -263,12 +263,12 @@ TALER_MHD_reply_json (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_json_steal (struct MHD_Connection *connection, json_t *json, unsigned int response_code) { - MHD_RESULT ret; + enum MHD_Result ret; ret = TALER_MHD_reply_json (connection, json, @@ -278,7 +278,7 @@ TALER_MHD_reply_json_steal (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_cors_preflight (struct MHD_Connection *connection) { struct MHD_Response *response; @@ -303,7 +303,7 @@ TALER_MHD_reply_cors_preflight (struct MHD_Connection *connection) "Access-Control-Allow-Methods", "*")); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (connection, MHD_HTTP_NO_CONTENT, @@ -329,7 +329,7 @@ TALER_MHD_make_error (enum TALER_ErrorCode ec, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_with_error (struct MHD_Connection *connection, unsigned int http_status, enum TALER_ErrorCode ec, @@ -349,7 +349,7 @@ TALER_MHD_reply_with_error (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_with_ec (struct MHD_Connection *connection, enum TALER_ErrorCode ec, const char *detail) @@ -371,7 +371,7 @@ TALER_MHD_reply_with_ec (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_request_too_large (struct MHD_Connection *connection) { return TALER_MHD_reply_with_error (connection, @@ -381,7 +381,7 @@ TALER_MHD_reply_request_too_large (struct MHD_Connection *connection) } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_agpl (struct MHD_Connection *connection, const char *url) { @@ -414,7 +414,7 @@ TALER_MHD_reply_agpl (struct MHD_Connection *connection, } { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (connection, MHD_HTTP_FOUND, @@ -425,7 +425,7 @@ TALER_MHD_reply_agpl (struct MHD_Connection *connection, } -MHD_RESULT +enum MHD_Result TALER_MHD_reply_static (struct MHD_Connection *connection, unsigned int http_status, const char *mime_type, @@ -450,7 +450,7 @@ TALER_MHD_reply_static (struct MHD_Connection *connection, MHD_HTTP_HEADER_CONTENT_TYPE, mime_type)); { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_queue_response (connection, http_status, diff --git a/src/mhd/mhd_spa.c b/src/mhd/mhd_spa.c @@ -70,7 +70,7 @@ struct TALER_MHD_Spa }; -MHD_RESULT +enum MHD_Result TALER_MHD_spa_handler (const struct TALER_MHD_Spa *spa, struct MHD_Connection *connection, const char *path) diff --git a/src/templating/templating_api.c b/src/templating/templating_api.c @@ -344,7 +344,7 @@ TALER_TEMPLATING_reply (struct MHD_Connection *connection, { enum GNUNET_GenericReturnValue res; struct MHD_Response *reply; - MHD_RESULT ret; + enum MHD_Result ret; res = TALER_TEMPLATING_build (connection, &http_status, @@ -469,7 +469,7 @@ load_template (void *cls, } -MHD_RESULT +enum MHD_Result TALER_TEMPLATING_reply_error ( struct MHD_Connection *connection, const char *template_basename, diff --git a/src/testing/testing_api_cmd_oauth.c b/src/testing/testing_api_cmd_oauth.c @@ -83,7 +83,7 @@ append (char **target, } -static MHD_RESULT +static enum MHD_Result handle_post (void *cls, enum MHD_ValueKind kind, const char *key, @@ -165,7 +165,7 @@ handle_post (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 handler_cb (void *cls, struct MHD_Connection *connection, const char *url, @@ -228,7 +228,7 @@ handler_cb (void *cls, } if (0 != *upload_data_size) { - MHD_RESULT ret; + enum MHD_Result ret; ret = MHD_post_process (rc->pp, upload_data,