-fix doxygen

11 files changed, 28 insertions, 11 deletions

diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag
index 6c47d093..707d14c5 100644
--- a/contrib/gnunet.tag
+++ b/contrib/gnunet.tag
@@ -12,6 +12,17 @@
     </member>
   </compound>
   <compound kind="file">
+    <name>gnunet_time_lib.h</name>
+    <path></path>
+    <filename>gnunet_time_lib.h</filename>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_TIME_UNIT_FOREVER_TS</name>
+      <anchorfile>gnunet_time_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="file">
     <name>gnunet_util_lib.h</name>
     <path></path>
     <filename>gnunet_util_lib.h</filename>
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject 6fa7e435858b4a22506588cb1142cdc9b142273
+Subproject 5934e007f637bd9834a811e67c0a030d7a59f2c
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
index 4394cfd4..83c73eb8 100644
--- a/doc/doxygen/taler.doxy
+++ b/doc/doxygen/taler.doxy
@@ -292,7 +292,6 @@ DOT_PATH               =
 DOTFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 500
 MAX_DOT_GRAPH_DEPTH    = 2
-DOT_TRANSPARENT        = YES
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
diff --git a/src/backend/taler-merchant-httpd_private-get-pos.c b/src/backend/taler-merchant-httpd_private-get-pos.c
index 1595d3a2..f8f84400 100644
--- a/src/backend/taler-merchant-httpd_private-get-pos.c
+++ b/src/backend/taler-merchant-httpd_private-get-pos.c
@@ -43,8 +43,13 @@ struct Context
 /**
  * Add product details to our JSON array.
  *
- * @param ctx a `struct Context` with JSON arrays to build
+ * @param cls a `struct Context` with JSON arrays to build
+ * @param product_serial row ID of the product
  * @param product_id ID of the product
+ * @param pd full product details
+ * @param num_categories length of @a categories array
+ * @param categories array of categories the
+ *   product is in
  */
 static void
 add_product (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 d9fa4e49..ba0f7c8d 100644
--- a/src/backend/taler-merchant-httpd_private-get-products.c
+++ b/src/backend/taler-merchant-httpd_private-get-products.c
@@ -26,6 +26,7 @@
  * Add product details to our JSON array.
  *
  * @param cls a `json_t *` JSON array to build
+ * @param product_serial serial (row) number of the product in the database
  * @param product_id ID of the product
  */
 static void
diff --git a/src/backenddb/pg_account_kyc_set_status.h b/src/backenddb/pg_account_kyc_set_status.h
index cc1f85b5..3c5891b3 100644
--- a/src/backenddb/pg_account_kyc_set_status.h
+++ b/src/backenddb/pg_account_kyc_set_status.h
@@ -51,7 +51,7 @@ TMH_PG_account_kyc_set_status (
   const char *exchange_url,
   uint64_t exchange_kyc_serial,
   struct GNUNET_TIME_Timestamp timestamp,
-  unsigned int exchage_http_status,
+  unsigned int exchange_http_status,
   enum TALER_ErrorCode exchange_ec_code,
   const struct TALER_AccountAccessTokenP *access_token,
   unsigned int num_limits,
diff --git a/src/backenddb/pg_lookup_all_products.h b/src/backenddb/pg_lookup_all_products.h
index 390fa60d..6d1d57e8 100644
--- a/src/backenddb/pg_lookup_all_products.h
+++ b/src/backenddb/pg_lookup_all_products.h
@@ -30,9 +30,6 @@
  *
  * @param cls closure
  * @param instance_id instance to lookup products for
- * @param offset transfer_serial number of the transfer we want to offset from
- * @param limit number of entries to return, negative for descending,
- *                positive for ascending
  * @param cb function to call on all products found
  * @param cb_cls closure for @a cb
  * @return database result code
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 0b5cf232..4d001547 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -579,7 +579,6 @@ typedef void
  * @param backend_url HTTP base URL for the backend
  * @param instance_id identity of the instance to get information about
  * @param name name of the merchant instance
- * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
  * @param jurisdiction jurisdiction of the merchant instance
  * @param use_stefan use STEFAN curve for acceptable fees
@@ -645,7 +644,6 @@ typedef void
  * @param instance_id identity of the instance to modify information about; NULL
  *                    if the instance is identified as part of the @a backend_url
  * @param name name of the merchant instance
- * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
  * @param jurisdiction jurisdiction of the merchant instance
  * @param use_stefan use STEFAN curve for acceptable fees
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index c67d4959..4833e4fe 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -1557,6 +1557,7 @@ TALER_TESTING_cmd_merchant_post_using_templates (
  * @param valid_after start of the validity time of the token family.
  * @param valid_before end of the validity time of the token family.
  * @param duration validity duration of an issued token of the token family.
+ * @param rounding to multiples of what duration should start times be rounded
  * @param kind kind of the token family. either "subscription" or "discount".
  * @return the command.
  */
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 7b380537..7c7f7fbe 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -1725,7 +1725,7 @@ struct TALER_MERCHANTDB_Plugin
     const char *exchange_url,
     uint64_t exchange_kyc_serial,
     struct GNUNET_TIME_Timestamp timestamp,
-    unsigned int exchage_http_status,
+    unsigned int exchange_http_status,
     enum TALER_ErrorCode exchange_ec_code,
     const struct TALER_AccountAccessTokenP *access_token,
     unsigned int num_limits,
diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c
index 65ced8e3..a1df1259 100644
--- a/src/testing/testing_api_cmd_post_orders.c
+++ b/src/testing/testing_api_cmd_post_orders.c
@@ -591,8 +591,12 @@ orders_run2 (void *cls,
 /**
  * Constructs the json for a the choices of an order request.
  *
- * @param slug the name of the order to add, can be NULL.
- * @param valid_after valid_after date for the input and output token.
+ * @param input_slug the name of the token family to use for input, can be NULL
+ * @param output_slug the name of the token family to use for the output, can be NULL.
+ * @param input_count number of token inputs to require
+ * @param output_count number of tokens to output
+ * @param input_valid_after validity date for the input token.
+ * @param output_valid_after validity date for the output token.
  * @param[out] choices where to write the json string.
  */
 static void
@@ -605,6 +609,7 @@ make_choices_json (
   struct GNUNET_TIME_Timestamp output_valid_after,
   json_t **choices)
 {
+  /* FIXME: ugly code should return c, use GNUNET_JSON_PACK() for more type-safety */
   json_t *c;
 
   c = json_pack("[{s:o, s:o}]",