commit b60fb7e77120f261373be629345f5203903bed48 parent 74b5379e068925762bcab2a9b5f9e2fcb1939727 Author: Christian Grothoff <christian@grothoff.org> Date: Thu, 16 Apr 2026 09:31:31 +0200 get rid of compatibility MHD_RESULT wrapper Diffstat:
32 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c @@ -180,7 +180,7 @@ static struct GNUNET_CURL_RescheduleContext *donau_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); @@ -270,7 +270,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 DH_RequestContext *rc, const char *url, const char *upload_data, @@ -284,7 +284,7 @@ proceed_with_handler (struct DH_RequestContext *rc, MHD_HTTP_METHOD_POST)); const bool is_patch = (0 == strcasecmp (rh->method, MHD_HTTP_METHOD_PATCH)); - MHD_RESULT ret; + enum MHD_Result ret; if ( (rh->needs_authorization) && (NULL != admin_bearer) ) @@ -418,7 +418,7 @@ proceed_with_handler (struct DH_RequestContext *rc, * @param args empty array * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_charities (struct DH_RequestContext *rc, const char *const args[]) { @@ -434,7 +434,7 @@ handle_get_charities (struct DH_RequestContext *rc, * @param args charity id (in args[0]) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_get_charity_id (struct DH_RequestContext *rc, const char *const args[1]) { @@ -465,7 +465,7 @@ handle_get_charity_id (struct DH_RequestContext *rc, * @param con_cls closure for request (a `struct DH_RequestContext *`) * @return MHD result code */ -static MHD_RESULT +static enum MHD_Result handle_mhd_request (void *cls, struct MHD_Connection *connection, const char *url, @@ -627,7 +627,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]) @@ -696,7 +696,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; @@ -714,7 +714,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); @@ -772,7 +772,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/donau/donau-httpd.h b/src/donau/donau-httpd.h @@ -187,9 +187,9 @@ struct DH_RequestHandler * @param args array of arguments, needs to be of length @e args_expected * @return MHD result code */ - MHD_RESULT - (*get)(struct DH_RequestContext *rc, - const char *const args[]); + enum MHD_Result + (*get)(struct DH_RequestContext *rc, + const char *const args[]); /** @@ -200,10 +200,10 @@ struct DH_RequestHandler * @param args array of arguments, needs to be of length @e nargs * @return MHD result code */ - MHD_RESULT - (*post)(struct DH_RequestContext *rc, - const json_t *root, - const char *const args[]); + enum MHD_Result + (*post)(struct DH_RequestContext *rc, + const json_t *root, + const char *const args[]); /** * Function to call to handle PATCH requests. @@ -213,10 +213,10 @@ struct DH_RequestHandler * @param args array of arguments, needs to be of length @e nargs * @return MHD result code */ - MHD_RESULT - (*patch)(struct DH_RequestContext *rc, - const json_t *root, - const char *const args[]); + enum MHD_Result + (*patch)(struct DH_RequestContext *rc, + const json_t *root, + const char *const args[]); /** * Function to call to handle DELETE requests. @@ -225,7 +225,7 @@ struct DH_RequestHandler * @param args array of arguments, needs to be of length @e nargs * @return MHD result code */ - MHD_RESULT + enum MHD_Result (*delete)(struct DH_RequestContext *rc, const char *const args[]); @@ -271,7 +271,7 @@ struct DH_RequestHandler * @param args array of additional options (must be empty for this function) * @return MHD result code */ -// MHD_RESULT +// enum MHD_Result // DH_keys_get_handler (struct DH_RequestContext *rc, // const char *const args[]); diff --git a/src/donau/donau-httpd_db.c b/src/donau/donau-httpd_db.c @@ -36,7 +36,7 @@ enum GNUNET_GenericReturnValue DH_DB_run_transaction (struct MHD_Connection *connection, const char *name, - MHD_RESULT *mhd_ret, + enum MHD_Result *mhd_ret, DH_DB_TransactionCallback cb, void *cb_cls) { diff --git a/src/donau/donau-httpd_db.h b/src/donau/donau-httpd_db.h @@ -55,7 +55,7 @@ typedef enum GNUNET_DB_QueryStatus (*DH_DB_TransactionCallback)(void *cls, struct MHD_Connection *connection, - MHD_RESULT *mhd_ret); + enum MHD_Result *mhd_ret); /** @@ -77,7 +77,7 @@ typedef enum GNUNET_DB_QueryStatus enum GNUNET_GenericReturnValue DH_DB_run_transaction (struct MHD_Connection *connection, const char *name, - MHD_RESULT *mhd_ret, + enum MHD_Result *mhd_ret, DH_DB_TransactionCallback cb, void *cb_cls); diff --git a/src/donau/donau-httpd_delete-charities-CHARITY_ID.c b/src/donau/donau-httpd_delete-charities-CHARITY_ID.c @@ -31,7 +31,7 @@ #include "donau-database/do_charity_delete.h" -MHD_RESULT +enum MHD_Result DH_handler_delete_charities ( struct DH_RequestContext *rc, const char *const args[1]) diff --git a/src/donau/donau-httpd_delete-charities-CHARITY_ID.h b/src/donau/donau-httpd_delete-charities-CHARITY_ID.h @@ -32,7 +32,7 @@ * @param args argument with the charity identifier * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_delete_charities ( struct DH_RequestContext *rc, const char *const args[1]); diff --git a/src/donau/donau-httpd_get-charities.c b/src/donau/donau-httpd_get-charities.c @@ -73,7 +73,7 @@ charities_cb ( } -MHD_RESULT +enum MHD_Result DH_handler_get_charities ( struct DH_RequestContext *rc) { diff --git a/src/donau/donau-httpd_get-charities.h b/src/donau/donau-httpd_get-charities.h @@ -31,7 +31,7 @@ * @param rc request context * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_charities ( struct DH_RequestContext *rc); diff --git a/src/donau/donau-httpd_get-charity-CHARITY_ID.c b/src/donau/donau-httpd_get-charity-CHARITY_ID.c @@ -35,7 +35,7 @@ #define MAX_RECORDS 1024 -MHD_RESULT +enum MHD_Result DH_handler_get_charity ( struct DH_RequestContext *rc, const struct DONAU_CharitySignatureP *charity_sig, @@ -60,7 +60,7 @@ DH_handler_get_charity ( { struct DONAUDB_CharityMetaData meta; enum GNUNET_DB_QueryStatus qs; - MHD_RESULT result; + enum MHD_Result result; qs = DONAUDB_lookup_charity (DH_context, (uint64_t) charity_id, diff --git a/src/donau/donau-httpd_get-charity-CHARITY_ID.h b/src/donau/donau-httpd_get-charity-CHARITY_ID.h @@ -34,7 +34,7 @@ * @param charity_id_s the "$CHARITY_ID" argument * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_charity ( struct DH_RequestContext *rc, const struct DONAU_CharitySignatureP *charity_sig, diff --git a/src/donau/donau-httpd_get-config.c b/src/donau/donau-httpd_get-config.c @@ -27,9 +27,9 @@ #include <jansson.h> -MHD_RESULT +enum MHD_Result DH_handler_get_config (struct DH_RequestContext *rc, - const char *const args[]) + const char *const args[]) { static struct MHD_Response *resp; diff --git a/src/donau/donau-httpd_get-config.h b/src/donau/donau-httpd_get-config.h @@ -51,8 +51,8 @@ * @param[in,out] args remaining arguments (ignored) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_config (struct DH_RequestContext *rc, - const char *const args[]); + const char *const args[]); #endif diff --git a/src/donau/donau-httpd_get-donation-statement-YEAR-HASH_DONOR_ID.c b/src/donau/donau-httpd_get-donation-statement-YEAR-HASH_DONOR_ID.c @@ -30,7 +30,7 @@ #include "donau-database/iterate_submitted_receipts.h" -MHD_RESULT +enum MHD_Result DH_handler_get_donation_statement ( struct DH_RequestContext *rc, const char *const args[2]) @@ -70,7 +70,7 @@ DH_handler_get_donation_statement ( struct DONAU_DonauPublicKeyP donau_pub; struct DONAU_DonauSignatureP donau_sig; enum GNUNET_DB_QueryStatus qs; - MHD_RESULT result; + enum MHD_Result result; qs = DONAUDB_iterate_submitted_receipts (DH_context, (uint64_t) donation_year, diff --git a/src/donau/donau-httpd_get-donation-statement-YEAR-HASH_DONOR_ID.h b/src/donau/donau-httpd_get-donation-statement-YEAR-HASH_DONOR_ID.h @@ -32,7 +32,7 @@ * @param args GET arguments (should be two) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_donation_statement ( struct DH_RequestContext *rc, const char *const args[2]); diff --git a/src/donau/donau-httpd_get-history.c b/src/donau/donau-httpd_get-history.c @@ -64,7 +64,7 @@ history_cb ( } -MHD_RESULT +enum MHD_Result DH_handler_get_history ( struct DH_RequestContext *rc, const char *const args[]) diff --git a/src/donau/donau-httpd_get-history.h b/src/donau/donau-httpd_get-history.h @@ -31,7 +31,7 @@ * @param args GET arguments (should be one) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_history ( struct DH_RequestContext *rc, const char *const args[]); @@ -43,7 +43,7 @@ DH_handler_get_history ( * @param args GET arguments (should be one) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_history_entry ( struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/donau/donau-httpd_get-keys.c b/src/donau/donau-httpd_get-keys.c @@ -1184,7 +1184,7 @@ DH_keys_get_state () } -MHD_RESULT +enum MHD_Result DH_handler_get_keys (struct DH_RequestContext *rc, const char *const args[]) { diff --git a/src/donau/donau-httpd_get-keys.h b/src/donau/donau-httpd_get-keys.h @@ -142,7 +142,7 @@ TEH_resume_keys_requests (bool do_shutdown); * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_get_keys (struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/donau/donau-httpd_mhd.c b/src/donau/donau-httpd_mhd.c @@ -34,7 +34,7 @@ #include "donau-httpd_mhd.h" -MHD_RESULT +enum MHD_Result DH_handler_static_response (struct DH_RequestContext *rc, const char *const args[]) { @@ -53,7 +53,7 @@ DH_handler_static_response (struct DH_RequestContext *rc, } -MHD_RESULT +enum MHD_Result DH_handler_agpl_redirect (struct DH_RequestContext *rc, const char *const args[]) { diff --git a/src/donau/donau-httpd_mhd.h b/src/donau/donau-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 DH_handler_static_response (struct DH_RequestContext *rc, const char *const args[]); @@ -49,7 +49,7 @@ DH_handler_static_response (struct DH_RequestContext *rc, * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_agpl_redirect (struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/donau/donau-httpd_patch-charities-CHARITY_ID.c b/src/donau/donau-httpd_patch-charities-CHARITY_ID.c @@ -32,7 +32,7 @@ #include "donau-database/update_charity.h" -MHD_RESULT +enum MHD_Result DH_handler_patch_charities (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/donau/donau-httpd_patch-charities-CHARITY_ID.h b/src/donau/donau-httpd_patch-charities-CHARITY_ID.h @@ -33,7 +33,7 @@ * @param args array with the charity identifier in args[0] * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_patch_charities ( struct DH_RequestContext *rc, const json_t *root, diff --git a/src/donau/donau-httpd_post-batch-issue-CHARITY_ID.c b/src/donau/donau-httpd_post-batch-issue-CHARITY_ID.c @@ -116,7 +116,7 @@ signatures_to_json (const size_t num_sig, } -MHD_RESULT +enum MHD_Result DH_handler_post_batch_issue (struct DH_RequestContext *rc, const json_t *root, const char *const args[1]) diff --git a/src/donau/donau-httpd_post-batch-issue-CHARITY_ID.h b/src/donau/donau-httpd_post-batch-issue-CHARITY_ID.h @@ -32,7 +32,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_post_batch_issue ( struct DH_RequestContext *rc, const json_t *root, diff --git a/src/donau/donau-httpd_post-batch-submit.c b/src/donau/donau-httpd_post-batch-submit.c @@ -93,7 +93,7 @@ free_irc (struct InsertReceiptContext *irc) } -MHD_RESULT +enum MHD_Result DH_handler_post_batch_submit (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/donau/donau-httpd_post-batch-submit.h b/src/donau/donau-httpd_post-batch-submit.h @@ -32,7 +32,7 @@ * @param root uploaded JSON data * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_post_batch_submit ( struct DH_RequestContext *rc, const json_t *root, diff --git a/src/donau/donau-httpd_post-charities.c b/src/donau/donau-httpd_post-charities.c @@ -32,7 +32,7 @@ #include "donau-database/insert_charity.h" -MHD_RESULT +enum MHD_Result DH_handler_post_charities (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/donau/donau-httpd_post-charities.h b/src/donau/donau-httpd_post-charities.h @@ -33,7 +33,7 @@ * @param args arguments (empty) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_post_charities ( struct DH_RequestContext *rc, const json_t *root, diff --git a/src/donau/donau-httpd_post-csr-issue.c b/src/donau/donau-httpd_post-csr-issue.c @@ -38,7 +38,7 @@ #define MAX_RECORDS 1024 -MHD_RESULT +enum MHD_Result DH_handler_post_csr_issue (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) diff --git a/src/donau/donau-httpd_post-csr-issue.h b/src/donau/donau-httpd_post-csr-issue.h @@ -33,7 +33,7 @@ * @param args empty array * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_post_csr_issue (struct DH_RequestContext *rc, const json_t *root, const char *const args[]); diff --git a/src/donau/donau-httpd_terms.c b/src/donau/donau-httpd_terms.c @@ -38,7 +38,7 @@ static struct TALER_MHD_Legal *tos; static struct TALER_MHD_Legal *pp; -MHD_RESULT +enum MHD_Result DH_handler_terms (struct DH_RequestContext *rc, const char *const args[]) { @@ -48,7 +48,7 @@ DH_handler_terms (struct DH_RequestContext *rc, } -MHD_RESULT +enum MHD_Result DH_handler_privacy (struct DH_RequestContext *rc, const char *const args[]) { diff --git a/src/donau/donau-httpd_terms.h b/src/donau/donau-httpd_terms.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 DH_handler_terms (struct DH_RequestContext *rc, const char *const args[]); @@ -48,7 +48,7 @@ DH_handler_terms (struct DH_RequestContext *rc, * @param args array of additional options (must be empty for this function) * @return MHD result code */ -MHD_RESULT +enum MHD_Result DH_handler_privacy (struct DH_RequestContext *rc, const char *const args[]);