summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-01-17 16:28:47 +0100
committerChristian Grothoff <christian@grothoff.org>2023-01-17 16:28:47 +0100
commit5f3116d324f4b475365b9a8729a69851419229c3 (patch)
tree1104ec3d69a31bb41b1e9720b13ae47de2f66aae
parente7966b8e4eed5623cc45ff63edc7c1ece7a58365 (diff)
downloadmerchant-5f3116d324f4b475365b9a8729a69851419229c3.tar.gz
merchant-5f3116d324f4b475365b9a8729a69851419229c3.tar.bz2
merchant-5f3116d324f4b475365b9a8729a69851419229c3.zip
-misc doxygen fixes
m---------contrib/merchant-backoffice0
-rw-r--r--src/backend/taler-merchant-httpd_private-get-pending-webhooks.c7
-rw-r--r--src/backend/taler-merchant-httpd_private-get-webhooks.c1
-rw-r--r--src/include/taler_merchant_service.h2
-rw-r--r--src/include/taler_merchantdb_plugin.h11
-rw-r--r--src/lib/merchant_api_common.h2
-rw-r--r--src/lib/merchant_api_get_templates.c10
-rw-r--r--src/testing/testing_api_cmd_post_using_templates.c2
8 files changed, 19 insertions, 16 deletions
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
-Subproject 182cdfffa1d4b6f2bb3543d30cfa7509e73bda0
+Subproject 8a6835316532d9e250bbdfe9ff55432a1acca62
diff --git a/src/backend/taler-merchant-httpd_private-get-pending-webhooks.c b/src/backend/taler-merchant-httpd_private-get-pending-webhooks.c
index 690b0c14..d5160476 100644
--- a/src/backend/taler-merchant-httpd_private-get-pending-webhooks.c
+++ b/src/backend/taler-merchant-httpd_private-get-pending-webhooks.c
@@ -26,8 +26,9 @@
*
* @param cls a `json_t *` JSON array to build
* @param webhook_serial reference of the webhook
+ * @param next_attempt when will this hook be attempted next
*/
-static voidX
+static void
add_pending_webhook (void *cls,
uint64_t *webhook_serial,
struct GNUNET_TIME_Absolute *next_attempt)
@@ -42,7 +43,7 @@ add_pending_webhook (void *cls,
webhook_serial),
GNUNET_JSON_pack_string ("next_attempt",
next_attempt)
- )));
+ )));
}
@@ -75,4 +76,4 @@ TMH_private_get_pending_webhooks (const struct TMH_RequestHandler *rh,
}
-/* end of taler-merchant-httpd_private-get-webhooks.c */
+/* end of taler-merchant-httpd_private-get-pending-webhooks.c */
diff --git a/src/backend/taler-merchant-httpd_private-get-webhooks.c b/src/backend/taler-merchant-httpd_private-get-webhooks.c
index 2436c197..251cd95e 100644
--- a/src/backend/taler-merchant-httpd_private-get-webhooks.c
+++ b/src/backend/taler-merchant-httpd_private-get-webhooks.c
@@ -27,6 +27,7 @@
*
* @param cls a `json_t *` JSON array to build
* @param webhook_id ID of the webhook
+ * @param event_type what type of event is the hook for
*/
static void
add_webhook (void *cls,
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 9b38c2bf..e413a7c6 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -4647,7 +4647,7 @@ struct TALER_MERCHANT_WebhookDeleteHandle *
TALER_MERCHANT_webhook_delete (
struct GNUNET_CURL_Context *ctx,
const char *backend_url,
- const char *webhok_id,
+ const char *webhook_id,
TALER_MERCHANT_WebhookDeleteCallback cb,
void *cb_cls);
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 764bdab6..707cf2d9 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -383,16 +383,17 @@ struct TALER_MERCHANTDB_WebhookDetails
};
+
/**
* Typically called by `lookup_webhook_by_event`.
*
* @param cls a `json_t *` JSON array to build
* @param webhook_serial reference to the configured webhook template.
- * @param next_attempt is the time we should make the next request to the webhook.
- * @param url to make request to
- * @param http_method use for the webhook
- * @param header of the webhook
- * @param body of the webhook
+ * @param event_type which type of event triggers this type of webhook
+ * @param url the HTTP URL to make the webhook request to
+ * @param http_method HTTP method use for the webhook
+ * @param header_template template for the header of the webhook
+ * @param body_template template for the body of the webhook
*/
typedef void
(*TALER_MERCHANTDB_WebhookDetailCallback)(void *cls,
diff --git a/src/lib/merchant_api_common.h b/src/lib/merchant_api_common.h
index 0ffe953d..19a92149 100644
--- a/src/lib/merchant_api_common.h
+++ b/src/lib/merchant_api_common.h
@@ -32,7 +32,7 @@
* @param cb callback
* @param cb_cls closure for @a cb
* @param response_code HTTP response code, 0 on error
- * @param response response body, NULL if not JSON
+ * @param json response body, NULL if not JSON
*/
void
TALER_MERCHANT_handle_order_creation_response_ (
diff --git a/src/lib/merchant_api_get_templates.c b/src/lib/merchant_api_get_templates.c
index cff408e4..030d80cb 100644
--- a/src/lib/merchant_api_get_templates.c
+++ b/src/lib/merchant_api_get_templates.c
@@ -68,12 +68,12 @@ struct TALER_MERCHANT_TemplatesGetHandle
* Parse template information from @a ia.
*
* @param ia JSON array (or NULL!) with template data
- * @param wgh operation handle
+ * @param tgh operation handle
* @return #GNUNET_OK on success
*/
static int
parse_templates (const json_t *ia,
- struct TALER_MERCHANT_TemplatesGetHandle *tgh)
+ struct TALER_MERCHANT_TemplatesGetHandle *tgh)
{
unsigned int ies_len = json_array_size (ia);
struct TALER_MERCHANT_TemplateEntry ies[ies_len];
@@ -128,8 +128,8 @@ parse_templates (const json_t *ia,
*/
static void
handle_get_templates_finished (void *cls,
- long response_code,
- const void *response)
+ long response_code,
+ const void *response)
{
struct TALER_MERCHANT_TemplatesGetHandle *tgh = cls;
const json_t *json = response;
@@ -166,7 +166,7 @@ handle_get_templates_finished (void *cls,
if ( (! json_is_array (templates)) ||
(GNUNET_OK ==
parse_templates (templates,
- tgh)) )
+ tgh)) )
{
GNUNET_JSON_parse_free (spec);
TALER_MERCHANT_templates_get_cancel (tgh);
diff --git a/src/testing/testing_api_cmd_post_using_templates.c b/src/testing/testing_api_cmd_post_using_templates.c
index 1d6db0eb..137c7df1 100644
--- a/src/testing/testing_api_cmd_post_using_templates.c
+++ b/src/testing/testing_api_cmd_post_using_templates.c
@@ -75,7 +75,7 @@ struct PostUsingTemplatesState
* Callback for a POST /using-templates operation.
*
* @param cls closure for this function
- * @param hr response being processed
+ * @param por response being processed
*/
static void
post_using_templates_cb (void *cls,