diff options
| -rw-r--r-- | contrib/microhttpd.tag | 24 | ||||
| -rw-r--r-- | contrib/taler-exchange.tag | 11 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 7 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders-ID-abort.c | 3 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-get-orders.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-get-orders.h | 2 | ||||
| -rw-r--r-- | src/merchant-tools/taler-merchant-setup-reserve.c | 2 |
9 files changed, 43 insertions, 12 deletions
diff --git a/contrib/microhttpd.tag b/contrib/microhttpd.tag index 02b5551c..a095bd2f 100644 --- a/contrib/microhttpd.tag +++ b/contrib/microhttpd.tag @@ -1,9 +1,25 @@ <?xml version='1.0' encoding='UTF-8' standalone='yes' ?> <tagfile> <compound kind="file"> - <name>microhttpd_lib.h</name> + <name>microhttpd.h</name> <path></path> <filename>microhttpd.h</filename> + <member kind="function"> + <type>enum MHD_Result</type> + <name>MHD_run</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist>(struct MHD_Daemon *daemon)</arglist> + </member> + <member kind="function"> + <type>int</type> + <name>MHD_get_connection_values</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist>(struct MHD_Connection *connection, + enum MHD_ValueKind kind, + MHD_KeyValueIterator iterator, + void *iterator_cls) + </arglist> + </member> <member kind="define"> <type>#define</type> <name>MHD_YES</name> @@ -24,6 +40,12 @@ </member> <member kind="define"> <type>#define</type> + <name>MHD_HTTP_NOT_FOUND</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> <name>MHD_HTTP_NO_CONTENT</name> <anchorfile>microhttpd.h</anchorfile> <arglist></arglist> diff --git a/contrib/taler-exchange.tag b/contrib/taler-exchange.tag index 5d926370..67ad61c3 100644 --- a/contrib/taler-exchange.tag +++ b/contrib/taler-exchange.tag @@ -1,6 +1,17 @@ <?xml version='1.0' encoding='UTF-8' standalone='yes' ?> <tagfile> <compound kind="file"> + <name>taler_exchange_service.h</name> + <path></path> + <filename>taler_exchange_service.h</filename> + <member kind="function"> + <type>struct TALER_EXCHANGE_Keys *</type> + <name>TALER_EXCHANGE_get_keys</name> + <anchorfile>taler_exchange_service.h</anchorfile> + <arglist>(struct TALER_EXCHANGE_Handle *exchange)</arglist> + </member> + </compound> + <compound kind="file"> <name>taler_mhd_lib.h</name> <path></path> <filename>taler_mhd_lib.h</filename> diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 91c3c693..9da5f23d 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -264,7 +264,7 @@ payment_trigger_free (void *cls, * * @param order_id an order ID * @param mpub an instance public key - * @param key[out] set to the hash map key to use + * @param[out] key set to the hash map key to use */ static void compute_pay_key (const char *order_id, @@ -296,7 +296,7 @@ compute_pay_key (const char *order_id, * * @param session_id the session for which @a fulfillment_url matters * @param fulfillment_url fullfillment URL of an order - * @param key[out] set to the hash map key to use + * @param[out] key set to the hash map key to use */ static void compute_pay_key2 (const char *session_id, @@ -789,8 +789,6 @@ TMH_trigger_daemon () /** * Function that queries MHD's select sets and * starts the task waiting for them. - * - * @param daemon_handle HTTP server to prepare to run */ static struct GNUNET_SCHEDULER_Task * prepare_daemon (void) @@ -909,6 +907,7 @@ TMH_add_instance (struct TMH_MerchantInstance *mi) * * @param cls argument given together with the function * pointer when the handler was registered with MHD + * @param connection the MHD connection to handle * @param url the requested url * @param method the HTTP method used (#MHD_HTTP_METHOD_GET, * #MHD_HTTP_METHOD_PUT, etc.) diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 8f733dae..9dc0829d 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -329,7 +329,7 @@ retry_exchange (void *cls) * for each wire method. Stores the wire fees with the * exchange for later use. * - * @param cls closure + * @param exchange connection to the exchange * @param master_pub public key of the exchange * @param wire_method name of the wire method (i.e. "iban") * @param payto_uri full payto URI of the exchange diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c index 61ba86d1..c11ff1c8 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c @@ -857,8 +857,7 @@ begin_transaction (struct AbortContext *ac) * Schedules an error response in the connection on failure. * * @param connection HTTP connection we are receiving abortment on - * @param root JSON upload with abortment data - * @param ac context we use to handle the abortment + * @param hc context we use to handle the abortment * @return #GNUNET_OK on success, * #GNUNET_NO on failure (response was queued with MHD) * #GNUNET_SYSERR on hard error (MHD connection must be dropped) 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 7d93b4b6..e9264b3e 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -567,7 +567,7 @@ begin_transaction (struct PayContext *pc); * @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_key which key did the exchange use to create the @a exchange_sig + * @param exchange_pub which key did the exchange use to create the @a exchange_sig */ static void deposit_cb (void *cls, diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c index ca27c92a..3ee08112 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders.c +++ b/src/backend/taler-merchant-httpd_private-get-orders.c @@ -395,7 +395,7 @@ add_order (void *cls, * @param order_id the order that changed * @param paid is the order paid by the customer? * @param refunded was the order refunded? - * @param wire was the merchant paid via wire transfer? + * @param wired was the merchant paid via wire transfer? * @param date execution date of the order * @param order_serial_id serial ID of the order in the database */ diff --git a/src/backend/taler-merchant-httpd_private-get-orders.h b/src/backend/taler-merchant-httpd_private-get-orders.h index 2cc94ad8..cdd88d54 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders.h +++ b/src/backend/taler-merchant-httpd_private-get-orders.h @@ -46,7 +46,7 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh, * @param order_id the order that changed * @param paid is the order paid by the customer? * @param refunded was the order refunded? - * @param wire was the merchant paid via wire transfer? + * @param wired was the merchant paid via wire transfer? * @param date execution date of the order * @param order_serial_id serial ID of the order in the database */ diff --git a/src/merchant-tools/taler-merchant-setup-reserve.c b/src/merchant-tools/taler-merchant-setup-reserve.c index 36c6d014..7286ac3c 100644 --- a/src/merchant-tools/taler-merchant-setup-reserve.c +++ b/src/merchant-tools/taler-merchant-setup-reserve.c @@ -61,7 +61,7 @@ static struct TALER_MERCHANT_PostReservesHandle *prh; static struct GNUNET_CURL_Context *ctx; /** - * Reschedule context for #SH_ctx. + * Reschedule context. */ static struct GNUNET_CURL_RescheduleContext *rc; |