commit cf3495ccc44df0eb9cae3799333b744982588bb2 parent 4ae9fb6642cbd365bcff30761b935fb56bbbe969 Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com> Date: Wed, 16 Jul 2025 11:54:05 +0200 all warnings killed Diffstat:
19 files changed, 141 insertions(+), 169 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h @@ -31,9 +31,9 @@ * Shorthand for exit jumps. */ #define EXITIF(cond) \ - do { \ - if (cond) { GNUNET_break (0); goto EXITIF_exit; } \ - } while (0) + do { \ + if (cond) { GNUNET_break (0); goto EXITIF_exit; } \ + } while (0) /** @@ -445,7 +445,7 @@ enum TMH_AuthScope /** * Order full - * Includes #TMH_ORDER_POS and #TMH_ORDER_MGMT + * Includes #TMH_AS_ORDER_POS and #TMH_AS_ORDER_MGMT */ TMH_AS_ORDER_FULL = 6, diff --git a/src/backenddb/pg_lookup_order_charity.c b/src/backenddb/pg_lookup_order_charity.c @@ -32,21 +32,7 @@ #include "pg_lookup_order_charity.h" #include "pg_helper.h" -/** - * Looking for charity information based on the Donau URL - * - * This function: - * 1. Finds the relevant row in merchant_donau_instances by matching donau_url. - * 2. Joins to merchant_instances by comparing charity_pub_key = merchant_pub. - * 3. Joins to merchant_keys by matching the merchant_serial from merchant_instances, - * retrieving merchant_priv (the private key). - * - * @param cls closure (must be a PostgresClosure) - * @param donau_url the Donau instance URL to look up - * @param[out] charity_id the resulting charity ID, if found - * @param[out] charity_priv the resulting private key, if found - * @return database result code - */ + enum GNUNET_DB_QueryStatus TMH_PG_lookup_order_charity ( void *cls, diff --git a/src/backenddb/pg_lookup_order_charity.h b/src/backenddb/pg_lookup_order_charity.h @@ -34,6 +34,7 @@ #include "donau/donau_service.h" #include "pg_helper.h" + /** * Retrieve the charity’s ID and private key for a given Donau URL. * @@ -41,9 +42,6 @@ * @param donau_url base URL of the Donau instance * @param[out] charity_id set to the `charity_id` from `merchant_donau_instances` * @param[out] charity_priv set to the private key (32 bytes) - * @return #GNUNET_DB_STATUS_SUCCESS if found, - * #GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if none found, - * #GNUNET_DB_STATUS_SOFT_ERROR or #GNUNET_DB_STATUS_HARD_ERROR on errors */ enum GNUNET_DB_QueryStatus TMH_PG_lookup_order_charity ( diff --git a/src/backenddb/pg_select_donau_instance.c b/src/backenddb/pg_select_donau_instance.c @@ -123,14 +123,6 @@ select_donau_instance_cb (void *cls, } -/** - * Select multiple Donau instances from the database. - * - * @param cls the closure for the database context - * @param cb callback function to call with each result - * @param cb_cls closure for the callback - * @return status of the operation - */ enum GNUNET_DB_QueryStatus TMH_PG_select_donau_instance (void *cls, TALER_MERCHANTDB_DonauInstanceCallback cb, diff --git a/src/backenddb/pg_select_donau_instance.h b/src/backenddb/pg_select_donau_instance.h @@ -29,12 +29,12 @@ #include "donau/donau_util.h" /** - * Retrieve details of a Donau instance. + * Select multiple Donau instances from the database. * - * @param cls closure (database connection or context) - * @param donau_url URL of the Donau instance to query - * @param[out] di structure to populate with instance details - * @return database result code + * @param cls the closure for the database context + * @param cb callback function to call with each result + * @param cb_cls closure for the callback + * @return status of the PG */ enum GNUNET_DB_QueryStatus TMH_PG_select_donau_instance (void *cls, diff --git a/src/include/taler_merchant_donau.h b/src/include/taler_merchant_donau.h @@ -30,6 +30,9 @@ #include <donau/donau_util.h> #include <donau/donaudb_plugin.h> +/** + * Structure to hold charity details for the Donau service. + */ struct TALER_MERCHANT_DONAU_Charity { /** @@ -252,14 +255,13 @@ typedef void const struct TALER_MERCHANT_DonauInstanceGetResponse *dir); /** - * Get the details on the Donau instance. This will connect to the - * Donau service backend and retrieve information about the instance. - * The respective information will be passed to the @a cb once available. + * Initiate the GET /donau request. * - * @param ctx the context - * @param cb function to call with the backend's instance information - * @param cb_cls closure for @a cb - * @return the instance handle; NULL upon error + * @param ctx CURL context + * @param backend_url base URL for the backend + * @param cb callback function to handle the response + * @param cb_cls closure for the callback function + * @return the handle for the operation, or NULL on error */ struct TALER_MERCHANT_DonauInstanceGetHandle * TALER_MERCHANT_donau_instances_get ( @@ -270,8 +272,7 @@ TALER_MERCHANT_donau_instances_get ( /** - * Cancel the GET /donau instances operation. Must not be called by clients - * after the callback was invoked. + * Cancel the GET /donau instances operation. * * @param dgh request to cancel. */ @@ -305,6 +306,7 @@ typedef void * @param ctx the context * @param backend_url the backend URL for the operation * @param charity the details of the Donau charity to be posted + * @param auth_token the authentication token for the operation * @param cb function to call with the operation result * @param cb_cls closure for @a cb * @return the instance handle, or NULL upon error @@ -346,14 +348,14 @@ typedef void const struct TALER_MERCHANT_HttpResponse *hr); /** - * Initiates a DELETE /donau/$charity_id operation. + * Initiates the DELETE /donau/$charity_id operation. * - * @param ctx CURL context. - * @param backend_url Base backend URL. - * @param charity_id The ID of the charity to delete. - * @param cb Callback to handle the operation response. - * @param cb_cls Closure for the callback. - * @return Handle for the DELETE operation, or NULL on error. + * @param ctx CURL context + * @param backend_url Base URL for the backend + * @param charity_id The ID of the charity to delete + * @param cb Callback function to handle the response + * @param cb_cls Closure for @a cb + * @return the handle for the operation, or NULL on error */ struct TALER_MERCHANT_DonauInstanceDeleteHandle * TALER_MERCHANT_donau_instance_delete ( diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h @@ -783,7 +783,7 @@ TALER_MERCHANT_instance_token_post ( * the callback was invoked. Afterwards, the authentication may or * may not have been updated. * - * @param iaph request to cancel. + * @param itph request to cancel. */ void TALER_MERCHANT_instance_token_post_cancel ( @@ -799,7 +799,7 @@ struct TALER_MERCHANT_InstanceTokenDeleteHandle; * Function called with the result of the DELETE /instances/$ID/private/token operation. * * @param cls closure - * @param par response data + * @param hr response data */ typedef void (*TALER_MERCHANT_InstanceTokenDeleteCallback)( @@ -831,7 +831,7 @@ TALER_MERCHANT_instance_token_delete ( * Cancel DELETE token request. Must not be called by clients after * the callback was invoked. * - * @param pah request to cancel. + * @param tdh request to cancel. */ void TALER_MERCHANT_instance_token_delete_cancel ( @@ -1040,7 +1040,7 @@ TALER_MERCHANT_instance_delete_cancel ( * @param arg request to cancel. */ #define TALER_MERCHANT_instance_purge_cancel(arg) \ - TALER_MERCHANT_instance_delete_cancel (arg) + TALER_MERCHANT_instance_delete_cancel (arg) /* *************** Accounts **************** */ @@ -6018,7 +6018,7 @@ typedef void * @param ctx the context * @param backend_url HTTP base URL for the backend * @param slug short, url-safe identifier for the statistic - * @param stype the type of statistic to get, see #TALER_MERCHANT_StatisticType + * @param stype the type of statistic to get, see #TALER_MERCHANT_StatisticsType * @param cb function to call with the statistic information * @param cb_cls closure for @a cb * @return the request handle; NULL upon error @@ -6177,7 +6177,7 @@ typedef void * @param ctx the context * @param backend_url HTTP base URL for the backend * @param slug short, url-safe identifier for the statistic - * @param stype the type of statistic to get, see #TALER_MERCHANT_StatisticType + * @param stype the type of statistic to get, see #TALER_MERCHANT_StatisticsType * @param cb function to call with the statistic information * @param cb_cls closure for @a cb * @return the request handle; NULL upon error diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h @@ -38,7 +38,7 @@ #define MERCHANT_FAIL() \ - do {GNUNET_break (0); return NULL; } while (0) + do {GNUNET_break (0); return NULL; } while (0) /** @@ -151,7 +151,7 @@ TALER_TESTING_cmd_merchant_post_instance_token (const char *label, * Set the access token gotten through another CMD * * @param label command label. - * @param other_cmd the other command exposing the bearer_token trait. + * @param cmd_job_label the other command exposing the bearer_token trait. * @return the command. */ struct TALER_TESTING_Command @@ -1134,6 +1134,7 @@ TALER_TESTING_cmd_merchant_pay_order_donau (const char *label, const uint64_t year, const char *donor_tax_id, const char *salt); + #endif /** @@ -1934,26 +1935,27 @@ TALER_TESTING_cmd_charity_post_merchant (const char *label, const struct DONAU_BearerToken *bearer, const char *merchant_reference, unsigned int expected_response_code); + #endif /* HAVE_DONAU_DONAU_SERVICE_H */ /** * Define a "GET /donau" CMD. * * @param label command label. - * @param url base URL of the Donau service serving the - * GET /donau_instances request. + * @param url base URL of the Donau we are looking for instances of. + * @param instance_count number of instances we expect to be returned. * @param expected_http_status expected HTTP response code. * @param ... NULL-terminated list of labels (const char *) of * donau instances (commands) we expect to be returned in the list - * (assuming @a expected_http_status is #MHD_HTTP_OK) * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_get_donau_instances(const char *label, - const char *url, - unsigned int instance_count, - unsigned int expected_http_status, - ...); +TALER_TESTING_cmd_merchant_get_donau_instances (const char *label, + const char *url, + unsigned int instance_count, + unsigned int + expected_http_status, + ...); /** @@ -1962,6 +1964,7 @@ TALER_TESTING_cmd_merchant_get_donau_instances(const char *label, * @param label command label. * @param url base URL of the Donau service serving the * GET /donau_instances request. + * @param merchant_reference string reference to get the testing traits * @param expected_http_status expected HTTP response code. * @param ... NULL-terminated list of labels (const char *) of * donau instances (commands) we expect to be returned in the list @@ -1969,11 +1972,12 @@ TALER_TESTING_cmd_merchant_get_donau_instances(const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_post_donau_instance(const char *label, - const char *url, - const char *merchant_reference, - unsigned int expected_http_status, - ...); +TALER_TESTING_cmd_merchant_post_donau_instance (const char *label, + const char *url, + const char *merchant_reference, + unsigned int + expected_http_status, + ...); /** @@ -1987,10 +1991,11 @@ TALER_TESTING_cmd_merchant_post_donau_instance(const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_delete_donau_instance(const char *label, - const char *url, - uint64_t charity_id, - unsigned int expected_http_status); +TALER_TESTING_cmd_merchant_delete_donau_instance (const char *label, + const char *url, + uint64_t charity_id, + unsigned int + expected_http_status); /** * This function is used to check the statistics counter API @@ -2038,53 +2043,53 @@ TALER_TESTING_cmd_merchant_get_statisticsamount (const char *label, */ // FIXME: rename: refund_entry->refund_detail #define TALER_MERCHANT_TESTING_SIMPLE_TRAITS(op) \ - op (claim_nonce, const struct GNUNET_CRYPTO_EddsaPublicKey) \ - op (pickup_id, const struct TALER_PickupIdentifierP) \ - op (instance_name, const char) \ - op (instance_id, const char) \ - op (address, const json_t) \ - op (product_description, const char) \ - op (product_image, const char) \ - op (product_stock, const int64_t) \ - op (product_unit, const char) \ - op (product_id, const char) \ - op (reason, const char) \ - op (lock_uuid, const char) \ - op (auth_token, const char) \ - op (bearer_token, const char) \ - op (paths_length, const uint32_t) \ - op (payto_length, const uint32_t) \ - op (num_planchets, const uint32_t) \ - op (i18n_description, const json_t) \ - op (taxes, const json_t) \ - op (fee, const struct TALER_Amount) \ - op (use_stefan, const bool) \ - op (jurisdiction, const json_t) \ - op (wire_delay, const struct GNUNET_TIME_Relative) \ - op (pay_delay, const struct GNUNET_TIME_Relative) \ - op (refund_entry, const struct TALER_MERCHANT_RefundDetail) \ - op (order_terms, const json_t) \ - op (h_contract_terms, const struct TALER_PrivateContractHashP) \ - op (h_wire, const struct TALER_MerchantWireHashP) \ - op (proposal_reference, const char) \ - op (template_description, const char) \ - op (otp_device_description, const char) \ - op (otp_id, const char) \ - op (otp_key, const char) \ - op (otp_alg, const enum TALER_MerchantConfirmationAlgorithm) \ - op (template_id, const char) \ - op (template_contract, const json_t) \ - op (event_type, const char) \ - op (webhook_id, const char) \ - op (merchant_base_url, const char) \ - op (url, const char) \ - op (http_method, const char) \ - op (header_template, const char) \ - op (body_template, const char) \ - op (summary, const char) \ - op (token_family_slug, const char) \ - op (token_family_duration, const struct GNUNET_TIME_Relative) \ - op (token_family_kind, const char) + op (claim_nonce, const struct GNUNET_CRYPTO_EddsaPublicKey) \ + op (pickup_id, const struct TALER_PickupIdentifierP) \ + op (instance_name, const char) \ + op (instance_id, const char) \ + op (address, const json_t) \ + op (product_description, const char) \ + op (product_image, const char) \ + op (product_stock, const int64_t) \ + op (product_unit, const char) \ + op (product_id, const char) \ + op (reason, const char) \ + op (lock_uuid, const char) \ + op (auth_token, const char) \ + op (bearer_token, const char) \ + op (paths_length, const uint32_t) \ + op (payto_length, const uint32_t) \ + op (num_planchets, const uint32_t) \ + op (i18n_description, const json_t) \ + op (taxes, const json_t) \ + op (fee, const struct TALER_Amount) \ + op (use_stefan, const bool) \ + op (jurisdiction, const json_t) \ + op (wire_delay, const struct GNUNET_TIME_Relative) \ + op (pay_delay, const struct GNUNET_TIME_Relative) \ + op (refund_entry, const struct TALER_MERCHANT_RefundDetail) \ + op (order_terms, const json_t) \ + op (h_contract_terms, const struct TALER_PrivateContractHashP) \ + op (h_wire, const struct TALER_MerchantWireHashP) \ + op (proposal_reference, const char) \ + op (template_description, const char) \ + op (otp_device_description, const char) \ + op (otp_id, const char) \ + op (otp_key, const char) \ + op (otp_alg, const enum TALER_MerchantConfirmationAlgorithm) \ + op (template_id, const char) \ + op (template_contract, const json_t) \ + op (event_type, const char) \ + op (webhook_id, const char) \ + op (merchant_base_url, const char) \ + op (url, const char) \ + op (http_method, const char) \ + op (header_template, const char) \ + op (body_template, const char) \ + op (summary, const char) \ + op (token_family_slug, const char) \ + op (token_family_duration, const struct GNUNET_TIME_Relative) \ + op (token_family_kind, const char) /** @@ -2093,20 +2098,20 @@ TALER_TESTING_cmd_merchant_get_statisticsamount (const char *label, * @param op macro to call */ #define TALER_MERCHANT_TESTING_INDEXED_TRAITS(op) \ - op (coin_reference, const char) \ - op (paths, const char) \ - op (payto_uris, const struct TALER_FullPayto) \ - op (h_wires, const struct TALER_MerchantWireHashP) \ - op (amounts, const struct TALER_Amount) \ - op (urls, const char) \ - op (http_methods, const char) \ - op (http_header, const char) \ - op (http_body, const void) \ - op (http_body_size, const size_t) \ - op (planchet_secrets, const struct TALER_PlanchetMasterSecretP) \ - op (token_priv, const struct TALER_TokenUsePrivateKeyP) \ - op (token_issue_sig, const struct TALER_TokenIssueSignature) \ - op (token_issue_pub, const struct TALER_TokenIssuePublicKey) + op (coin_reference, const char) \ + op (paths, const char) \ + op (payto_uris, const struct TALER_FullPayto) \ + op (h_wires, const struct TALER_MerchantWireHashP) \ + op (amounts, const struct TALER_Amount) \ + op (urls, const char) \ + op (http_methods, const char) \ + op (http_header, const char) \ + op (http_body, const void) \ + op (http_body_size, const size_t) \ + op (planchet_secrets, const struct TALER_PlanchetMasterSecretP) \ + op (token_priv, const struct TALER_TokenUsePrivateKeyP) \ + op (token_issue_sig, const struct TALER_TokenIssueSignature) \ + op (token_issue_pub, const struct TALER_TokenIssuePublicKey) TALER_MERCHANT_TESTING_SIMPLE_TRAITS (TALER_TESTING_MAKE_DECL_SIMPLE_TRAIT) diff --git a/src/include/taler_merchant_util.h b/src/include/taler_merchant_util.h @@ -768,7 +768,7 @@ TALER_MERCHANT_json_from_token_family ( * @param families_len length of @a families array * @param[out] family matching token family; NULL if no result * @param[out] key key of matching token family; NULL if no result - * @return #GNUNET_ERR if no matching family found; #GNUNET_OK otherwise + * @return #GNUNET_SYSERR if no matching family found; #GNUNET_OK otherwise */ enum GNUNET_GenericReturnValue TALER_MERCHANT_find_token_family_key ( diff --git a/src/lib/merchant_api_delete_donau_instance.c b/src/lib/merchant_api_delete_donau_instance.c @@ -174,7 +174,7 @@ TALER_MERCHANT_donau_instance_delete (struct GNUNET_CURL_Context *ctx, /** * Cancel the DELETE /donau/$charity_id operation. * - * @param ddh the handle for the operation to be canceled + * @param ddh Handle for the operation to cancel. */ void TALER_MERCHANT_donau_instance_delete_cancel (struct diff --git a/src/lib/merchant_api_get_donau_instance.c b/src/lib/merchant_api_get_donau_instance.c @@ -277,9 +277,9 @@ TALER_MERCHANT_donau_instances_get (struct GNUNET_CURL_Context *ctx, /** - * Cancel the GET /donau operation. + * Cancel the GET /donau instances operation. * - * @param dgh the handle for the operation to be canceled + * @param dgh request to cancel. */ void TALER_MERCHANT_donau_instances_get_cancel (struct diff --git a/src/lib/merchant_api_get_statistics.c b/src/lib/merchant_api_get_statistics.c @@ -107,8 +107,10 @@ struct TALER_MERCHANT_StatisticsCounterGetHandle * * @param json overall JSON reply * @param jbuckets JSON array (or NULL!) with bucket data + * @param buckets_description human-readable description for the buckets * @param jintervals JSON array (or NULL!) with bucket data - * @param scgh operation handle + * @param intervals_description human-readable description for the intervals + * @param sgh operation handle * @return #GNUNET_OK on success */ static enum GNUNET_GenericReturnValue @@ -373,7 +375,9 @@ handle_get_statistics_amount_finished (void *cls, * * @param json overall JSON reply * @param jbuckets JSON array (or NULL!) with bucket data + * @param buckets_description human-readable description for the buckets * @param jintervals JSON array (or NULL!) with bucket data + * @param intervals_description human-readable description for the intervals * @param scgh operation handle * @return #GNUNET_OK on success */ diff --git a/src/lib/taler_merchant_pay_service.c b/src/lib/taler_merchant_pay_service.c @@ -185,7 +185,7 @@ parse_tokens (const json_t *token_sigs, * * @param cls the `struct TALER_MERCHANT_Pay` * @param response_code HTTP response code, 0 on error - * @param response response body, NULL if not in JSON + * @param resp response body, NULL if not in JSON */ static void handle_finished (void *cls, diff --git a/src/testing/testing_api_cmd_delete_donau_instances.c b/src/testing/testing_api_cmd_delete_donau_instances.c @@ -161,12 +161,6 @@ delete_donau_cleanup (void *cls, /** * Create a DELETE /donau/$charity_id testing command. - * - * @param label label for the test command. - * @param url base URL of the Donau service. - * @param charity_id the ID of the charity to delete. - * @param expected_http_status expected HTTP response code. - * @return a TALER_TESTING_Command for DELETE /donau/$charity_id. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_delete_donau_instance (const char *label, diff --git a/src/testing/testing_api_cmd_get_donau_instances.c b/src/testing/testing_api_cmd_get_donau_instances.c @@ -155,12 +155,7 @@ get_donau_instances_cleanup (void *cls, /** - * Create a new command to GET Donau instances. - * - * @param label label for the command - * @param url the base URL of the Donau service - * @param expected_http_status expected HTTP status code - * @return a new testing command + * Creation of the "GET donau instances" CMD. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_get_donau_instances (const char *label, diff --git a/src/testing/testing_api_cmd_get_statisticsamount.c b/src/testing/testing_api_cmd_get_statisticsamount.c @@ -76,7 +76,7 @@ struct GetStatisticsAmountState * Callback for a GET /statistics-amount operation. * * @param cls closure for this function - * @param gpr response details + * @param scgr response details */ static void get_statisticsamount_cb (void *cls, diff --git a/src/testing/testing_api_cmd_get_statisticscounter.c b/src/testing/testing_api_cmd_get_statisticscounter.c @@ -76,7 +76,7 @@ struct GetStatisticsCounterState * Callback for a GET /statistics-counter operation. * * @param cls closure for this function - * @param gpr response details + * @param scgr response details */ static void get_statisticscounter_cb (void *cls, diff --git a/src/testing/testing_api_cmd_post_donau_instances.c b/src/testing/testing_api_cmd_post_donau_instances.c @@ -200,17 +200,13 @@ post_donau_cleanup (void *cls, /** * Create a new testing command for POST /donau. - * - * @param label label for the command. - * @param merchant_url base URL of the merchant. - * @param http_status expected HTTP response code. - * @return the created command. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_post_donau_instance (const char *label, - const char *merchant_url, + const char *url, const char *merchant_reference, - unsigned int http_status, + unsigned int + expected_http_status, ...) { struct PostDonauState *pds = GNUNET_new (struct PostDonauState); @@ -245,9 +241,9 @@ TALER_TESTING_cmd_merchant_post_donau_instance (const char *label, }; pds->merchant_reference = merchant_reference; - pds->merchant_url = merchant_url; + pds->merchant_url = url; pds->charity = charity; - pds->http_status = http_status; + pds->http_status = expected_http_status; pds->auth_token = NULL; { diff --git a/src/util/contract_parse.c b/src/util/contract_parse.c @@ -34,7 +34,7 @@ * * @param cls closure, unused parameter * @param root the JSON object representing data - * @param[out] spec where to write the data + * @param[out] ospec where to write the data * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ static enum GNUNET_GenericReturnValue @@ -531,7 +531,7 @@ contract_choice_free ( * @param cls closure, unused parameter * @param root the JSON object representing data * @param[out] ospec where to write the data - * @return #GNUNET_OK upon successful parsing; @GNUNET_SYSERR upon error + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ static enum GNUNET_GenericReturnValue parse_token_details (void *cls, @@ -679,7 +679,7 @@ parse_token_details (void *cls, * in the contract token family. All fields from @a family are copied. * * @param name name of the token details field in the JSON - * @param[out] token family where the token details have to be written + * @param[out] family token_family where the token details have to be written */ static struct GNUNET_JSON_Specification spec_token_details (const char *name,