From 0846ab93bcbe606d34cc547904634244312e137d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 29 Aug 2020 00:37:37 +0200 Subject: doxygen fixes --- contrib/gana | 2 +- contrib/gnunet.tag | 24 ++++++++++++++++++++++++ doc/doxygen/taler.doxy | 3 +-- src/auditor/report-lib.c | 2 +- src/auditor/report-lib.h | 4 ++-- src/auditor/taler-helper-auditor-deposits.c | 2 +- src/bank-lib/taler-wire-gateway-client.c | 2 +- src/include/taler_auditor_service.h | 2 +- src/include/taler_signatures.h | 20 -------------------- src/include/taler_testing_lib.h | 3 +-- src/lib/exchange_api_withdraw2.c | 7 ++----- src/testing/testing_api_helpers_bank.c | 1 + 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/contrib/gana b/contrib/gana index 0b778cdac..18a39c297 160000 --- a/contrib/gana +++ b/contrib/gana @@ -1 +1 @@ -Subproject commit 0b778cdac372d0b75f3b64501a15a21c9c57f36e +Subproject commit 18a39c29726860af58800a28454446154b89832b diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag index 0add90c24..73a1326e5 100644 --- a/contrib/gnunet.tag +++ b/contrib/gnunet.tag @@ -158,17 +158,41 @@ gnunet_pq_lib.h (const struct GNUNET_TIME_AbsoluteNBO *x) + + struct GNUNET_SQ_QueryParam + GNUNET_SQ_query_param_absolute_time + gnunet_sq_lib.h + (const struct GNUNET_TIME_Absolute *x) + + + struct GNUNET_SQ_QueryParam + GNUNET_PQ_query_param_absolute_time_nbo + gnunet_sq_lib.h + (const struct GNUNET_TIME_AbsoluteNBO *x) + #define GNUNET_PQ_query_param_end gnunet_pq_lib.h + + #define + GNUNET_SQ_query_param_end + gnunet_sq_lib.h + + int GNUNET_PQ_ResultConverter gnunet_pq_lib.h )(void *cls, PGresult *result, int row, const char *fname, size_t *dst_size, void *dst) + + int + GNUNET_SQ_ResultConverter + gnunet_sq_lib.h + )(void *cls, sqlite3_stmt *result, unsigned int column, size_t *dst_size, void *dst) + diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy index 425ac22f4..ddd3031a5 100644 --- a/doc/doxygen/taler.doxy +++ b/doc/doxygen/taler.doxy @@ -266,12 +266,11 @@ TAGFILES = ../../contrib/gnunet.tag ../../contrib/microhttpd.tag GENERATE_TAGFILE = taler-exchange.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl + #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES CLASS_GRAPH = NO diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c index 48483bde8..0cecf2e01 100644 --- a/src/auditor/report-lib.c +++ b/src/auditor/report-lib.c @@ -583,7 +583,7 @@ TALER_ARL_amount_subtract_ (struct TALER_Amount *diff, * @param filename where is the addition called * @param functionname name of the function where the addition is called * @param line line number of the addition - * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid), + * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid), * #TALER_ARL_SR_ZERO if the result was zero, * #TALER_ARL_SR_POSITIVE if the result is positive */ diff --git a/src/auditor/report-lib.h b/src/auditor/report-lib.h index 0842f9154..04165ae4a 100644 --- a/src/auditor/report-lib.h +++ b/src/auditor/report-lib.h @@ -258,7 +258,7 @@ enum TALER_ARL_SubtractionResult * @param filename where is the addition called * @param functionname name of the function where the addition is called * @param line line number of the addition - * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid), + * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid), * #TALER_ARL_SR_ZERO if the result was zero, * #TALER_ARL_SR_POSITIVE if the result is positive */ @@ -280,7 +280,7 @@ TALER_ARL_amount_subtract_neg_ (struct TALER_Amount *diff, * @param[out] diff where to store (@a a1 - @a a2) * @param a1 amount to subtract from * @param a2 amount to subtract - * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid), + * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid), * #TALER_ARL_SR_ZERO if the result was zero, * #TALER_ARL_SR_POSITIVE if the result is positive */ diff --git a/src/auditor/taler-helper-auditor-deposits.c b/src/auditor/taler-helper-auditor-deposits.c index 41cf406cb..b9c4ff8de 100644 --- a/src/auditor/taler-helper-auditor-deposits.c +++ b/src/auditor/taler-helper-auditor-deposits.c @@ -96,7 +96,7 @@ struct DepositConfirmationContext * @param cls our `struct DepositConfirmationContext` * @param serial_id row of the @a dc in the database * @param dc the deposit confirmation we know - * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERROR to stop iterating + * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop iterating */ static int test_dc (void *cls, diff --git a/src/bank-lib/taler-wire-gateway-client.c b/src/bank-lib/taler-wire-gateway-client.c index 58fd57c79..c9e473378 100644 --- a/src/bank-lib/taler-wire-gateway-client.c +++ b/src/bank-lib/taler-wire-gateway-client.c @@ -14,7 +14,7 @@ TALER; see the file COPYING. If not, see */ /** - * @file taler-bank-transfer.c + * @file taler-wire-gateway-client.c * @brief Execute wire transfer. * @author Christian Grothoff */ diff --git a/src/include/taler_auditor_service.h b/src/include/taler_auditor_service.h index e7f056e5f..d84ecd5eb 100644 --- a/src/include/taler_auditor_service.h +++ b/src/include/taler_auditor_service.h @@ -234,7 +234,7 @@ typedef void * @param auditor the auditor handle; the auditor must be ready to operate * @param h_wire hash of merchant wire details * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor) - * @param timestamp timestamp when the contract was finalized, must not be too far in the future + * @param exchange_timestamp timestamp when the contract was finalized, must not be too far in the future * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant * @param coin_pub coin’s public key diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index 6584f1853..3da11b303 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -1338,26 +1338,6 @@ struct TALER_ReserveCloseConfirmationPS }; -/** - * Used by the merchant to confirm with a signature that the refund has - * been successfully done. Even though the frontend doesn't usually do crypto, - * this signature may turn useful in court. - */ -struct TALER_MerchantRefundConfirmationPS -{ - /** - * Set to #TALER_SIGNATURE_MERCHANT_REFUND_OK. - */ - struct GNUNET_CRYPTO_EccSignaturePurpose purpose; - - /** - * Hashed order id; in case frontend wants to check it. - * Hashed without the 0-termination. - */ - struct GNUNET_HashCode h_order_id GNUNET_PACKED; - -}; - /** * Used by the merchant to confirm to the frontend that * the user did a payment replay with the current browser session. diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 85ea5b010..74148b8f5 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -844,8 +844,7 @@ TALER_TESTING_run_bank (const char *config_filename, * responsible to create the exchange EBICS subscriber at * the nexus. * - * @param bank_url base URL of the bank, used by `wget' to check - * that the bank was started right. + * @param bc bank configuration of the bank * @return the process, or NULL if the process could not * be started. */ diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c index 25f669143..c51138d90 100644 --- a/src/lib/exchange_api_withdraw2.c +++ b/src/lib/exchange_api_withdraw2.c @@ -347,11 +347,8 @@ handle_reserve_withdraw_finished (void *cls, * same arguments in case of failures. * * @param exchange the exchange handle; the exchange must be ready to operate - * @param pk kind of coin to create - * @param reserve_sig signature from the reserve authorizing the withdrawal - * @param reserve_pub public key of the reserve to withdraw from - * @param ps secrets of the planchet - * caller must have committed this value to disk before the call (with @a pk) + * @param pd planchet details of the planchet to withdraw + * @param reserve_priv private key of the reserve to withdraw from * @param res_cb the callback to call when the final result for this request is available * @param res_cb_cls closure for @a res_cb * @return NULL diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c index b0b8035f3..5b11ad937 100644 --- a/src/testing/testing_api_helpers_bank.c +++ b/src/testing/testing_api_helpers_bank.c @@ -106,6 +106,7 @@ TALER_TESTING_has_in_name (const char *prog, * bank" function to do such tasks. This function is also * responsible to create the exchange user at Nexus. * + * @param bc bank configuration of the bank * @return the pair of both service handles. In case of * errors, each element of the pair will be set to NULL. */ -- cgit v1.2.3