[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: make code compile without warnin
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: make code compile without warnings against latest libmicrohttpd API |
|
Date: |
Thu, 09 Apr 2020 01:15:52 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 00658a9 make code compile without warnings against latest
libmicrohttpd API
00658a9 is described below
commit 00658a93f1d26ccb7ba5f10f31055531564a6523
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Apr 9 01:15:49 2020 +0200
make code compile without warnings against latest libmicrohttpd API
---
src/backend/taler-merchant-httpd.c | 4 +--
src/backend/taler-merchant-httpd.h | 15 ++++++-----
src/backend/taler-merchant-httpd_check-payment.c | 4 +--
src/backend/taler-merchant-httpd_check-payment.h | 2 +-
src/backend/taler-merchant-httpd_config.c | 2 +-
src/backend/taler-merchant-httpd_config.h | 2 +-
src/backend/taler-merchant-httpd_history.c | 4 +--
src/backend/taler-merchant-httpd_history.h | 2 +-
src/backend/taler-merchant-httpd_mhd.c | 4 +--
src/backend/taler-merchant-httpd_mhd.h | 8 +++---
src/backend/taler-merchant-httpd_order.c | 30 +++++++++++++---------
src/backend/taler-merchant-httpd_order.h | 2 +-
src/backend/taler-merchant-httpd_pay.c | 17 ++++++------
src/backend/taler-merchant-httpd_pay.h | 2 +-
src/backend/taler-merchant-httpd_poll-payment.c | 10 ++++----
src/backend/taler-merchant-httpd_poll-payment.h | 2 +-
src/backend/taler-merchant-httpd_proposal.c | 4 +--
src/backend/taler-merchant-httpd_proposal.h | 2 +-
src/backend/taler-merchant-httpd_refund.h | 2 +-
src/backend/taler-merchant-httpd_refund_increase.c | 28 +++++++++++---------
src/backend/taler-merchant-httpd_refund_increase.h | 2 +-
src/backend/taler-merchant-httpd_refund_lookup.c | 2 +-
src/backend/taler-merchant-httpd_refund_lookup.h | 2 +-
src/backend/taler-merchant-httpd_tip-authorize.c | 22 ++++++++--------
src/backend/taler-merchant-httpd_tip-authorize.h | 2 +-
src/backend/taler-merchant-httpd_tip-pickup.c | 26 +++++++++++--------
src/backend/taler-merchant-httpd_tip-pickup.h | 4 +--
src/backend/taler-merchant-httpd_tip-query.c | 4 +--
src/backend/taler-merchant-httpd_tip-query.h | 2 +-
.../taler-merchant-httpd_track-transaction.c | 4 +--
.../taler-merchant-httpd_track-transaction.h | 2 +-
src/backend/taler-merchant-httpd_track-transfer.c | 4 +--
src/backend/taler-merchant-httpd_track-transfer.h | 2 +-
33 files changed, 120 insertions(+), 104 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index cb7e701..7e8f70f 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1221,7 +1221,7 @@ iterate_instances (void)
* #MHD_NO if the socket must be closed due to a serious
* error while handling the request
*/
-static int
+static MHD_RESULT
url_handler (void *cls,
struct MHD_Connection *connection,
const char *url,
@@ -1314,7 +1314,7 @@ url_handler (void *cls,
int is_public;
/* Matching URL found, but maybe method doesn't match */
int url_found = GNUNET_NO;
- int ret;
+ MHD_RESULT ret;
struct TMH_RequestHandler *selected_handler = NULL;
(void) cls;
diff --git a/src/backend/taler-merchant-httpd.h
b/src/backend/taler-merchant-httpd.h
index 1e3aac5..b24b321 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -25,6 +25,7 @@
#include "taler_merchantdb_lib.h"
#include <microhttpd.h>
#include <taler/taler_mhd_lib.h>
+#include <gnunet/gnunet_mhd_compat.h>
/**
* Shorthand for exit jumps.
@@ -202,17 +203,17 @@ struct TMH_RequestHandler
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
- int (*handler)(struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- void **connection_cls,
- const char *upload_data,
- size_t *upload_data_size,
- struct MerchantInstance *mi);
+ MHD_RESULT (*handler)(struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ void **connection_cls,
+ const char *upload_data,
+ size_t *upload_data_size,
+ struct MerchantInstance *mi);
/**
* Default response code.
*/
- int response_code;
+ unsigned int response_code;
};
diff --git a/src/backend/taler-merchant-httpd_check-payment.c
b/src/backend/taler-merchant-httpd_check-payment.c
index c632d35..a72a6e3 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -353,7 +353,7 @@ check_order_and_request_payment (struct
CheckPaymentRequestContext *cprc)
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_check_payment (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -363,7 +363,7 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
{
struct CheckPaymentRequestContext *cprc = *connection_cls;
enum GNUNET_DB_QueryStatus qs;
- int ret;
+ MHD_RESULT ret;
if (NULL == cprc)
{
diff --git a/src/backend/taler-merchant-httpd_check-payment.h
b/src/backend/taler-merchant-httpd_check-payment.h
index 2ff39d7..e94645d 100644
--- a/src/backend/taler-merchant-httpd_check-payment.h
+++ b/src/backend/taler-merchant-httpd_check-payment.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_check_payment (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_config.c
b/src/backend/taler-merchant-httpd_config.c
index 8282cff..27b46d7 100644
--- a/src/backend/taler-merchant-httpd_config.c
+++ b/src/backend/taler-merchant-httpd_config.c
@@ -91,7 +91,7 @@ add_instance (void *cls,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_config (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_config.h
b/src/backend/taler-merchant-httpd_config.h
index 43c987d..1a5dfd6 100644
--- a/src/backend/taler-merchant-httpd_config.h
+++ b/src/backend/taler-merchant-httpd_config.h
@@ -34,7 +34,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_config (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_history.c
b/src/backend/taler-merchant-httpd_history.c
index fafb51d..dd35320 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -124,7 +124,7 @@ pd_cb (void *cls,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_history (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -136,7 +136,7 @@ MH_handler_history (struct TMH_RequestHandler *rh,
const char *str;
struct GNUNET_TIME_Absolute date;
json_t *response;
- int ret;
+ MHD_RESULT ret;
unsigned int ascending = GNUNET_NO;
unsigned long long seconds;
unsigned long long start = INT64_MAX;
diff --git a/src/backend/taler-merchant-httpd_history.h
b/src/backend/taler-merchant-httpd_history.h
index d9c1a20..eac987d 100644
--- a/src/backend/taler-merchant-httpd_history.h
+++ b/src/backend/taler-merchant-httpd_history.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_history (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_mhd.c
b/src/backend/taler-merchant-httpd_mhd.c
index 86448ec..0860860 100644
--- a/src/backend/taler-merchant-httpd_mhd.c
+++ b/src/backend/taler-merchant-httpd_mhd.c
@@ -39,7 +39,7 @@
* @param mi merchant backend instance, could be NULL in this specific case!
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_handler_static_response (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -74,7 +74,7 @@ TMH_MHD_handler_static_response (struct TMH_RequestHandler
*rh,
* @param mi merchant backend instance, never NULL (but unused)
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_handler_agpl_redirect (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_mhd.h
b/src/backend/taler-merchant-httpd_mhd.h
index 6564922..8fc78a2 100644
--- a/src/backend/taler-merchant-httpd_mhd.h
+++ b/src/backend/taler-merchant-httpd_mhd.h
@@ -40,7 +40,7 @@
* @param mi merchant backend instance, NULL is allowed in this case!
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_handler_static_response (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -61,7 +61,7 @@ TMH_MHD_handler_static_response (struct TMH_RequestHandler
*rh,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_handler_agpl_redirect (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -83,7 +83,7 @@ TMH_MHD_handler_agpl_redirect (struct TMH_RequestHandler *rh,
* @param ... varargs
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_helper_send_json_pack (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void *connection_cls,
@@ -105,7 +105,7 @@ TMH_MHD_helper_send_json_pack (struct TMH_RequestHandler
*rh,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
TMH_MHD_handler_send_json_pack_error (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_order.c
b/src/backend/taler-merchant-httpd_order.c
index 2c1dcba..374274e 100644
--- a/src/backend/taler-merchant-httpd_order.c
+++ b/src/backend/taler-merchant-httpd_order.c
@@ -204,13 +204,13 @@ make_merchant_base_url (struct MHD_Connection
*connection, const
* @param order[in] order to process (can be modified)
* @return MHD result code
*/
-static int
+static MHD_RESULT
proposal_put (struct MHD_Connection *connection,
json_t *root,
json_t *order,
const struct MerchantInstance *mi)
{
- int res;
+ enum GNUNET_GenericReturnValue res;
struct TALER_Amount total;
const char *order_id;
const char *summary;
@@ -698,18 +698,24 @@ MH_handler_order_post (struct TMH_RequestHandler *rh,
return MHD_YES;
order = json_object_get (root,
"order");
- if (NULL == order)
{
- res = TALER_MHD_reply_with_error
- (connection,
- MHD_HTTP_BAD_REQUEST,
- TALER_EC_PARAMETER_MISSING,
- "order");
+ MHD_RESULT ret;
+
+ if (NULL == order)
+ {
+ ret = TALER_MHD_reply_with_error
+ (connection,
+ MHD_HTTP_BAD_REQUEST,
+ TALER_EC_PARAMETER_MISSING,
+ "order");
+ }
+ else
+ {
+ ret = proposal_put (connection, root, order, mi);
+ }
+ json_decref (root);
+ return ret;
}
- else
- res = proposal_put (connection, root, order, mi);
- json_decref (root);
- return res;
}
diff --git a/src/backend/taler-merchant-httpd_order.h
b/src/backend/taler-merchant-httpd_order.h
index fd09880..cf43d1b 100644
--- a/src/backend/taler-merchant-httpd_order.h
+++ b/src/backend/taler-merchant-httpd_order.h
@@ -36,7 +36,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_order_post (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_pay.c
b/src/backend/taler-merchant-httpd_pay.c
index 8b255f0..de65102 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -1456,7 +1456,7 @@ check_coin_paid (void *cls,
* #GNUNET_NO on failure (response was queued with MHD)
* #GNUNET_SYSERR on hard error (MHD connection must be dropped)
*/
-static int
+static enum GNUNET_GenericReturnValue
parse_pay (struct MHD_Connection *connection,
const json_t *root,
struct PayContext *pc)
@@ -1465,7 +1465,7 @@ parse_pay (struct MHD_Connection *connection,
const char *order_id;
const char *mode;
struct TALER_MerchantPublicKeyP merchant_pub;
- int res;
+ enum GNUNET_GenericReturnValue res;
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("mode",
&mode),
@@ -2167,13 +2167,13 @@ begin_transaction (struct PayContext *pc)
* @return value to return to MHD (#MHD_NO to drop connection,
* #MHD_YES to keep handling it)
*/
-static int
+static MHD_RESULT
handler_pay_json (struct MHD_Connection *connection,
const json_t *root,
struct PayContext *pc)
{
{
- int ret;
+ enum GNUNET_GenericReturnValue ret;
ret = parse_pay (connection,
root,
@@ -2209,7 +2209,7 @@ handler_pay_json (struct MHD_Connection *connection,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_pay (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -2218,7 +2218,8 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
struct MerchantInstance *mi)
{
struct PayContext *pc;
- int res;
+ enum GNUNET_GenericReturnValue res;
+ MHD_RESULT ret;
json_t *root;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2282,11 +2283,11 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
(NULL == root) )
return MHD_YES; /* the POST's body has to be further fetched */
- res = handler_pay_json (connection,
+ ret = handler_pay_json (connection,
root,
pc);
json_decref (root);
- return res;
+ return ret;
}
diff --git a/src/backend/taler-merchant-httpd_pay.h
b/src/backend/taler-merchant-httpd_pay.h
index 78f5d78..726a27b 100644
--- a/src/backend/taler-merchant-httpd_pay.h
+++ b/src/backend/taler-merchant-httpd_pay.h
@@ -43,7 +43,7 @@ MH_force_pc_resume (void);
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_pay (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_poll-payment.c
b/src/backend/taler-merchant-httpd_poll-payment.c
index 0e38c22..281730f 100644
--- a/src/backend/taler-merchant-httpd_poll-payment.c
+++ b/src/backend/taler-merchant-httpd_poll-payment.c
@@ -109,7 +109,7 @@ struct PollPaymentRequestContext
/**
* Initially #GNUNET_SYSERR. If we queued a response, set to the
- * result code (i.e. #MHD_YES or #MHD_NO).
+ * result code (i.e. #MHD_YES or #MHD_NO). FIXME: fix type!
*/
int ret;
@@ -174,10 +174,10 @@ process_refunds_cb (void *cls,
* @param pprc check pay request context
* @return #MHD_YES on success
*/
-static int
+static MHD_RESULT
send_pay_request (struct PollPaymentRequestContext *pprc)
{
- int ret;
+ MHD_RESULT ret;
char *already_paid_order_id = NULL;
char *taler_pay_uri;
struct GNUNET_TIME_Relative remaining;
@@ -255,7 +255,7 @@ send_pay_request (struct PollPaymentRequestContext *pprc)
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_poll_payment (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -265,7 +265,7 @@ MH_handler_poll_payment (struct TMH_RequestHandler *rh,
{
struct PollPaymentRequestContext *pprc = *connection_cls;
enum GNUNET_DB_QueryStatus qs;
- int ret;
+ MHD_RESULT ret;
if (NULL == pprc)
{
diff --git a/src/backend/taler-merchant-httpd_poll-payment.h
b/src/backend/taler-merchant-httpd_poll-payment.h
index e9f54c2..ac13c4a 100644
--- a/src/backend/taler-merchant-httpd_poll-payment.h
+++ b/src/backend/taler-merchant-httpd_poll-payment.h
@@ -36,7 +36,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_poll_payment (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_proposal.c
b/src/backend/taler-merchant-httpd_proposal.c
index 0fc5eef..4720713 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -52,7 +52,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -107,7 +107,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
GNUNET_JSON_spec_absolute_time ("timestamp", ×tamp),
GNUNET_JSON_spec_end ()
};
- int res;
+ enum GNUNET_GenericReturnValue res;
db->preflight (db->cls);
qs = db->find_order (db->cls,
diff --git a/src/backend/taler-merchant-httpd_proposal.h
b/src/backend/taler-merchant-httpd_proposal.h
index 85db1ff..677fee0 100644
--- a/src/backend/taler-merchant-httpd_proposal.h
+++ b/src/backend/taler-merchant-httpd_proposal.h
@@ -36,7 +36,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_refund.h
b/src/backend/taler-merchant-httpd_refund.h
index 636d291..1270f80 100644
--- a/src/backend/taler-merchant-httpd_refund.h
+++ b/src/backend/taler-merchant-httpd_refund.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_refund_lookup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_refund_increase.c
b/src/backend/taler-merchant-httpd_refund_increase.c
index 99a5bcb..a6ba992 100644
--- a/src/backend/taler-merchant-httpd_refund_increase.c
+++ b/src/backend/taler-merchant-httpd_refund_increase.c
@@ -138,7 +138,7 @@ json_parse_cleanup (struct TM_HandlerContext *hc)
* @param reason reason for the refund
* @return MHD result code
*/
-static int
+static MHD_RESULT
process_refund (struct MHD_Connection *connection,
struct MerchantInstance *mi,
const struct TALER_Amount *refund,
@@ -258,7 +258,7 @@ process_refund (struct MHD_Connection *connection,
}
{
- int ret;
+ MHD_RESULT ret;
char *taler_refund_uri;
taler_refund_uri = make_taler_refund_uri (connection,
@@ -289,7 +289,7 @@ process_refund (struct MHD_Connection *connection,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_refund_increase (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -297,7 +297,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
size_t *upload_data_size,
struct MerchantInstance *mi)
{
- int res;
+ enum GNUNET_GenericReturnValue res;
struct TMH_JsonParseContext *ctx;
struct TALER_Amount refund;
const char *order_id;
@@ -351,14 +351,18 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
TALER_EC_JSON_INVALID,
"Request body does not match
specification");
}
- res = process_refund (connection,
- mi,
- &refund,
- order_id,
- reason);
- GNUNET_JSON_parse_free (spec);
- json_decref (root);
- return res;
+ {
+ MHD_RESULT ret;
+
+ ret = process_refund (connection,
+ mi,
+ &refund,
+ order_id,
+ reason);
+ GNUNET_JSON_parse_free (spec);
+ json_decref (root);
+ return ret;
+ }
}
diff --git a/src/backend/taler-merchant-httpd_refund_increase.h
b/src/backend/taler-merchant-httpd_refund_increase.h
index 82a48f4..ff17800 100644
--- a/src/backend/taler-merchant-httpd_refund_increase.h
+++ b/src/backend/taler-merchant-httpd_refund_increase.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_refund_increase (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_refund_lookup.c
b/src/backend/taler-merchant-httpd_refund_lookup.c
index d54a87c..2cae271 100644
--- a/src/backend/taler-merchant-httpd_refund_lookup.c
+++ b/src/backend/taler-merchant-httpd_refund_lookup.c
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_refund_lookup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_refund_lookup.h
b/src/backend/taler-merchant-httpd_refund_lookup.h
index 9d34ad8..24495da 100644
--- a/src/backend/taler-merchant-httpd_refund_lookup.h
+++ b/src/backend/taler-merchant-httpd_refund_lookup.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_refund_lookup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_tip-authorize.c
b/src/backend/taler-merchant-httpd_tip-authorize.c
index 52a7fe5..569cf0a 100644
--- a/src/backend/taler-merchant-httpd_tip-authorize.c
+++ b/src/backend/taler-merchant-httpd_tip-authorize.c
@@ -108,7 +108,7 @@ cleanup_tac (struct TM_HandlerContext *hc)
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -117,7 +117,7 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
struct MerchantInstance *mi)
{
struct TipAuthContext *tac;
- int res;
+ enum GNUNET_GenericReturnValue res;
enum TALER_ErrorCode ec;
struct GNUNET_TIME_Absolute expiration;
struct GNUNET_HashCode tip_id;
@@ -136,12 +136,14 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
}
if (NULL != tac->ctr.response)
{
- res = MHD_queue_response (connection,
+ MHD_RESULT ret;
+
+ ret = MHD_queue_response (connection,
tac->ctr.response_code,
tac->ctr.response);
MHD_destroy_response (tac->ctr.response);
tac->ctr.response = NULL;
- return res;
+ return ret;
}
if (GNUNET_NO == tac->parsed_json)
{
@@ -292,13 +294,11 @@ MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
uri_instance_id,
hash_enc.encoding));
-
- res = TALER_MHD_reply_json_pack (connection,
- MHD_HTTP_OK,
- "{s:s, s:s}",
- "taler_tip_uri", taler_tip_uri,
- "tip_id", hash_enc.encoding);
- return res;
+ return TALER_MHD_reply_json_pack (connection,
+ MHD_HTTP_OK,
+ "{s:s, s:s}",
+ "taler_tip_uri", taler_tip_uri,
+ "tip_id", hash_enc.encoding);
}
}
diff --git a/src/backend/taler-merchant-httpd_tip-authorize.h
b/src/backend/taler-merchant-httpd_tip-authorize.h
index 8706d64..1f7f44e 100644
--- a/src/backend/taler-merchant-httpd_tip-authorize.h
+++ b/src/backend/taler-merchant-httpd_tip-authorize.h
@@ -35,7 +35,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_authorize (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_tip-pickup.c
b/src/backend/taler-merchant-httpd_tip-pickup.c
index 1ea6b6f..6c08cce 100644
--- a/src/backend/taler-merchant-httpd_tip-pickup.c
+++ b/src/backend/taler-merchant-httpd_tip-pickup.c
@@ -177,7 +177,7 @@ pickup_cleanup (struct TM_HandlerContext *hc)
* @return #MHD_YES upon success, #MHD_NO if
* the connection ought to be dropped
*/
-static int
+static MHD_RESULT
run_pickup (struct MHD_Connection *connection,
struct PickupContext *pc)
{
@@ -400,7 +400,7 @@ exchange_found_cb (void *cls,
* @return #MHD_YES upon success, #MHD_NO if
* the connection ought to be dropped
*/
-static int
+static MHD_RESULT
prepare_pickup (struct PickupContext *pc)
{
enum GNUNET_DB_QueryStatus qs;
@@ -507,7 +507,7 @@ parse_planchet (struct MHD_Connection *connection,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -515,7 +515,7 @@ MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
size_t *upload_data_size,
struct MerchantInstance *mi)
{
- int res;
+ enum GNUNET_GenericReturnValue res;
struct GNUNET_HashCode tip_id;
json_t *planchets;
struct GNUNET_JSON_Specification spec[] = {
@@ -604,10 +604,14 @@ MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
}
}
pc->tip_id = tip_id;
- res = prepare_pickup (pc);
- GNUNET_JSON_parse_free (spec);
- json_decref (root);
- return res;
+ {
+ MHD_RESULT ret;
+
+ ret = prepare_pickup (pc);
+ GNUNET_JSON_parse_free (spec);
+ json_decref (root);
+ return ret;
+ }
}
@@ -623,7 +627,7 @@ MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_pickup_get (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -639,8 +643,8 @@ MH_handler_tip_pickup_get (struct TMH_RequestHandler *rh,
struct TALER_Amount tip_amount_left;
struct GNUNET_TIME_Absolute timestamp;
struct GNUNET_TIME_Absolute timestamp_expire;
- int ret;
- int qs;
+ MHD_RESULT ret;
+ enum GNUNET_DB_QueryStatus qs;
tip_id_str = MHD_lookup_connection_value (connection,
MHD_GET_ARGUMENT_KIND,
diff --git a/src/backend/taler-merchant-httpd_tip-pickup.h
b/src/backend/taler-merchant-httpd_tip-pickup.h
index 3ca15bb..8014042 100644
--- a/src/backend/taler-merchant-httpd_tip-pickup.h
+++ b/src/backend/taler-merchant-httpd_tip-pickup.h
@@ -35,7 +35,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -55,7 +55,7 @@ MH_handler_tip_pickup (struct TMH_RequestHandler *rh,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_pickup_get (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_tip-query.c
b/src/backend/taler-merchant-httpd_tip-query.c
index 9c9b553..f7aa0ab 100644
--- a/src/backend/taler-merchant-httpd_tip-query.c
+++ b/src/backend/taler-merchant-httpd_tip-query.c
@@ -146,7 +146,7 @@ generate_final_response (struct TipQueryContext *tqc)
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_query (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -170,7 +170,7 @@ MH_handler_tip_query (struct TMH_RequestHandler *rh,
if (0 != tqc->ctr.response_code)
{
- int res;
+ MHD_RESULT res;
/* We are *done* processing the request, just queue the response (!) */
if (UINT_MAX == tqc->ctr.response_code)
diff --git a/src/backend/taler-merchant-httpd_tip-query.h
b/src/backend/taler-merchant-httpd_tip-query.h
index 257aaf7..3123486 100644
--- a/src/backend/taler-merchant-httpd_tip-query.h
+++ b/src/backend/taler-merchant-httpd_tip-query.h
@@ -34,7 +34,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_tip_query (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c
b/src/backend/taler-merchant-httpd_track-transaction.c
index 8de4f05..290e8dc 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -1074,7 +1074,7 @@ find_exchange (struct TrackTransactionContext *tctx)
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_track_transaction (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -1102,7 +1102,7 @@ MH_handler_track_transaction (struct TMH_RequestHandler
*rh,
if (0 != tctx->response_code)
{
- int ret;
+ MHD_RESULT ret;
/* We are *done* processing the request, just queue the response (!) */
if (UINT_MAX == tctx->response_code)
diff --git a/src/backend/taler-merchant-httpd_track-transaction.h
b/src/backend/taler-merchant-httpd_track-transaction.h
index 5b7d737..d620110 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.h
+++ b/src/backend/taler-merchant-httpd_track-transaction.h
@@ -35,7 +35,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_track_transaction (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c
b/src/backend/taler-merchant-httpd_track-transfer.c
index 5b7ef9d..2ddcc16 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -927,7 +927,7 @@ proof_cb (void *cls,
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_track_transfer (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
@@ -939,7 +939,7 @@ MH_handler_track_transfer (struct TMH_RequestHandler *rh,
const char *str;
const char *url;
const char *wire_method;
- int ret;
+ MHD_RESULT ret;
enum GNUNET_DB_QueryStatus qs;
if (NULL == *connection_cls)
diff --git a/src/backend/taler-merchant-httpd_track-transfer.h
b/src/backend/taler-merchant-httpd_track-transfer.h
index 4368d26..0463295 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.h
+++ b/src/backend/taler-merchant-httpd_track-transfer.h
@@ -37,7 +37,7 @@
* @param mi merchant backend instance, never NULL
* @return MHD result code
*/
-int
+MHD_RESULT
MH_handler_track_transfer (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: make code compile without warnings against latest libmicrohttpd API,
gnunet <=