From 543fe4ae36649cf64eabb1b1447539bfb0c3c7c2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 9 Apr 2020 00:59:55 +0200 Subject: make code compiler without warnings with latest libmicrohttpd API --- src/auditor/taler-auditor-httpd.c | 4 ++-- src/auditor/taler-auditor-httpd.h | 12 ++++++------ src/auditor/taler-auditor-httpd_deposit-confirmation.c | 8 ++++---- src/auditor/taler-auditor-httpd_deposit-confirmation.h | 2 +- src/auditor/taler-auditor-httpd_exchanges.c | 2 +- src/auditor/taler-auditor-httpd_exchanges.h | 2 +- src/auditor/taler-auditor-httpd_mhd.c | 4 ++-- src/auditor/taler-auditor-httpd_mhd.h | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/auditor') diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c index 4f7e11f84..627950aed 100644 --- a/src/auditor/taler-auditor-httpd.c +++ b/src/auditor/taler-auditor-httpd.c @@ -302,7 +302,7 @@ handle_mhd_completion_callback (void *cls, * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -static int +static MHD_RESULT handle_version (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -347,7 +347,7 @@ handle_version (struct TAH_RequestHandler *rh, * @param con_cls closure for request (a `struct Buffer *`) * @return MHD result code */ -static int +static 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 index 3e7e79a10..127c4dd8a 100644 --- a/src/auditor/taler-auditor-httpd.h +++ b/src/auditor/taler-auditor-httpd.h @@ -75,16 +75,16 @@ struct TAH_RequestHandler * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ - int (*handler)(struct TAH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size); + MHD_RESULT (*handler)(struct TAH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); /** * Default response code. */ - int response_code; + unsigned int response_code; }; diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index fd48ff93b..5f84a7253 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -56,7 +56,7 @@ static pthread_mutex_t lock; * @param es information about the exchange's signing key * @return MHD result code */ -static int +static MHD_RESULT verify_and_execute_deposit_confirmation ( struct MHD_Connection *connection, const struct TALER_AUDITORDB_DepositConfirmation *dc, @@ -212,7 +212,7 @@ verify_and_execute_deposit_confirmation ( * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -245,7 +245,7 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, (void) upload_data_size; { json_t *json; - int res; + enum GNUNET_GenericReturnValue res; res = TALER_MHD_parse_post_json (connection, connection_cls, @@ -270,7 +270,7 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, es.exchange_pub = dc.exchange_pub; /* used twice! */ dc.master_public_key = es.master_public_key; { - int res; + MHD_RESULT res; res = verify_and_execute_deposit_confirmation (connection, &dc, diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.h b/src/auditor/taler-auditor-httpd_deposit-confirmation.h index 531f3c93c..a7c331916 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.h +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.h @@ -49,7 +49,7 @@ TEAH_DEPOSIT_CONFIRMATION_done (void); * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_exchanges.c b/src/auditor/taler-auditor-httpd_exchanges.c index 237b973f8..f117b6083 100644 --- a/src/auditor/taler-auditor-httpd_exchanges.c +++ b/src/auditor/taler-auditor-httpd_exchanges.c @@ -68,7 +68,7 @@ add_exchange (void *cls, * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_exchanges.h b/src/auditor/taler-auditor-httpd_exchanges.h index c356d7e99..c7d8dd5fd 100644 --- a/src/auditor/taler-auditor-httpd_exchanges.h +++ b/src/auditor/taler-auditor-httpd_exchanges.h @@ -36,7 +36,7 @@ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, diff --git a/src/auditor/taler-auditor-httpd_mhd.c b/src/auditor/taler-auditor-httpd_mhd.c index a8322a830..e5d2f71ee 100644 --- a/src/auditor/taler-auditor-httpd_mhd.c +++ b/src/auditor/taler-auditor-httpd_mhd.c @@ -43,7 +43,7 @@ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -77,7 +77,7 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +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 index 1096ee346..1804a1861 100644 --- a/src/auditor/taler-auditor-httpd_mhd.h +++ b/src/auditor/taler-auditor-httpd_mhd.h @@ -39,7 +39,7 @@ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, @@ -58,7 +58,7 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh, * @param[in,out] upload_data_size number of bytes (left) in @a upload_data * @return MHD result code */ -int +MHD_RESULT TAH_MHD_handler_agpl_redirect (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, void **connection_cls, -- cgit v1.2.3