diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/doxygen/taler.doxy | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-depositcheck.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-get-token-families.c | 1 | ||||
| -rw-r--r-- | src/backenddb/pg_insert_deposit.h | 3 | ||||
| -rw-r--r-- | src/backenddb/pg_insert_deposit_confirmation.h | 2 | ||||
| -rw-r--r-- | src/include/platform.h | 2 | ||||
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 1 |
8 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0a8b2a58..2c0cb654 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,8 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"]) # logic if doc_only is set, make sure conditionals are still defined AM_CONDITIONAL([HAVE_GNUNETPQ], [false]) AM_CONDITIONAL([HAVE_POSTGRESQL], [false]) +AM_CONDITIONAL([HAVE_TALERUTIL], [false]) +AM_CONDITIONAL([HAVE_TALERPQ], [false]) AM_CONDITIONAL([HAVE_TALERFAKEBANK], [false]) AM_CONDITIONAL([USE_COVERAGE], [false]) AM_CONDITIONAL([ENABLE_DOC], [true]) diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy index 8ee523ec..d9785d42 100644 --- a/doc/doxygen/taler.doxy +++ b/doc/doxygen/taler.doxy @@ -290,7 +290,7 @@ DOT_IMAGE_FORMAT = svg INTERACTIVE_SVG = NO DOT_PATH = DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 100 +DOT_GRAPH_MAX_NODES = 500 MAX_DOT_GRAPH_DEPTH = 2 DOT_TRANSPARENT = YES DOT_MULTI_TARGETS = NO diff --git a/src/backend/taler-merchant-depositcheck.c b/src/backend/taler-merchant-depositcheck.c index cc0aaae5..6bb3b05b 100644 --- a/src/backend/taler-merchant-depositcheck.c +++ b/src/backend/taler-merchant-depositcheck.c @@ -756,7 +756,7 @@ select_work (void *cls) * @param kr response from /keys * @param[in] in_keys keys object passed to callback with * reference counter of 1. Must be freed by callee - * using #TALER_EXCHANGE_keys_decref(). NULL on failure. + * using TALER_EXCHANGE_keys_decref(). NULL on failure. */ static void keys_cb ( diff --git a/src/backend/taler-merchant-httpd_private-get-token-families.c b/src/backend/taler-merchant-httpd_private-get-token-families.c index 003e2966..fa364570 100644 --- a/src/backend/taler-merchant-httpd_private-get-token-families.c +++ b/src/backend/taler-merchant-httpd_private-get-token-families.c @@ -31,6 +31,7 @@ * @param name name of the token family * @param valid_after start time of the token family's validity period * @param valid_before end time of the token family's validity period + * @param kind kind of the token family */ static void add_token_family (void *cls, diff --git a/src/backenddb/pg_insert_deposit.h b/src/backenddb/pg_insert_deposit.h index 94af2bf4..1d08e39e 100644 --- a/src/backenddb/pg_insert_deposit.h +++ b/src/backenddb/pg_insert_deposit.h @@ -16,7 +16,7 @@ /** * @file backenddb/pg_insert_deposit.h * @brief implementation of the insert_deposit function for Postgres - * @author Iván Ávalos + * @author IvánAvalos */ #ifndef PG_INSERT_DEPOSIT_H #define PG_INSERT_DEPOSIT_H @@ -35,7 +35,6 @@ * @param coin_sig signature of the coin * @param amount_with_fee amount the exchange will deposit for this coin * @param deposit_fee fee the exchange will charge for this coin - * @param wire_fee wire fee the exchange charges * @param refund_fee fee the exchange charges to refund this coin * @return transaction status */ diff --git a/src/backenddb/pg_insert_deposit_confirmation.h b/src/backenddb/pg_insert_deposit_confirmation.h index 243d5a4d..f033e237 100644 --- a/src/backenddb/pg_insert_deposit_confirmation.h +++ b/src/backenddb/pg_insert_deposit_confirmation.h @@ -39,7 +39,7 @@ * @param h_wire hash of the wire details of the target account of the merchant * @param exchange_sig signature from exchange that coin was accepted * @param exchange_pub signing key that was used for @a exchange_sig - * @param[out] batch_deposit_serial_id set to the table row + * @param[out] deposit_confirmation_serial_id set to the table row * @return transaction status */ enum GNUNET_DB_QueryStatus diff --git a/src/include/platform.h b/src/include/platform.h index 6adeaf58..fcafb941 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -15,7 +15,7 @@ */ /** - * @file merchant/src/include/platform.h + * @file src/include/platform.h * @brief This file contains the includes and definitions which are used by the * rest of the modules * @author Sree Harsha Totakura <sreeharsha@totakura.in> diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 705c4888..640bbdd7 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -1128,6 +1128,7 @@ enum TALER_MERCHANTDB_TokenFamilyKind * @param name name of the token family * @param start_time start time of the token family's validity period * @param expiration end time of the token family's validity period + * @param kind kind of the token family */ typedef void (*TALER_MERCHANTDB_TokenFamiliesCallback)( |