From 3bda4367fb168dc63ddc5f79e4dd9be452dd162d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 25 Jun 2022 21:40:46 +0200 Subject: -doxygen fixes --- contrib/microhttpd.tag | 18 ++++++++++++++++++ contrib/taler-exchange.tag | 20 ++++++++++++++++++++ src/backend/taler-merchant-httpd.h | 4 ++-- .../taler-merchant-httpd_post-orders-ID-pay.c | 15 ++------------- ...aler-merchant-httpd_private-delete-transfers-ID.c | 8 -------- .../taler-merchant-httpd_private-get-orders-ID.c | 3 +-- .../taler-merchant-httpd_private-get-products.c | 8 -------- src/include/taler_merchant_service.h | 8 ++------ src/include/taler_merchant_testing_lib.h | 8 ++++++-- 9 files changed, 51 insertions(+), 41 deletions(-) diff --git a/contrib/microhttpd.tag b/contrib/microhttpd.tag index ad39ebfc..b3521691 100644 --- a/contrib/microhttpd.tag +++ b/contrib/microhttpd.tag @@ -38,6 +38,24 @@ microhttpd.h + + #define + MHD_HTTP_ACCEPTED + microhttpd.h + + + + #define + MHD_HTTP_BAD_GATEWAY + microhttpd.h + + + + #define + MHD_HTTP_GATEWAY_TIMEOUT + microhttpd.h + + #define MHD_HTTP_GONE diff --git a/contrib/taler-exchange.tag b/contrib/taler-exchange.tag index 7d83543a..2eadbdf2 100644 --- a/contrib/taler-exchange.tag +++ b/contrib/taler-exchange.tag @@ -38,6 +38,16 @@ taler_error_codes.h + + taler_error_codes.h + + taler_error_codes.h + + enum TALER_ErrorCode + TALER_EC_INVALID + taler_error_codes.h + + taler_error_codes.h @@ -148,6 +158,16 @@ taler_dbevents.h + + taler_dbevents.h + + taler_dbevents.h + + #define + TALER_DBEVENT_MERCHANT_REFUND_OBTAINED + taler_dbevents.h + + taler_dbevents.h diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h index 8d009b26..da1a6127 100644 --- a/src/backend/taler-merchant-httpd.h +++ b/src/backend/taler-merchant-httpd.h @@ -51,7 +51,7 @@ struct TMH_WireMethod struct TMH_WireMethod *prev; /** - * Which wire method / payment target identifier is @e j_wire using? + * Which wire method / payment target identifier is @e payto_uri using? */ char *wire_method; @@ -66,7 +66,7 @@ struct TMH_WireMethod struct TALER_WireSaltP wire_salt; /** - * Hash of our wire format details as given in #j_wire. + * Hash of our wire format details as given in @e payto_uri */ struct TALER_MerchantWireHashP h_wire; diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index 5104e850..1521a4ac 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -708,8 +708,7 @@ execute_pay_transaction (struct PayContext *pc); * Function called with detailed wire transfer data. * * @param cls a `struct KycContext *` - * @param hr HTTP response data - * @param dd details about the deposit (NULL on errors) + * @param dr HTTP response data */ static void deposit_get_callback ( @@ -912,10 +911,7 @@ check_kyc (struct PayContext *pc, * in that array). That way, the last executed callback can detect * that no other confirmations are on the way, and can pack a response * for the wallet - * @param hr HTTP response code details - * @param deposit_timestamp time when the exchange generated the deposit confirmation - * @param exchange_sig signature from the exchange over the deposit confirmation - * @param exchange_pub which key did the exchange use to create the @a exchange_sig + * @param dr HTTP response code details */ static void deposit_cb (void *cls, @@ -1776,11 +1772,6 @@ generate_success_response (struct PayContext *pc) } -/** - * Actually perform the payment transaction. - * - * @param pc payment transaction to run - */ static void execute_pay_transaction (struct PayContext *pc) { @@ -2365,8 +2356,6 @@ handle_contract_paid (struct PayContext *pc) /** * Check the database state for the given order. * Schedules an error response in the connection on failure. * - * @param connection HTTP connection we are receiving payment on - * @param[in,out] hc context with further information about the request * @param pc context we use to handle the payment * @return #GNUNET_OK on success, * #GNUNET_NO on failure (response was queued with MHD) diff --git a/src/backend/taler-merchant-httpd_private-delete-transfers-ID.c b/src/backend/taler-merchant-httpd_private-delete-transfers-ID.c index 93656f4a..1e191eb6 100644 --- a/src/backend/taler-merchant-httpd_private-delete-transfers-ID.c +++ b/src/backend/taler-merchant-httpd_private-delete-transfers-ID.c @@ -23,14 +23,6 @@ #include -/** - * Handle a DELETE "/private/transfers/$ID" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] hc context with further information about the request - * @return MHD result code - */ MHD_RESULT TMH_private_delete_transfers_ID (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index bc5bcfd9..6caa3060 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -448,8 +448,7 @@ exchange_timeout_cb (void *cls) * Function called with detailed wire transfer data. * * @param cls closure with a `struct TransferQuery *` - * @param hr HTTP response data - * @param dd details about the deposit (NULL on errors) + * @param dr HTTP response data */ static void deposit_get_cb (void *cls, diff --git a/src/backend/taler-merchant-httpd_private-get-products.c b/src/backend/taler-merchant-httpd_private-get-products.c index 6c683887..bc90c94d 100644 --- a/src/backend/taler-merchant-httpd_private-get-products.c +++ b/src/backend/taler-merchant-httpd_private-get-products.c @@ -43,14 +43,6 @@ add_product (void *cls, } -/** - * Handle a GET "/private/products" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] hc context with further information about the request - * @return MHD result code - */ MHD_RESULT TMH_private_get_products (const struct TMH_RequestHandler *rh, struct MHD_Connection *connection, diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 32209bcd..80009f77 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -2164,9 +2164,7 @@ struct TALER_MERCHANT_PayResponse * POST /orders/$ID/pay request to a merchant. * * @param cls closure - * @param hr HTTP response details - * @param merchant_sig signature from the merchant - * affirming payment, or NULL on errors + * @param pr HTTP response details */ typedef void (*TALER_MERCHANT_OrderPayCallback) ( @@ -3688,9 +3686,7 @@ struct TALER_MERCHANT_PickupDetails * the operation. * * @param cls closure - * @param hr HTTP response details - * @param num_sigs length of the @a reserve_sigs array, 0 on error - * @param sigs array of signatures over the coins, NULL on error + * @param pd HTTP response details */ typedef void (*TALER_MERCHANT_TipPickupCallback) ( diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 64e37c72..92ce1a0b 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -1491,7 +1491,9 @@ TALER_TESTING_cmd_merchant_kyc_get (const char *label, /** - * Call #op on all simple traits. + * Call @a op on all simple traits. + * + * @param op macro to call */ // FIXME: rename: refund_entry->refund_detail #define TALER_MERCHANT_TESTING_SIMPLE_TRAITS(op) \ @@ -1529,7 +1531,9 @@ TALER_TESTING_cmd_merchant_kyc_get (const char *label, /** - * Call #op on all indexed traits. + * Call @a op on all indexed traits. + * + * @param op macro to call */ #define TALER_MERCHANT_TESTING_INDEXED_TRAITS(op) \ op (coin_reference, const char *) \ -- cgit v1.2.3