summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/taler-merchant-httpd_statics.c10
-rw-r--r--src/backend/taler-merchant-httpd_statics.h5
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c10
-rw-r--r--src/include/taler_merchant_service.h5
-rw-r--r--src/include/taler_merchant_testing_lib.h6
5 files changed, 10 insertions, 26 deletions
diff --git a/src/backend/taler-merchant-httpd_statics.c b/src/backend/taler-merchant-httpd_statics.c
index 3d852aeb..48d00ce4 100644
--- a/src/backend/taler-merchant-httpd_statics.c
+++ b/src/backend/taler-merchant-httpd_statics.c
@@ -109,16 +109,6 @@ lookup_file (struct MHD_Connection *connection,
}
-/**
- * Check for the existence of a static file and return the result if it
- * matches. Otherwise returns a "not found" page.
- *
- * @param connection the connection we act upon
- * @param template basename of the template to load
- * @param taler_uri value for "Taler:" header to set, or NULL
- * @param kvc key value pairs to fill in
- * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection)
- */
MHD_RESULT
TMH_return_static (const struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
diff --git a/src/backend/taler-merchant-httpd_statics.h b/src/backend/taler-merchant-httpd_statics.h
index 271d28eb..977a488d 100644
--- a/src/backend/taler-merchant-httpd_statics.h
+++ b/src/backend/taler-merchant-httpd_statics.h
@@ -28,10 +28,9 @@
* Check for the existence of a static file and return the result if it
* matches. Otherwise returns a "not found" page.
*
+ * @param rh request handler
* @param connection the connection we act upon
- * @param template basename of the template to load
- * @param taler_uri value for "Taler:" header to set, or NULL
- * @param kvc key value pairs to fill in
+ * @param hc handler context
* @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection)
*/
MHD_RESULT
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 19ea0ed0..cb89f2c8 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1280,8 +1280,7 @@ lookup_orders_cb (void *cls,
* @param cls closure
* @param instance_id instance to obtain order of
* @param of filter to apply when looking up orders
- * @param[out] contract_terms where to store the retrieved contract terms,
- * NULL to only test if the order exists
+ * @param cb callback to pass all the orders that are found
* @return transaction status
*/
static enum GNUNET_DB_QueryStatus
@@ -4296,14 +4295,14 @@ postgres_lookup_transfers (void *cls,
* including signature (so we have proof).
*
* @param cls closure
- * @paramm exchange_pub public key of the exchange
+ * @paramm master_pub public key of the exchange
* @param h_wire_method hash of wire method
* @param wire_fee wire fee charged
* @param closing_fee closing fee charged (irrelevant for us,
* but needed to check signature)
* @param start_date start of fee being used
* @param end_date end of fee being used
- * @param exchange_sig signature of exchange over fee structure
+ * @param master_sig signature of exchange over fee structure
* @return transaction status code
*/
static enum GNUNET_DB_QueryStatus
@@ -4315,8 +4314,7 @@ postgres_store_wire_fee_by_exchange (
const struct TALER_Amount *closing_fee,
struct GNUNET_TIME_Absolute start_date,
struct GNUNET_TIME_Absolute end_date,
- const struct
- TALER_MasterSignatureP *master_sig)
+ const struct TALER_MasterSignatureP *master_sig)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index a4699df4..2a6f19c0 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -110,7 +110,7 @@ struct TALER_MERCHANT_HttpResponse
* error details and setup the corresponding @a hr structure. Internally
* used to convert merchant's responses in to @a hr.
*
- * @param response, if NULL we will report #TALER_EC_INVALIDD_RESPONSE in `ec`
+ * @param response if NULL we will report #TALER_EC_INVALIDD_RESPONSE in `ec`
* @param http_status http status to use
* @param[out] hr response object to initialize, fields will
* only be valid as long as @a response is valid as well
@@ -494,7 +494,6 @@ typedef void
* @param backend_url HTTP base URL for the backend
* @param instance_id identity of the instance to get information about
* @param accounts_length how many bank accounts this instance has
- * @param payto_uris_length length of the @a accounts array
* @param payto_uris URIs of the bank accounts of the merchant instance
* @param name name of the merchant instance
* @param address physical address of the merchant instance
@@ -2808,7 +2807,7 @@ TALER_MERCHANT_reserves_post (
* Cancel a POST /reserves request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param pth the operation to cancel
+ * @param prh the operation to cancel
*/
void
TALER_MERCHANT_reserves_post_cancel (
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index a68d598d..77f4c3e0 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -1144,8 +1144,6 @@ TALER_TESTING_cmd_merchant_get_tip (const char *label,
* @param merchant_url base URL of the merchant which will
* serve the request.
* @param tip_reference reference to a command that created a tip.
- * @param pickup_refs a NULL-terminated list of pickup commands
- * associated with the tip.
* @param http_status expected HTTP response code for the request.
* @param ... NULL-terminated list of labels (const char *) of
* pickup (commands) we expect to be returned in the list
@@ -1374,7 +1372,7 @@ TALER_TESTING_make_trait_merchant_sig (
* @param cmd command to extract trait from
* @param index which signature to pick if @a cmd has multiple
* on offer
- * @param merchant_sig[out] set to the wanted signature.
+ * @param[out] merchant_sig set to the wanted signature.
*
* @return #GNUNET_OK on success
*/
@@ -1490,7 +1488,7 @@ TALER_TESTING_get_trait_coin_reference (const struct TALER_TESTING_Command *cmd,
*
* @param cmd command to extract trait from.
* @param index index of the trait.
- * @param planchet_secrets[out] set to the wanted secrets.
+ * @param[out] planchet_secrets set to the wanted secrets.
* @return #GNUNET_OK on success
*/
int