diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/gauger.h | 150 | ||||
| -rw-r--r-- | src/include/platform.h | 4 | ||||
| -rw-r--r-- | src/include/taler_auditor_service.h | 59 | ||||
| -rw-r--r-- | src/include/taler_auditordb_plugin.h | 267 | ||||
| -rw-r--r-- | src/include/taler_bank_service.h | 18 | ||||
| -rw-r--r-- | src/include/taler_crypto_lib.h | 39 | ||||
| -rw-r--r-- | src/include/taler_curl_lib.h | 4 | ||||
| -rw-r--r-- | src/include/taler_error_codes.h | 12 | ||||
| -rw-r--r-- | src/include/taler_exchange_service.h | 235 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_lib.h | 49 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_plugin.h | 570 | ||||
| -rw-r--r-- | src/include/taler_json_lib.h | 8 | ||||
| -rw-r--r-- | src/include/taler_pq_lib.h | 3 | ||||
| -rw-r--r-- | src/include/taler_testing_auditor_lib.h | 30 | ||||
| -rw-r--r-- | src/include/taler_testing_bank_lib.h | 50 | ||||
| -rw-r--r-- | src/include/taler_testing_lib.h | 646 | ||||
| -rw-r--r-- | src/include/taler_util.h | 16 | ||||
| -rw-r--r-- | src/include/taler_util_wallet.h | 16 | ||||
| -rw-r--r-- | src/include/taler_wire_lib.h | 37 | ||||
| -rw-r--r-- | src/include/taler_wire_plugin.h | 9 |
20 files changed, 1245 insertions, 977 deletions
diff --git a/src/include/gauger.h b/src/include/gauger.h index 9fa34b9bb..7d66051b7 100644 --- a/src/include/gauger.h +++ b/src/include/gauger.h @@ -17,65 +17,65 @@ #include <stdio.h> #include <sys/wait.h> -#define GAUGER(category, counter, value, unit)\ -{\ - const char * __gauger_v[10]; \ - char __gauger_s[32];\ - pid_t __gauger_p;\ - if(!(__gauger_p=fork())){\ - if(!fork()){\ - sprintf(__gauger_s,"%Lf", (long double) (value));\ - __gauger_v[0] = "gauger";\ - __gauger_v[1] = "-n";\ - __gauger_v[2] = (char *) counter; \ - __gauger_v[3] = "-d";\ - __gauger_v[4] = __gauger_s;\ - __gauger_v[5] = "-u";\ - __gauger_v[6] = (char *) unit; \ - __gauger_v[7] = "-c";\ - __gauger_v[8] = (char *) category; \ - __gauger_v[9] = (char *) NULL;\ - execvp("gauger", (char*const*) __gauger_v); \ - perror("gauger");\ - _exit(1);\ - }else{\ - _exit(0);\ - }\ - }else{\ - waitpid(__gauger_p,NULL,0);\ - }\ -} +#define GAUGER(category, counter, value, unit) \ + { \ + const char *__gauger_v[10]; \ + char __gauger_s[32]; \ + pid_t __gauger_p; \ + if (! (__gauger_p = fork ())) { \ + if (! fork ()) { \ + sprintf (__gauger_s,"%Lf", (long double) (value)); \ + __gauger_v[0] = "gauger"; \ + __gauger_v[1] = "-n"; \ + __gauger_v[2] = (char *) counter; \ + __gauger_v[3] = "-d"; \ + __gauger_v[4] = __gauger_s; \ + __gauger_v[5] = "-u"; \ + __gauger_v[6] = (char *) unit; \ + __gauger_v[7] = "-c"; \ + __gauger_v[8] = (char *) category; \ + __gauger_v[9] = (char *) NULL; \ + execvp ("gauger", (char*const*) __gauger_v); \ + perror ("gauger"); \ + _exit (1); \ + }else{ \ + _exit (0); \ + } \ + }else{ \ + waitpid (__gauger_p,NULL,0); \ + } \ + } -#define GAUGER_ID(category, counter, value, unit, id)\ -{\ - char* __gauger_v[12];\ - char __gauger_s[32];\ - pid_t __gauger_p;\ - if(!(__gauger_p=fork())){\ - if(!fork()){\ - sprintf(__gauger_s,"%Lf", (long double) (value));\ - __gauger_v[0] = "gauger";\ - __gauger_v[1] = "-n";\ - __gauger_v[2] = (char *) counter; \ - __gauger_v[3] = "-d";\ - __gauger_v[4] = __gauger_s;\ - __gauger_v[5] = "-u";\ - __gauger_v[6] = (char *) unit; \ - __gauger_v[7] = "-i";\ - __gauger_v[8] = id;\ - __gauger_v[9] = "-c";\ - __gauger_v[10] = (char *) category; \ - __gauger_v[11] = (char *) NULL;\ - execvp("gauger",__gauger_v);\ - perror("gauger");\ - _exit(1);\ - }else{\ - _exit(0);\ - }\ - }else{\ - waitpid(__gauger_p,NULL,0);\ - }\ -} +#define GAUGER_ID(category, counter, value, unit, id) \ + { \ + char*__gauger_v[12]; \ + char __gauger_s[32]; \ + pid_t __gauger_p; \ + if (! (__gauger_p = fork ())) { \ + if (! fork ()) { \ + sprintf (__gauger_s,"%Lf", (long double) (value)); \ + __gauger_v[0] = "gauger"; \ + __gauger_v[1] = "-n"; \ + __gauger_v[2] = (char *) counter; \ + __gauger_v[3] = "-d"; \ + __gauger_v[4] = __gauger_s; \ + __gauger_v[5] = "-u"; \ + __gauger_v[6] = (char *) unit; \ + __gauger_v[7] = "-i"; \ + __gauger_v[8] = id; \ + __gauger_v[9] = "-c"; \ + __gauger_v[10] = (char *) category; \ + __gauger_v[11] = (char *) NULL; \ + execvp ("gauger",__gauger_v); \ + perror ("gauger"); \ + _exit (1); \ + }else{ \ + _exit (0); \ + } \ + }else{ \ + waitpid (__gauger_p,NULL,0); \ + } \ + } #else /* WINDOWS */ @@ -83,25 +83,27 @@ #include <stdio.h> #include <windef.h> -#define GAUGER(category, counter, value, unit)\ -{\ - char __gauger_commandline[MAX_PATH];\ +#define GAUGER(category, counter, value, unit) \ + { \ + char __gauger_commandline[MAX_PATH]; \ \ - snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"",\ - counter, (long double) (value), unit, category);\ - __gauger_commandline[MAX_PATH - 1] = '\0';\ - system (__gauger_commandline);\ -} + snprintf (__gauger_commandline, MAX_PATH, \ + "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"", \ + counter, (long double) (value), unit, category); \ + __gauger_commandline[MAX_PATH - 1] = '\0'; \ + system (__gauger_commandline); \ + } -#define GAUGER_ID(category, counter, value, unit, id)\ -{\ - char __gauger_commandline[MAX_PATH];\ +#define GAUGER_ID(category, counter, value, unit, id) \ + { \ + char __gauger_commandline[MAX_PATH]; \ \ - snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"",\ - counter, (long double) (value), unit, id, category);\ - __gauger_commandline[MAX_PATH - 1] = '\0';\ - system (__gauger_commandline);\ -} + snprintf (__gauger_commandline, MAX_PATH, \ + "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"", \ + counter, (long double) (value), unit, id, category); \ + __gauger_commandline[MAX_PATH - 1] = '\0'; \ + system (__gauger_commandline); \ + } #endif // WINDOWS diff --git a/src/include/platform.h b/src/include/platform.h index 607bd7361..847e024bf 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -18,7 +18,7 @@ * @file 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> + * @author Sree Harsha Totakura <sreeharsha@totakura.in> */ #ifndef PLATFORM_H_ @@ -36,7 +36,7 @@ #if (GNUNET_EXTRA_LOGGING >= 1) #define VERBOSE(cmd) cmd #else -#define VERBOSE(cmd) do { break; }while(0) +#define VERBOSE(cmd) do { break; } while (0) #endif /* Include the features available for GNU source */ diff --git a/src/include/taler_auditor_service.h b/src/include/taler_auditor_service.h index 5dbbf3d82..012db8ba1 100644 --- a/src/include/taler_auditor_service.h +++ b/src/include/taler_auditor_service.h @@ -83,8 +83,8 @@ enum TALER_AUDITOR_VersionCompatibility * this implementation. */ TALER_AUDITOR_VC_INCOMPATIBLE_OUTDATED - = TALER_AUDITOR_VC_INCOMPATIBLE - | TALER_AUDITOR_VC_OLDER, + = TALER_AUDITOR_VC_INCOMPATIBLE + | TALER_AUDITOR_VC_OLDER, /** * The auditor is more recent than this implementation (bit). @@ -95,8 +95,8 @@ enum TALER_AUDITOR_VersionCompatibility * The auditor is too recent for this implementation. */ TALER_AUDITOR_VC_INCOMPATIBLE_NEWER - = TALER_AUDITOR_VC_INCOMPATIBLE - | TALER_AUDITOR_VC_NEWER, + = TALER_AUDITOR_VC_INCOMPATIBLE + | TALER_AUDITOR_VC_NEWER, /** * We could not even parse the version data. @@ -115,8 +115,10 @@ enum TALER_AUDITOR_VersionCompatibility */ typedef void (*TALER_AUDITOR_VersionCallback) (void *cls, - const struct TALER_AUDITOR_VersionInformation *vi, - enum TALER_AUDITOR_VersionCompatibility compat); + const struct + TALER_AUDITOR_VersionInformation *vi, + enum TALER_AUDITOR_VersionCompatibility + compat); /** @@ -142,9 +144,9 @@ struct TALER_AUDITOR_Handle; */ struct TALER_AUDITOR_Handle * TALER_AUDITOR_connect (struct GNUNET_CURL_Context *ctx, - const char *url, - TALER_AUDITOR_VersionCallback version_cb, - void *version_cb_cls); + const char *url, + TALER_AUDITOR_VersionCallback version_cb, + void *version_cb_cls); /** @@ -214,21 +216,30 @@ typedef void struct TALER_AUDITOR_DepositConfirmationHandle * TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor, const struct GNUNET_HashCode *h_wire, - const struct GNUNET_HashCode *h_contract_terms, + const struct + GNUNET_HashCode *h_contract_terms, struct GNUNET_TIME_Absolute timestamp, struct GNUNET_TIME_Absolute refund_deadline, - const struct TALER_Amount *amount_without_fee, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_ExchangePublicKeyP *exchange_pub, - const struct TALER_ExchangeSignatureP *exchange_sig, - const struct TALER_MasterPublicKeyP *master_pub, + const struct + TALER_Amount *amount_without_fee, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + const struct + TALER_ExchangePublicKeyP *exchange_pub, + const struct + TALER_ExchangeSignatureP *exchange_sig, + const struct + TALER_MasterPublicKeyP *master_pub, struct GNUNET_TIME_Absolute ep_start, struct GNUNET_TIME_Absolute ep_expire, struct GNUNET_TIME_Absolute ep_legal_end, - const struct TALER_MasterSignatureP *master_sig, - TALER_AUDITOR_DepositConfirmationResultCallback cb, - void *cb_cls); + const struct + TALER_MasterSignatureP *master_sig, + TALER_AUDITOR_DepositConfirmationResultCallback + cb, + void *cb_cls); /** @@ -238,7 +249,9 @@ TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor, * @param deposit-confirmation the deposit-confirmation permission request handle */ void -TALER_AUDITOR_deposit_confirmation_cancel (struct TALER_AUDITOR_DepositConfirmationHandle *deposit_confirmation); +TALER_AUDITOR_deposit_confirmation_cancel (struct + TALER_AUDITOR_DepositConfirmationHandle + *deposit_confirmation); /** @@ -281,7 +294,8 @@ typedef void unsigned int http_status, enum TALER_ErrorCode ec, unsigned int num_exchanges, - const struct TALER_AUDITOR_ExchangeInfo *ei, + const struct + TALER_AUDITOR_ExchangeInfo *ei, const json_t *raw_response); /** @@ -308,7 +322,8 @@ TALER_AUDITOR_list_exchanges (struct TALER_AUDITOR_Handle *auditor, * @param deposit-confirmation the deposit-confirmation permission request handle */ void -TALER_AUDITOR_list_exchanges_cancel (struct TALER_AUDITOR_ListExchangesHandle *leh); +TALER_AUDITOR_list_exchanges_cancel (struct + TALER_AUDITOR_ListExchangesHandle *leh); #endif /* _TALER_AUDITOR_SERVICE_H */ diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h index 98fce62df..7a972c64a 100644 --- a/src/include/taler_auditordb_plugin.h +++ b/src/include/taler_auditordb_plugin.h @@ -39,7 +39,8 @@ */ typedef void (*TALER_AUDITORDB_ExchangeCallback)(void *cls, - const struct TALER_MasterPublicKeyP *master_pub, + const struct + TALER_MasterPublicKeyP *master_pub, const char *exchange_url); @@ -56,7 +57,9 @@ typedef void */ typedef int (*TALER_AUDITORDB_DenominationInfoDataCallback)(void *cls, - const struct TALER_DenominationKeyValidityPS *issue); + const struct + TALER_DenominationKeyValidityPS + *issue); /** @@ -76,10 +79,18 @@ typedef int */ typedef int (*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)(void *cls, - const struct GNUNET_HashCode *denom_pub_hash, - struct GNUNET_TIME_Absolute revenue_timestamp, - const struct TALER_Amount *revenue_balance, - const struct TALER_Amount *loss_balance); + const struct + GNUNET_HashCode * + denom_pub_hash, + struct + GNUNET_TIME_Absolute + revenue_timestamp, + const struct + TALER_Amount * + revenue_balance, + const struct + TALER_Amount * + loss_balance); /** @@ -97,9 +108,15 @@ typedef int */ typedef int (*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)(void *cls, - struct GNUNET_TIME_Absolute start_time, - struct GNUNET_TIME_Absolute end_time, - const struct TALER_Amount *reserve_profits); + struct + GNUNET_TIME_Absolute + start_time, + struct + GNUNET_TIME_Absolute + end_time, + const struct + TALER_Amount * + reserve_profits); /** @@ -358,7 +375,9 @@ struct TALER_AUDITORDB_DepositConfirmation typedef void (*TALER_AUDITORDB_DepositConfirmationCallback)(void *cls, uint64_t serial_id, - const struct TALER_AUDITORDB_DepositConfirmation *dc); + const struct + TALER_AUDITORDB_DepositConfirmation + *dc); /** @@ -441,8 +460,8 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*commit) (void *cls, - struct TALER_AUDITORDB_Session *session); + (*commit)(void *cls, + struct TALER_AUDITORDB_Session *session); /** @@ -478,10 +497,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_exchange) (void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const char *exchange_url); + (*insert_exchange)(void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const char *exchange_url); /** @@ -495,9 +514,9 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*delete_exchange) (void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub); + (*delete_exchange)(void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub); /** @@ -510,10 +529,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*list_exchanges) (void *cls, - struct TALER_AUDITORDB_Session *session, - TALER_AUDITORDB_ExchangeCallback cb, - void *cb_cls); + (*list_exchanges)(void *cls, + struct TALER_AUDITORDB_Session *session, + TALER_AUDITORDB_ExchangeCallback cb, + void *cb_cls); /** * Insert information about a signing key of the exchange. @@ -524,9 +543,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_exchange_signkey) (void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_AUDITORDB_ExchangeSigningKey *sk); + (*insert_exchange_signkey)(void *cls, + struct TALER_AUDITORDB_Session *session, + const struct + TALER_AUDITORDB_ExchangeSigningKey *sk); /** @@ -538,9 +558,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_deposit_confirmation) (void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_AUDITORDB_DepositConfirmation *dc); + (*insert_deposit_confirmation)(void *cls, + struct TALER_AUDITORDB_Session *session, + const struct + TALER_AUDITORDB_DepositConfirmation *dc); /** @@ -556,12 +577,13 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*get_deposit_confirmations) (void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_public_key, - uint64_t start_id, - TALER_AUDITORDB_DepositConfirmationCallback cb, - void *cb_cls); + (*get_deposit_confirmations)(void *cls, + struct TALER_AUDITORDB_Session *session, + const struct + TALER_MasterPublicKeyP *master_public_key, + uint64_t start_id, + TALER_AUDITORDB_DepositConfirmationCallback cb, + void *cb_cls); /** @@ -577,7 +599,8 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_denomination_info)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_DenominationKeyValidityPS *issue); + const struct + TALER_DenominationKeyValidityPS *issue); /** @@ -611,8 +634,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_auditor_progress_coin)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointCoin *ppc); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointCoin *ppc); /** @@ -628,8 +653,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*update_auditor_progress_coin)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointCoin *ppc); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointCoin *ppc); /** @@ -647,21 +674,23 @@ struct TALER_AUDITORDB_Plugin const struct TALER_MasterPublicKeyP *master_pub, struct TALER_AUDITORDB_ProgressPointCoin *ppc); - /** - * Insert information about the auditor's progress with an exchange's - * data. - * - * @param cls the @e cls of this struct with the plugin-specific state - * @param session connection to use - * @param master_pub master key of the exchange - * @param ppr where is the auditor in processing - * @return transaction status code - */ + /** + * Insert information about the auditor's progress with an exchange's + * data. + * + * @param cls the @e cls of this struct with the plugin-specific state + * @param session connection to use + * @param master_pub master key of the exchange + * @param ppr where is the auditor in processing + * @return transaction status code + */ enum GNUNET_DB_QueryStatus (*insert_auditor_progress_reserve)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointReserve *ppr); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointReserve *ppr); /** @@ -677,8 +706,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*update_auditor_progress_reserve)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointReserve *ppr); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointReserve *ppr); /** @@ -693,8 +724,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*get_auditor_progress_reserve)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - struct TALER_AUDITORDB_ProgressPointReserve *ppr); + const struct + TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_ProgressPointReserve * + ppr); /** * Insert information about the auditor's progress with an exchange's @@ -708,9 +741,14 @@ struct TALER_AUDITORDB_Plugin */ enum GNUNET_DB_QueryStatus (*insert_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); + struct TALER_AUDITORDB_Session + *session, + const struct + TALER_MasterPublicKeyP * + master_pub, + const struct + TALER_AUDITORDB_ProgressPointDepositConfirmation + *ppdc); /** @@ -725,9 +763,14 @@ struct TALER_AUDITORDB_Plugin */ enum GNUNET_DB_QueryStatus (*update_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); + struct TALER_AUDITORDB_Session + *session, + const struct + TALER_MasterPublicKeyP * + master_pub, + const struct + TALER_AUDITORDB_ProgressPointDepositConfirmation + *ppdc); /** @@ -741,9 +784,14 @@ struct TALER_AUDITORDB_Plugin */ enum GNUNET_DB_QueryStatus (*get_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); + struct TALER_AUDITORDB_Session * + session, + const struct + TALER_MasterPublicKeyP * + master_pub, + struct + TALER_AUDITORDB_ProgressPointDepositConfirmation + *ppdc); /** @@ -759,8 +807,11 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_auditor_progress_aggregation)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointAggregation *ppa); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointAggregation + *ppa); /** @@ -776,8 +827,11 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*update_auditor_progress_aggregation)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_ProgressPointAggregation *ppa); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_ProgressPointAggregation + *ppa); /** @@ -792,8 +846,11 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*get_auditor_progress_aggregation)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - struct TALER_AUDITORDB_ProgressPointAggregation *ppa); + const struct + TALER_MasterPublicKeyP *master_pub, + struct + TALER_AUDITORDB_ProgressPointAggregation * + ppa); /** @@ -812,10 +869,14 @@ struct TALER_AUDITORDB_Plugin */ enum GNUNET_DB_QueryStatus (*insert_wire_auditor_account_progress)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_Session * + session, + const struct + TALER_MasterPublicKeyP *master_pub, const char *account_name, - const struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + const struct + TALER_AUDITORDB_WireAccountProgressPoint + *pp, const void *in_wire_off, const void *out_wire_off, size_t wire_off_size); @@ -837,14 +898,18 @@ struct TALER_AUDITORDB_Plugin */ enum GNUNET_DB_QueryStatus (*update_wire_auditor_account_progress)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_Session * + session, + const struct + TALER_MasterPublicKeyP *master_pub, const char *account_name, - const struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + const struct + TALER_AUDITORDB_WireAccountProgressPoint + *pp, const void *in_wire_off, const void *out_wire_off, size_t wire_off_size); - + /** * Get information about the progress of the wire auditor. @@ -862,9 +927,12 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*get_wire_auditor_account_progress)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, + const struct + TALER_MasterPublicKeyP *master_pub, const char *account_name, - struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + struct + TALER_AUDITORDB_WireAccountProgressPoint + *pp, void **in_wire_off, void **out_wire_off, size_t *wire_off_size); @@ -884,8 +952,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_wire_auditor_progress)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_WireProgressPoint *pp); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_WireProgressPoint *pp); /** @@ -902,8 +972,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*update_wire_auditor_progress)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_AUDITORDB_WireProgressPoint *pp); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_AUDITORDB_WireProgressPoint *pp); /** @@ -1301,11 +1373,14 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_historic_denom_revenue)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, + const struct + TALER_MasterPublicKeyP *master_pub, const struct GNUNET_HashCode *denom_pub_hash, - struct GNUNET_TIME_Absolute revenue_timestamp, + struct GNUNET_TIME_Absolute + revenue_timestamp, const struct TALER_Amount *revenue_balance, - const struct TALER_Amount *payback_loss_balance); + const struct + TALER_Amount *payback_loss_balance); /** @@ -1322,8 +1397,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*select_historic_denom_revenue)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb, + const struct + TALER_MasterPublicKeyP *master_pub, + TALER_AUDITORDB_HistoricDenominationRevenueDataCallback + cb, void *cb_cls); @@ -1341,10 +1418,12 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*insert_historic_reserve_revenue)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, + const struct + TALER_MasterPublicKeyP *master_pub, struct GNUNET_TIME_Absolute start_time, struct GNUNET_TIME_Absolute end_time, - const struct TALER_Amount *reserve_profits); + const struct + TALER_Amount *reserve_profits); /** @@ -1360,8 +1439,10 @@ struct TALER_AUDITORDB_Plugin enum GNUNET_DB_QueryStatus (*select_historic_reserve_revenue)(void *cls, struct TALER_AUDITORDB_Session *session, - const struct TALER_MasterPublicKeyP *master_pub, - TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb, + const struct + TALER_MasterPublicKeyP *master_pub, + TALER_AUDITORDB_HistoricReserveRevenueDataCallback + cb, void *cb_cls); diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h index 2cebbe6e7..b2a02f74d 100644 --- a/src/include/taler_bank_service.h +++ b/src/include/taler_bank_service.h @@ -31,7 +31,8 @@ /** * Authentication method types. */ -enum TALER_BANK_AuthenticationMethod { +enum TALER_BANK_AuthenticationMethod +{ /** * No authentication. @@ -109,7 +110,8 @@ typedef void unsigned int http_status, enum TALER_ErrorCode ec, uint64_t serial_id, - struct GNUNET_TIME_Absolute timestamp, + struct GNUNET_TIME_Absolute + timestamp, const json_t *json); @@ -153,13 +155,15 @@ TALER_BANK_admin_add_incoming (struct GNUNET_CURL_Context *ctx, * @param aai the admin add incoming request handle */ void -TALER_BANK_admin_add_incoming_cancel (struct TALER_BANK_AdminAddIncomingHandle *aai); +TALER_BANK_admin_add_incoming_cancel (struct + TALER_BANK_AdminAddIncomingHandle *aai); /** * Which types of transactions should be (or is being) returned? */ -enum TALER_BANK_Direction { +enum TALER_BANK_Direction +{ /** * Base case, used to indicate errors or end of list. @@ -179,7 +183,8 @@ enum TALER_BANK_Direction { /** * Return both types of transactions. */ - TALER_BANK_DIRECTION_BOTH = (TALER_BANK_DIRECTION_CREDIT | TALER_BANK_DIRECTION_DEBIT), + TALER_BANK_DIRECTION_BOTH = (TALER_BANK_DIRECTION_CREDIT + | TALER_BANK_DIRECTION_DEBIT), /** * Bit mask that is applied to view transactions that have been @@ -247,7 +252,8 @@ typedef void enum TALER_ErrorCode ec, enum TALER_BANK_Direction dir, uint64_t serial_id, - const struct TALER_BANK_TransferDetails *details, + const struct + TALER_BANK_TransferDetails *details, const json_t *json); diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 7b9d932d5..5eb4fbf45 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -639,8 +639,10 @@ TALER_planchet_to_coin (const struct TALER_DenominationPublicKey *dk, * @param[out] ts computed transfer secret */ void -TALER_link_derive_transfer_secret (const struct TALER_CoinSpendPrivateKeyP *coin_priv, - const struct TALER_TransferPrivateKeyP *trans_priv, +TALER_link_derive_transfer_secret (const struct + TALER_CoinSpendPrivateKeyP *coin_priv, + const struct + TALER_TransferPrivateKeyP *trans_priv, struct TALER_TransferSecretP *ts); @@ -653,8 +655,10 @@ TALER_link_derive_transfer_secret (const struct TALER_CoinSpendPrivateKeyP *coin * @param[out] transfer_secret set to the shared secret */ void -TALER_link_reveal_transfer_secret (const struct TALER_TransferPrivateKeyP *trans_priv, - const struct TALER_CoinSpendPublicKeyP *coin_pub, +TALER_link_reveal_transfer_secret (const struct + TALER_TransferPrivateKeyP *trans_priv, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, struct TALER_TransferSecretP *transfer_secret); @@ -667,9 +671,12 @@ TALER_link_reveal_transfer_secret (const struct TALER_TransferPrivateKeyP *trans * @param[out] transfer_secret set to the shared secret */ void -TALER_link_recover_transfer_secret (const struct TALER_TransferPublicKeyP *trans_pub, - const struct TALER_CoinSpendPrivateKeyP *coin_priv, - struct TALER_TransferSecretP *transfer_secret); +TALER_link_recover_transfer_secret (const struct + TALER_TransferPublicKeyP *trans_pub, + const struct + TALER_CoinSpendPrivateKeyP *coin_priv, + struct TALER_TransferSecretP * + transfer_secret); /** @@ -758,8 +765,10 @@ TALER_exchange_wire_signature_hash (const char *payto_url, */ int TALER_exchange_wire_signature_check (const char *payto_url, - const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_MasterSignatureP *master_sig); + const struct + TALER_MasterPublicKeyP *master_pub, + const struct + TALER_MasterSignatureP *master_sig); /** @@ -771,7 +780,8 @@ TALER_exchange_wire_signature_check (const char *payto_url, */ void TALER_exchange_wire_signature_make (const char *payto_url, - const struct TALER_MasterPrivateKeyP *master_priv, + const struct + TALER_MasterPrivateKeyP *master_priv, struct TALER_MasterSignatureP *master_sig); @@ -801,8 +811,10 @@ TALER_merchant_wire_signature_hash (const char *payto_url, int TALER_merchant_wire_signature_check (const char *payto_url, const char *salt, - const struct TALER_MerchantPublicKeyP *merch_pub, - const struct TALER_MerchantSignatureP *merch_sig); + const struct + TALER_MerchantPublicKeyP *merch_pub, + const struct + TALER_MerchantSignatureP *merch_sig); /** @@ -816,7 +828,8 @@ TALER_merchant_wire_signature_check (const char *payto_url, void TALER_merchant_wire_signature_make (const char *payto_url, const char *salt, - const struct TALER_MerchantPrivateKeyP *merch_priv, + const struct + TALER_MerchantPrivateKeyP *merch_priv, struct TALER_MerchantSignatureP *merch_sig); diff --git a/src/include/taler_curl_lib.h b/src/include/taler_curl_lib.h index 2d69768cc..6629704fb 100644 --- a/src/include/taler_curl_lib.h +++ b/src/include/taler_curl_lib.h @@ -61,8 +61,8 @@ struct TEAH_PostContext */ int TALER_curl_easy_post (struct TEAH_PostContext *ctx, - CURL *eh, - const json_t *body); + CURL *eh, + const json_t *body); /** diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h index cd99a40fc..022b22713 100644 --- a/src/include/taler_error_codes.h +++ b/src/include/taler_error_codes.h @@ -111,11 +111,11 @@ enum TALER_ErrorCode */ TALER_EC_DB_COMMIT_FAILED_ON_RETRY = 1004, - /** - * The exchange had insufficient memory to parse the request. This - * response is provided with HTTP status code - * MHD_HTTP_INTERNAL_SERVER_ERROR. - */ + /** + * The exchange had insufficient memory to parse the request. This + * response is provided with HTTP status code + * MHD_HTTP_INTERNAL_SERVER_ERROR. + */ TALER_EC_PARSER_OUT_OF_MEMORY = 1005, /** @@ -1400,7 +1400,7 @@ enum TALER_ErrorCode * storing of coins or other related db operations, like starting/committing * the db transaction or marking a contract as paid. */ - TALER_EC_PAY_DB_STORE_PAYMENTS_ERROR = 2605, + TALER_EC_PAY_DB_STORE_PAYMENTS_ERROR = 2605, /** * The backend failed to sign the refund request. diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 864beae74..991e36f12 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -322,8 +322,8 @@ enum TALER_EXCHANGE_VersionCompatibility * this implementation. */ TALER_EXCHANGE_VC_INCOMPATIBLE_OUTDATED - = TALER_EXCHANGE_VC_INCOMPATIBLE - | TALER_EXCHANGE_VC_OLDER, + = TALER_EXCHANGE_VC_INCOMPATIBLE + | TALER_EXCHANGE_VC_OLDER, /** * The exchange is more recent than this implementation (bit). @@ -334,8 +334,8 @@ enum TALER_EXCHANGE_VersionCompatibility * The exchange is too recent for this implementation. */ TALER_EXCHANGE_VC_INCOMPATIBLE_NEWER - = TALER_EXCHANGE_VC_INCOMPATIBLE - | TALER_EXCHANGE_VC_NEWER, + = TALER_EXCHANGE_VC_INCOMPATIBLE + | TALER_EXCHANGE_VC_NEWER, /** * We could not even parse the version data. @@ -357,7 +357,9 @@ enum TALER_EXCHANGE_VersionCompatibility typedef void (*TALER_EXCHANGE_CertificationCallback) (void *cls, const struct TALER_EXCHANGE_Keys *keys, - enum TALER_EXCHANGE_VersionCompatibility compat); + enum + TALER_EXCHANGE_VersionCompatibility + compat); /** @@ -500,7 +502,8 @@ TALER_EXCHANGE_test_signing_key (const struct TALER_EXCHANGE_Keys *keys, */ const struct TALER_EXCHANGE_SigningPublicKey * TALER_EXCHANGE_get_signing_key_details (const struct TALER_EXCHANGE_Keys *keys, - const struct TALER_ExchangePublicKeyP *pub); + const struct + TALER_ExchangePublicKeyP *pub); /** @@ -523,7 +526,8 @@ TALER_EXCHANGE_get_base_url (const struct TALER_EXCHANGE_Handle *exchange); */ const struct TALER_EXCHANGE_DenomPublicKey * TALER_EXCHANGE_get_denomination_key (const struct TALER_EXCHANGE_Keys *keys, - const struct TALER_DenominationPublicKey *pk); + const struct + TALER_DenominationPublicKey *pk); /** @@ -534,7 +538,8 @@ TALER_EXCHANGE_get_denomination_key (const struct TALER_EXCHANGE_Keys *keys, * @return details about the given denomination key */ const struct TALER_EXCHANGE_DenomPublicKey * -TALER_EXCHANGE_get_denomination_key_by_hash (const struct TALER_EXCHANGE_Keys *keys, +TALER_EXCHANGE_get_denomination_key_by_hash (const struct + TALER_EXCHANGE_Keys *keys, const struct GNUNET_HashCode *hc); @@ -547,8 +552,11 @@ TALER_EXCHANGE_get_denomination_key_by_hash (const struct TALER_EXCHANGE_Keys *k * @return NULL on error (@a exchange_pub not known) */ const struct TALER_EXCHANGE_SigningPublicKey * -TALER_EXCHANGE_get_exchange_signing_key_info (const struct TALER_EXCHANGE_Keys *keys, - const struct TALER_ExchangePublicKeyP *exchange_pub); +TALER_EXCHANGE_get_exchange_signing_key_info (const struct + TALER_EXCHANGE_Keys *keys, + const struct + TALER_ExchangePublicKeyP * + exchange_pub); /* ********************* /wire *********************** */ @@ -633,9 +641,10 @@ struct TALER_EXCHANGE_WireAccount typedef void (*TALER_EXCHANGE_WireResultCallback) (void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, + enum TALER_ErrorCode ec, unsigned int accounts_len, - const struct TALER_EXCHANGE_WireAccount *accounts); + const struct + TALER_EXCHANGE_WireAccount *accounts); /** @@ -703,9 +712,11 @@ struct TALER_EXCHANGE_DepositHandle; typedef void (*TALER_EXCHANGE_DepositResultCallback) (void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_ExchangeSignatureP *exchange_sig, - const struct TALER_ExchangePublicKeyP *sign_key, + enum TALER_ErrorCode ec, + const struct + TALER_ExchangeSignatureP *exchange_sig, + const struct + TALER_ExchangePublicKeyP *sign_key, const json_t *obj); @@ -791,10 +802,11 @@ struct TALER_EXCHANGE_RefundHandle; */ typedef void (*TALER_EXCHANGE_RefundResultCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_ExchangePublicKeyP *sign_key, - const json_t *obj); + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct + TALER_ExchangePublicKeyP *sign_key, + const json_t *obj); /** @@ -829,14 +841,14 @@ typedef void */ struct TALER_EXCHANGE_RefundHandle * TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_Amount *amount, - const struct TALER_Amount *refund_fee, - const struct GNUNET_HashCode *h_contract_terms, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - uint64_t rtransaction_id, - const struct TALER_MerchantPrivateKeyP *merchant_priv, - TALER_EXCHANGE_RefundResultCallback cb, - void *cb_cls); + const struct TALER_Amount *amount, + const struct TALER_Amount *refund_fee, + const struct GNUNET_HashCode *h_contract_terms, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + uint64_t rtransaction_id, + const struct TALER_MerchantPrivateKeyP *merchant_priv, + TALER_EXCHANGE_RefundResultCallback cb, + void *cb_cls); /** @@ -872,15 +884,15 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, */ struct TALER_EXCHANGE_RefundHandle * TALER_EXCHANGE_refund2 (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_Amount *amount, - const struct TALER_Amount *refund_fee, - const struct GNUNET_HashCode *h_contract_terms, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - uint64_t rtransaction_id, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantSignatureP *merchant_sig, - TALER_EXCHANGE_RefundResultCallback cb, - void *cb_cls); + const struct TALER_Amount *amount, + const struct TALER_Amount *refund_fee, + const struct GNUNET_HashCode *h_contract_terms, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + uint64_t rtransaction_id, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_MerchantSignatureP *merchant_sig, + TALER_EXCHANGE_RefundResultCallback cb, + void *cb_cls); /** @@ -907,7 +919,8 @@ struct TALER_EXCHANGE_ReserveStatusHandle; /** * Ways how a reserve's balance may change. */ -enum TALER_EXCHANGE_ReserveTransactionType { +enum TALER_EXCHANGE_ReserveTransactionType +{ /** * Deposit into the reserve. @@ -951,13 +964,15 @@ struct TALER_EXCHANGE_ReserveHistory /** * Details depending on @e type. */ - union { + union + { /** * Information about a deposit that filled this reserve. * @e type is #TALER_EXCHANGE_RTT_DEPOSIT. */ - struct { + struct + { /** * Sender account payto://-URL of the incoming transfer. */ @@ -990,7 +1005,8 @@ struct TALER_EXCHANGE_ReserveHistory * Information provided if the reserve was filled via /payback. * @e type is #TALER_EXCHANGE_RTT_PAYBACK. */ - struct { + struct + { /** * Public key of the coin that was paid back. @@ -1019,7 +1035,8 @@ struct TALER_EXCHANGE_ReserveHistory * Information about a close operation of the reserve. * @e type is #TALER_EXCHANGE_RTT_CLOSE. */ - struct { + struct + { /** * Receiver account information for the outgoing wire transfer. */ @@ -1069,11 +1086,14 @@ struct TALER_EXCHANGE_ReserveHistory typedef void (*TALER_EXCHANGE_ReserveStatusResultCallback) (void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, + enum TALER_ErrorCode ec, const json_t *json, - const struct TALER_Amount *balance, + const struct + TALER_Amount *balance, unsigned int history_length, - const struct TALER_EXCHANGE_ReserveHistory *history); + const struct + TALER_EXCHANGE_ReserveHistory * + history); /** @@ -1094,7 +1114,8 @@ typedef void */ struct TALER_EXCHANGE_ReserveStatusHandle * TALER_EXCHANGE_reserve_status (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_ReservePublicKeyP *reserve_pub, TALER_EXCHANGE_ReserveStatusResultCallback cb, void *cb_cls); @@ -1106,7 +1127,8 @@ TALER_EXCHANGE_reserve_status (struct TALER_EXCHANGE_Handle *exchange, * @param rsh the reserve status request handle */ void -TALER_EXCHANGE_reserve_status_cancel (struct TALER_EXCHANGE_ReserveStatusHandle *rsh); +TALER_EXCHANGE_reserve_status_cancel (struct + TALER_EXCHANGE_ReserveStatusHandle *rsh); /* ********************* /reserve/withdraw *********************** */ @@ -1133,7 +1155,9 @@ typedef void (*TALER_EXCHANGE_ReserveWithdrawResultCallback) (void *cls, unsigned int http_status, enum TALER_ErrorCode ec, - const struct TALER_DenominationSignature *sig, + const struct + TALER_DenominationSignature * + sig, const json_t *full_response); @@ -1161,9 +1185,11 @@ typedef void struct TALER_EXCHANGE_ReserveWithdrawHandle * TALER_EXCHANGE_reserve_withdraw (struct TALER_EXCHANGE_Handle *exchange, const struct TALER_EXCHANGE_DenomPublicKey *pk, - const struct TALER_ReservePrivateKeyP *reserve_priv, + const struct + TALER_ReservePrivateKeyP *reserve_priv, const struct TALER_PlanchetSecretsP *ps, - TALER_EXCHANGE_ReserveWithdrawResultCallback res_cb, + TALER_EXCHANGE_ReserveWithdrawResultCallback + res_cb, void *res_cb_cls); @@ -1191,11 +1217,15 @@ TALER_EXCHANGE_reserve_withdraw (struct TALER_EXCHANGE_Handle *exchange, */ struct TALER_EXCHANGE_ReserveWithdrawHandle * TALER_EXCHANGE_reserve_withdraw2 (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_EXCHANGE_DenomPublicKey *pk, - const struct TALER_ReserveSignatureP *reserve_sig, - const struct TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_EXCHANGE_DenomPublicKey *pk, + const struct + TALER_ReserveSignatureP *reserve_sig, + const struct + TALER_ReservePublicKeyP *reserve_pub, const struct TALER_PlanchetSecretsP *ps, - TALER_EXCHANGE_ReserveWithdrawResultCallback res_cb, + TALER_EXCHANGE_ReserveWithdrawResultCallback + res_cb, void *res_cb_cls); @@ -1206,7 +1236,9 @@ TALER_EXCHANGE_reserve_withdraw2 (struct TALER_EXCHANGE_Handle *exchange, * @param sign the withdraw sign request handle */ void -TALER_EXCHANGE_reserve_withdraw_cancel (struct TALER_EXCHANGE_ReserveWithdrawHandle *sign); +TALER_EXCHANGE_reserve_withdraw_cancel (struct + TALER_EXCHANGE_ReserveWithdrawHandle * + sign); /* ********************* /refresh/melt+reveal ***************************** */ @@ -1254,13 +1286,17 @@ TALER_EXCHANGE_reserve_withdraw_cancel (struct TALER_EXCHANGE_ReserveWithdrawHan * Non-null results should be freed using GNUNET_free(). */ char * -TALER_EXCHANGE_refresh_prepare (const struct TALER_CoinSpendPrivateKeyP *melt_priv, +TALER_EXCHANGE_refresh_prepare (const struct + TALER_CoinSpendPrivateKeyP *melt_priv, const struct TALER_Amount *melt_amount, - const struct TALER_DenominationSignature *melt_sig, - const struct TALER_EXCHANGE_DenomPublicKey *melt_pk, + const struct + TALER_DenominationSignature *melt_sig, + const struct + TALER_EXCHANGE_DenomPublicKey *melt_pk, int check_sig, unsigned int fresh_pks_len, - const struct TALER_EXCHANGE_DenomPublicKey *fresh_pks, + const struct + TALER_EXCHANGE_DenomPublicKey *fresh_pks, size_t *res_size); @@ -1291,7 +1327,8 @@ typedef void unsigned int http_status, enum TALER_ErrorCode ec, uint32_t noreveal_index, - const struct TALER_ExchangePublicKeyP *sign_key, + const struct + TALER_ExchangePublicKeyP *sign_key, const json_t *full_response); @@ -1330,7 +1367,8 @@ TALER_EXCHANGE_refresh_melt (struct TALER_EXCHANGE_Handle *exchange, * @param rmh the refresh handle */ void -TALER_EXCHANGE_refresh_melt_cancel (struct TALER_EXCHANGE_RefreshMeltHandle *rmh); +TALER_EXCHANGE_refresh_melt_cancel (struct + TALER_EXCHANGE_RefreshMeltHandle *rmh); /* ********************* /refresh/reveal ***************************** */ @@ -1358,8 +1396,10 @@ typedef void unsigned int http_status, enum TALER_ErrorCode ec, unsigned int num_coins, - const struct TALER_PlanchetSecretsP *coin_privs, - const struct TALER_DenominationSignature *sigs, + const struct + TALER_PlanchetSecretsP *coin_privs, + const struct + TALER_DenominationSignature *sigs, const json_t *full_response); @@ -1407,7 +1447,8 @@ TALER_EXCHANGE_refresh_reveal (struct TALER_EXCHANGE_Handle *exchange, * @param rrh the refresh reval handle */ void -TALER_EXCHANGE_refresh_reveal_cancel (struct TALER_EXCHANGE_RefreshRevealHandle *rrh); +TALER_EXCHANGE_refresh_reveal_cancel (struct + TALER_EXCHANGE_RefreshRevealHandle *rrh); /* ********************* /refresh/link ***************************** */ @@ -1438,11 +1479,14 @@ struct TALER_EXCHANGE_RefreshLinkHandle; typedef void (*TALER_EXCHANGE_RefreshLinkCallback) (void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, + enum TALER_ErrorCode ec, unsigned int num_coins, - const struct TALER_CoinSpendPrivateKeyP *coin_privs, - const struct TALER_DenominationSignature *sigs, - const struct TALER_DenominationPublicKey *pubs, + const struct + TALER_CoinSpendPrivateKeyP *coin_privs, + const struct + TALER_DenominationSignature *sigs, + const struct + TALER_DenominationPublicKey *pubs, const json_t *full_response); @@ -1475,7 +1519,8 @@ TALER_EXCHANGE_refresh_link (struct TALER_EXCHANGE_Handle *exchange, * @param rlh the refresh link handle */ void -TALER_EXCHANGE_refresh_link_cancel (struct TALER_EXCHANGE_RefreshLinkHandle *rlh); +TALER_EXCHANGE_refresh_link_cancel (struct + TALER_EXCHANGE_RefreshLinkHandle *rlh); /* ********************* /track/transfer *********************** */ @@ -1507,15 +1552,18 @@ struct TALER_EXCHANGE_TrackTransferHandle; typedef void (*TALER_EXCHANGE_TrackTransferCallback)(void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_ExchangePublicKeyP *sign_key, + enum TALER_ErrorCode ec, + const struct + TALER_ExchangePublicKeyP *sign_key, const json_t *json, const struct GNUNET_HashCode *h_wire, - struct GNUNET_TIME_Absolute execution_time, + struct GNUNET_TIME_Absolute + execution_time, const struct TALER_Amount *total_amount, const struct TALER_Amount *wire_fee, unsigned int details_length, - const struct TALER_TrackTransferDetails *details); + const struct + TALER_TrackTransferDetails *details); /** @@ -1530,7 +1578,8 @@ typedef void */ struct TALER_EXCHANGE_TrackTransferHandle * TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_WireTransferIdentifierRawP *wtid, + const struct + TALER_WireTransferIdentifierRawP *wtid, TALER_EXCHANGE_TrackTransferCallback cb, void *cb_cls); @@ -1542,7 +1591,8 @@ TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange, * @param wdh the wire deposits request handle */ void -TALER_EXCHANGE_track_transfer_cancel (struct TALER_EXCHANGE_TrackTransferHandle *wdh); +TALER_EXCHANGE_track_transfer_cancel (struct + TALER_EXCHANGE_TrackTransferHandle *wdh); /* ********************* /track/transaction *********************** */ @@ -1571,12 +1621,17 @@ struct TALER_EXCHANGE_TrackTransactionHandle; typedef void (*TALER_EXCHANGE_TrackTransactionCallback)(void *cls, unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_ExchangePublicKeyP *sign_key, + enum TALER_ErrorCode ec, + const struct + TALER_ExchangePublicKeyP *sign_key, const json_t *json, - const struct TALER_WireTransferIdentifierRawP *wtid, - struct GNUNET_TIME_Absolute execution_time, - const struct TALER_Amount *coin_contribution); + const struct + TALER_WireTransferIdentifierRawP * + wtid, + struct GNUNET_TIME_Absolute + execution_time, + const struct + TALER_Amount *coin_contribution); /** @@ -1593,10 +1648,13 @@ typedef void */ struct TALER_EXCHANGE_TrackTransactionHandle * TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_MerchantPrivateKeyP *merchant_priv, + const struct + TALER_MerchantPrivateKeyP *merchant_priv, const struct GNUNET_HashCode *h_wire, - const struct GNUNET_HashCode *h_contract_terms, - const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct + GNUNET_HashCode *h_contract_terms, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, TALER_EXCHANGE_TrackTransactionCallback cb, void *cb_cls); @@ -1608,7 +1666,9 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, * @param dwh the wire deposits request handle */ void -TALER_EXCHANGE_track_transaction_cancel (struct TALER_EXCHANGE_TrackTransactionHandle *dwh); +TALER_EXCHANGE_track_transaction_cancel (struct + TALER_EXCHANGE_TrackTransactionHandle * + dwh); @@ -1624,7 +1684,8 @@ TALER_EXCHANGE_track_transaction_cancel (struct TALER_EXCHANGE_TrackTransactionH */ int TALER_EXCHANGE_verify_coin_history (const char *currency, - const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, json_t *history, struct TALER_Amount *total); @@ -1663,8 +1724,10 @@ typedef void enum TALER_ErrorCode ec, const struct TALER_Amount *amount, struct GNUNET_TIME_Absolute timestamp, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_CoinSpendPublicKeyP *old_coin_pub, + const struct + TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_CoinSpendPublicKeyP *old_coin_pub, const json_t *full_response); diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h index da744506c..e63640628 100644 --- a/src/include/taler_exchangedb_lib.h +++ b/src/include/taler_exchangedb_lib.h @@ -128,7 +128,9 @@ struct TALER_EXCHANGEDB_DenominationKeyIssueInformation typedef int (*TALER_EXCHANGEDB_SigningKeyIterator)(void *cls, const char *filename, - const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); + const struct + TALER_EXCHANGEDB_PrivateSigningKeyInformationP + *ski); /** @@ -160,7 +162,9 @@ TALER_EXCHANGEDB_signing_keys_iterate (const char *exchange_base_dir, int TALER_EXCHANGEDB_signing_key_write (const char *exchange_base_dir, struct GNUNET_TIME_Absolute start, - const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); + const struct + TALER_EXCHANGEDB_PrivateSigningKeyInformationP + *ski); /** @@ -176,7 +180,9 @@ TALER_EXCHANGEDB_signing_key_write (const char *exchange_base_dir, typedef int (*TALER_EXCHANGEDB_DenominationKeyIterator)(void *cls, const char *alias, - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki); + const struct + TALER_EXCHANGEDB_DenominationKeyIssueInformation + *dki); /** @@ -192,7 +198,9 @@ typedef int typedef int (*TALER_EXCHANGEDB_RevocationIterator)(void *cls, const struct GNUNET_HashCode *denom_hash, - const struct TALER_MasterSignatureP *revocation_master_sig); + const struct + TALER_MasterSignatureP * + revocation_master_sig); /** @@ -210,7 +218,8 @@ typedef int */ int TALER_EXCHANGEDB_denomination_keys_iterate (const char *exchange_base_dir, - TALER_EXCHANGEDB_DenominationKeyIterator it, + TALER_EXCHANGEDB_DenominationKeyIterator + it, void *it_cls); @@ -228,9 +237,10 @@ TALER_EXCHANGEDB_denomination_keys_iterate (const char *exchange_base_dir, */ int TALER_EXCHANGEDB_revocations_iterate (const char *revocation_dir, - const struct TALER_MasterPublicKeyP *master_pub, - TALER_EXCHANGEDB_RevocationIterator it, - void *it_cls); + const struct + TALER_MasterPublicKeyP *master_pub, + TALER_EXCHANGEDB_RevocationIterator it, + void *it_cls); /** @@ -244,8 +254,10 @@ TALER_EXCHANGEDB_revocations_iterate (const char *revocation_dir, */ int TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, - const struct GNUNET_HashCode *denom_hash, - const struct TALER_MasterPrivateKeyP *mpriv); + const struct + GNUNET_HashCode *denom_hash, + const struct + TALER_MasterPrivateKeyP *mpriv); /** @@ -257,7 +269,9 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, */ int TALER_EXCHANGEDB_denomination_key_write (const char *filename, - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki); + const struct + TALER_EXCHANGEDB_DenominationKeyIssueInformation + *dki); /** @@ -269,7 +283,9 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename, */ int TALER_EXCHANGEDB_denomination_key_read (const char *filename, - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki); + struct + TALER_EXCHANGEDB_DenominationKeyIssueInformation + *dki); /** @@ -293,7 +309,8 @@ typedef int const struct TALER_MasterPublicKeyP *mpub, unsigned int dki_len, const struct TALER_AuditorSignatureP *asigs, - const struct TALER_DenominationKeyValidityPS *dki); + const struct + TALER_DenominationKeyValidityPS *dki); /** @@ -333,7 +350,8 @@ TALER_EXCHANGEDB_auditor_write (const char *filename, const struct TALER_AuditorSignatureP *asigs, const struct TALER_MasterPublicKeyP *mpub, unsigned int dki_len, - const struct TALER_DenominationKeyValidityPS *dki); + const struct + TALER_DenominationKeyValidityPS *dki); /** @@ -492,7 +510,8 @@ struct TALER_EXCHANGEDB_AccountInfo */ typedef void (*TALER_EXCHANGEDB_AccountCallback)(void *cls, - const struct TALER_EXCHANGEDB_AccountInfo *ai); + const struct + TALER_EXCHANGEDB_AccountInfo *ai); /** * Parse the configuration to find account information. diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 61ec53054..88cb2a402 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -602,7 +602,8 @@ struct TALER_EXCHANGEDB_LinkDataList * @brief Enumeration to classify the different types of transactions * that can be done with a coin. */ -enum TALER_EXCHANGEDB_TransactionType { +enum TALER_EXCHANGEDB_TransactionType +{ /** * /deposit operation. @@ -729,11 +730,14 @@ struct TALER_EXCHANGEDB_Session; typedef enum GNUNET_DB_QueryStatus (*TALER_EXCHANGEDB_DepositIterator)(void *cls, uint64_t rowid, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, - const struct GNUNET_HashCode *h_contract_terms, + const struct + GNUNET_HashCode *h_contract_terms, struct GNUNET_TIME_Absolute wire_deadline, const json_t *receiver_wire_account); @@ -781,12 +785,17 @@ typedef int (*TALER_EXCHANGEDB_DepositCallback)(void *cls, uint64_t rowid, struct GNUNET_TIME_Absolute timestamp, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_CoinSpendSignatureP *coin_sig, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + const struct + TALER_DenominationPublicKey *denom_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_CoinSpendSignatureP *coin_sig, const struct TALER_Amount *amount_with_fee, - const struct GNUNET_HashCode *h_contract_terms, + const struct + GNUNET_HashCode *h_contract_terms, struct GNUNET_TIME_Absolute refund_deadline, struct GNUNET_TIME_Absolute wire_deadline, const json_t *receiver_wire_account, @@ -810,12 +819,18 @@ typedef int typedef int (*TALER_EXCHANGEDB_RefreshSessionCallback)(void *cls, uint64_t rowid, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_Amount *amount_with_fee, + const struct + TALER_DenominationPublicKey * + denom_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_CoinSpendSignatureP *coin_sig, + const struct + TALER_Amount *amount_with_fee, uint32_t noreveal_index, - const struct TALER_RefreshCommitmentP *rc); + const struct + TALER_RefreshCommitmentP *rc); /** @@ -833,12 +848,15 @@ typedef int */ typedef int (*TALER_EXCHANGEDB_RefundCoinCallback)(void *cls, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantSignatureP *merchant_sig, - const struct GNUNET_HashCode *h_contract, - uint64_t rtransaction_id, - const struct TALER_Amount *amount_with_fee, - const struct TALER_Amount *refund_fee); + const struct + TALER_MerchantPublicKeyP *merchant_pub, + const struct + TALER_MerchantSignatureP *merchant_sig, + const struct GNUNET_HashCode *h_contract, + uint64_t rtransaction_id, + const struct + TALER_Amount *amount_with_fee, + const struct TALER_Amount *refund_fee); /** @@ -889,9 +907,11 @@ struct TALER_EXCHANGEDB_RefreshRevealedCoin typedef void (*TALER_EXCHANGEDB_RefreshCallback)(void *cls, uint32_t num_newcoins, - const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, + const struct + TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, unsigned int num_tprivs, - const struct TALER_TransferPrivateKeyP *tprivs, + const struct + TALER_TransferPrivateKeyP *tprivs, const struct TALER_TransferPublicKeyP *tp); @@ -913,11 +933,16 @@ typedef void typedef int (*TALER_EXCHANGEDB_RefundCallback)(void *cls, uint64_t rowid, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantSignatureP *merchant_sig, - const struct GNUNET_HashCode *h_contract_terms, + const struct + TALER_DenominationPublicKey *denom_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + const struct + TALER_MerchantSignatureP *merchant_sig, + const struct + GNUNET_HashCode *h_contract_terms, uint64_t rtransaction_id, const struct TALER_Amount *amount_with_fee); @@ -938,12 +963,14 @@ typedef int typedef int (*TALER_EXCHANGEDB_ReserveInCallback)(void *cls, uint64_t rowid, - const struct TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_ReservePublicKeyP *reserve_pub, const struct TALER_Amount *credit, const char *sender_account_details, const void *wire_reference, size_t wire_reference_size, - struct GNUNET_TIME_Absolute execution_date); + struct GNUNET_TIME_Absolute + execution_date); /** @@ -964,12 +991,17 @@ typedef int (*TALER_EXCHANGEDB_WithdrawCallback)(void *cls, uint64_t rowid, const struct GNUNET_HashCode *h_blind_ev, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_DenominationSignature *denom_sig, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_ReserveSignatureP *reserve_sig, + const struct + TALER_DenominationPublicKey *denom_pub, + const struct + TALER_DenominationSignature *denom_sig, + const struct + TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_ReserveSignatureP *reserve_sig, struct GNUNET_TIME_Absolute execution_date, - const struct TALER_Amount *amount_with_fee); + const struct + TALER_Amount *amount_with_fee); /** @@ -982,8 +1014,10 @@ typedef int */ typedef void (*TALER_EXCHANGEDB_LinkDataCallback)(void *cls, - const struct TALER_TransferPublicKeyP *transfer_pub, - const struct TALER_EXCHANGEDB_LinkDataList *ldl); + const struct + TALER_TransferPublicKeyP *transfer_pub, + const struct + TALER_EXCHANGEDB_LinkDataList *ldl); /** @@ -1002,10 +1036,15 @@ typedef void */ typedef void (*TALER_EXCHANGEDB_TrackTransactionCallback)(void *cls, - const struct TALER_WireTransferIdentifierRawP *wtid, - const struct TALER_Amount *coin_contribution, - const struct TALER_Amount *coin_fee, - struct GNUNET_TIME_Absolute execution_time); + const struct + TALER_WireTransferIdentifierRawP * + wtid, + const struct + TALER_Amount *coin_contribution, + const struct + TALER_Amount *coin_fee, + struct GNUNET_TIME_Absolute + execution_time); /** @@ -1027,15 +1066,25 @@ typedef void typedef void (*TALER_EXCHANGEDB_WireTransferDataCallback)(void *cls, uint64_t rowid, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct GNUNET_HashCode *h_wire, + const struct + TALER_MerchantPublicKeyP * + merchant_pub, + const struct + GNUNET_HashCode *h_wire, const json_t *account_details, - struct GNUNET_TIME_Absolute exec_time, - const struct GNUNET_HashCode *h_contract_terms, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *coin_value, - const struct TALER_Amount *coin_fee); + struct GNUNET_TIME_Absolute + exec_time, + const struct + GNUNET_HashCode *h_contract_terms, + const struct + TALER_DenominationPublicKey * + denom_pub, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_Amount *coin_value, + const struct + TALER_Amount *coin_fee); /** @@ -1054,7 +1103,9 @@ typedef int (*TALER_EXCHANGEDB_WireTransferOutCallback)(void *cls, uint64_t rowid, struct GNUNET_TIME_Absolute date, - const struct TALER_WireTransferIdentifierRawP *wtid, + const struct + TALER_WireTransferIdentifierRawP * + wtid, const json_t *wire, const struct TALER_Amount *amount); @@ -1097,11 +1148,15 @@ typedef int uint64_t rowid, struct GNUNET_TIME_Absolute timestamp, const struct TALER_Amount *amount, - const struct TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_ReservePublicKeyP *reserve_pub, const struct TALER_CoinPublicInfo *coin, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_DenominationBlindingKeyP *coin_blind); + const struct + TALER_DenominationPublicKey *denom_pub, + const struct + TALER_CoinSpendSignatureP *coin_sig, + const struct + TALER_DenominationBlindingKeyP *coin_blind); /** @@ -1121,13 +1176,22 @@ typedef int typedef int (*TALER_EXCHANGEDB_PaybackRefreshCallback)(void *cls, uint64_t rowid, - struct GNUNET_TIME_Absolute timestamp, + struct GNUNET_TIME_Absolute + timestamp, const struct TALER_Amount *amount, - const struct TALER_CoinSpendPublicKeyP *old_coin_pub, - const struct TALER_CoinPublicInfo *coin, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_DenominationBlindingKeyP *coin_blind); + const struct + TALER_CoinSpendPublicKeyP * + old_coin_pub, + const struct + TALER_CoinPublicInfo *coin, + const struct + TALER_DenominationPublicKey * + denom_pub, + const struct + TALER_CoinSpendSignatureP *coin_sig, + const struct + TALER_DenominationBlindingKeyP * + coin_blind); /** @@ -1146,13 +1210,18 @@ typedef int */ typedef int (*TALER_EXCHANGEDB_ReserveClosedCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute execution_date, - const struct TALER_Amount *amount_with_fee, - const struct TALER_Amount *closing_fee, - const struct TALER_ReservePublicKeyP *reserve_pub, - const char *receiver_account, - const struct TALER_WireTransferIdentifierRawP *wtid); + uint64_t rowid, + struct GNUNET_TIME_Absolute + execution_date, + const struct + TALER_Amount *amount_with_fee, + const struct + TALER_Amount *closing_fee, + const struct + TALER_ReservePublicKeyP *reserve_pub, + const char *receiver_account, + const struct + TALER_WireTransferIdentifierRawP *wtid); /** @@ -1167,10 +1236,12 @@ typedef int */ typedef enum GNUNET_DB_QueryStatus (*TALER_EXCHANGEDB_ReserveExpiredCallback)(void *cls, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *left, - const char *account_details, - struct GNUNET_TIME_Absolute expiration_date); + const struct + TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_Amount *left, + const char *account_details, + struct GNUNET_TIME_Absolute + expiration_date); /** @@ -1188,11 +1259,18 @@ typedef enum GNUNET_DB_QueryStatus typedef void (*TALER_EXCHANGEDB_PaybackJustificationCallback)(void *cls, uint64_t rowid, - const struct TALER_CoinPublicInfo *coin, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_DenominationBlindingKeyP *coin_blind, - const struct GNUNET_HashCode *h_blinded_ev, - const struct TALER_Amount *amount); + const struct + TALER_CoinPublicInfo *coin, + const struct + TALER_CoinSpendSignatureP * + coin_sig, + const struct + TALER_DenominationBlindingKeyP + *coin_blind, + const struct + GNUNET_HashCode *h_blinded_ev, + const struct + TALER_Amount *amount); /** @@ -1210,13 +1288,14 @@ typedef void */ typedef void (*TALER_EXCHANGEDB_WireMissingCallback)(void *cls, - uint64_t rowid, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *amount, - const json_t *wire, - struct GNUNET_TIME_Absolute deadline, - /* bool? */ int tiny, - /* bool? */ int done); + uint64_t rowid, + const struct + TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_Amount *amount, + const json_t *wire, + struct GNUNET_TIME_Absolute deadline, + /* bool? */ int tiny, + /* bool? */ int done); /** @@ -1228,8 +1307,12 @@ typedef void */ typedef void (*TALER_EXCHANGEDB_DenominationInfoIterator)(void *cls, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); + const struct + TALER_DenominationPublicKey * + denom_pub, + const struct + TALER_EXCHANGEDB_DenominationKeyInformationP + *issue); /** @@ -1304,8 +1387,8 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*commit) (void *cls, - struct TALER_EXCHANGEDB_Session *session); + (*commit)(void *cls, + struct TALER_EXCHANGEDB_Session *session); /** @@ -1344,10 +1427,13 @@ struct TALER_EXCHANGEDB_Plugin * @return status of the query */ enum GNUNET_DB_QueryStatus - (*insert_denomination_info) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); + (*insert_denomination_info)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct + TALER_DenominationPublicKey *denom_pub, + const struct + TALER_EXCHANGEDB_DenominationKeyInformationP * + issue); /** @@ -1360,10 +1446,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_denomination_info) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *denom_pub_hash, - struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); + (*get_denomination_info)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *denom_pub_hash, + struct TALER_EXCHANGEDB_DenominationKeyInformationP * + issue); /** @@ -1376,9 +1463,9 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*iterate_denomination_info) (void *cls, - TALER_EXCHANGEDB_DenominationInfoIterator cb, - void *cb_cls); + (*iterate_denomination_info)(void *cls, + TALER_EXCHANGEDB_DenominationInfoIterator cb, + void *cb_cls); /** * Get the summary of a reserve. @@ -1391,9 +1478,9 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*reserve_get) (void *cls, - struct TALER_EXCHANGEDB_Session *db, - struct TALER_EXCHANGEDB_Reserve *reserve); + (*reserve_get)(void *cls, + struct TALER_EXCHANGEDB_Session *db, + struct TALER_EXCHANGEDB_Reserve *reserve); /** @@ -1413,15 +1500,15 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*reserves_in_insert) (void *cls, - struct TALER_EXCHANGEDB_Session *db, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *balance, - struct GNUNET_TIME_Absolute execution_time, - const char *sender_account_details, - const char *exchange_account_name, - const void *wire_reference, - size_t wire_reference_size); + (*reserves_in_insert)(void *cls, + struct TALER_EXCHANGEDB_Session *db, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_Amount *balance, + struct GNUNET_TIME_Absolute execution_time, + const char *sender_account_details, + const char *exchange_account_name, + const void *wire_reference, + size_t wire_reference_size); /** @@ -1454,10 +1541,10 @@ struct TALER_EXCHANGEDB_Plugin * @return statement execution status */ enum GNUNET_DB_QueryStatus - (*get_withdraw_info) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *h_blind, - struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable); + (*get_withdraw_info)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *h_blind, + struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable); /** @@ -1471,9 +1558,10 @@ struct TALER_EXCHANGEDB_Plugin * @return statement execution status */ enum GNUNET_DB_QueryStatus - (*insert_withdraw_info) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable); + (*insert_withdraw_info)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct + TALER_EXCHANGEDB_CollectableBlindcoin *collectable); /** @@ -1487,10 +1575,10 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*get_reserve_history) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_ReservePublicKeyP *reserve_pub, - struct TALER_EXCHANGEDB_ReserveHistory **rhp); + (*get_reserve_history)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_ReservePublicKeyP *reserve_pub, + struct TALER_EXCHANGEDB_ReserveHistory **rhp); /** @@ -1527,9 +1615,9 @@ struct TALER_EXCHANGEDB_Plugin * @return database transaction status, non-negative on success */ enum GNUNET_DB_QueryStatus - (*ensure_coin_known) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinPublicInfo *coin); + (*ensure_coin_known)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinPublicInfo *coin); /** @@ -1541,10 +1629,10 @@ struct TALER_EXCHANGEDB_Plugin * @return database transaction status, non-negative on success */ enum GNUNET_DB_QueryStatus - (*get_known_coin) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - struct TALER_CoinPublicInfo *coin_info); + (*get_known_coin)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + struct TALER_CoinPublicInfo *coin_info); /** * Check if we have the specified deposit already in the database. @@ -1558,10 +1646,10 @@ struct TALER_EXCHANGEDB_Plugin * otherwise transaction error status */ enum GNUNET_DB_QueryStatus - (*have_deposit) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_Deposit *deposit, - int check_extras); + (*have_deposit)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_EXCHANGEDB_Deposit *deposit, + int check_extras); /** @@ -1573,9 +1661,9 @@ struct TALER_EXCHANGEDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_deposit) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_Deposit *deposit); + (*insert_deposit)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_EXCHANGEDB_Deposit *deposit); /** @@ -1587,9 +1675,9 @@ struct TALER_EXCHANGEDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_refund) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_Refund *refund); + (*insert_refund)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_EXCHANGEDB_Refund *refund); /** * Select refunds by @a coin_pub. @@ -1603,10 +1691,10 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_refunds_by_coin)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - TALER_EXCHANGEDB_RefundCoinCallback cb, - void *cb_cls); + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + TALER_EXCHANGEDB_RefundCoinCallback cb, + void *cb_cls); /** @@ -1620,9 +1708,9 @@ struct TALER_EXCHANGEDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*mark_deposit_tiny) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - uint64_t rowid); + (*mark_deposit_tiny)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + uint64_t rowid); /** @@ -1637,9 +1725,9 @@ struct TALER_EXCHANGEDB_Plugin * otherwise transaction error status (incl. deposit unknown) */ enum GNUNET_DB_QueryStatus - (*test_deposit_done) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_Deposit *deposit); + (*test_deposit_done)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_EXCHANGEDB_Deposit *deposit); /** @@ -1653,9 +1741,9 @@ struct TALER_EXCHANGEDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*mark_deposit_done) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - uint64_t rowid); + (*mark_deposit_done)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + uint64_t rowid); /** @@ -1670,10 +1758,10 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_ready_deposit) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - TALER_EXCHANGEDB_DepositIterator deposit_cb, - void *deposit_cb_cls); + (*get_ready_deposit)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + TALER_EXCHANGEDB_DepositIterator deposit_cb, + void *deposit_cb_cls); /** @@ -1704,13 +1792,14 @@ struct TALER_EXCHANGEDB_Plugin * transaction status code on error */ enum GNUNET_DB_QueryStatus - (*iterate_matching_deposits) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *h_wire, - const struct TALER_MerchantPublicKeyP *merchant_pub, - TALER_EXCHANGEDB_DepositIterator deposit_cb, - void *deposit_cb_cls, - uint32_t limit); + (*iterate_matching_deposits)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *h_wire, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + TALER_EXCHANGEDB_DepositIterator deposit_cb, + void *deposit_cb_cls, + uint32_t limit); /** @@ -1722,9 +1811,9 @@ struct TALER_EXCHANGEDB_Plugin * @return query status for the transaction */ enum GNUNET_DB_QueryStatus - (*insert_melt) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_EXCHANGEDB_RefreshSession *refresh_session); + (*insert_melt)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_EXCHANGEDB_RefreshSession *refresh_session); /** @@ -1737,10 +1826,10 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*get_melt) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_RefreshCommitmentP *rc, - struct TALER_EXCHANGEDB_RefreshMelt *refresh_melt); + (*get_melt)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_RefreshCommitmentP *rc, + struct TALER_EXCHANGEDB_RefreshMelt *refresh_melt); /** @@ -1754,10 +1843,10 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*get_melt_index) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_RefreshCommitmentP *rc, - uint32_t *noreveal_index); + (*get_melt_index)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_RefreshCommitmentP *rc, + uint32_t *noreveal_index); /** @@ -1777,14 +1866,15 @@ struct TALER_EXCHANGEDB_Plugin * @return query status for the transaction */ enum GNUNET_DB_QueryStatus - (*insert_refresh_reveal) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_RefreshCommitmentP *rc, - uint32_t num_rrcs, - const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, - unsigned int num_tprivs, - const struct TALER_TransferPrivateKeyP *tprivs, - const struct TALER_TransferPublicKeyP *tp); + (*insert_refresh_reveal)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_RefreshCommitmentP *rc, + uint32_t num_rrcs, + const struct + TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, + unsigned int num_tprivs, + const struct TALER_TransferPrivateKeyP *tprivs, + const struct TALER_TransferPublicKeyP *tp); /** @@ -1799,11 +1889,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*get_refresh_reveal) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_RefreshCommitmentP *rc, - TALER_EXCHANGEDB_RefreshCallback cb, - void *cb_cls); + (*get_refresh_reveal)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_RefreshCommitmentP *rc, + TALER_EXCHANGEDB_RefreshCallback cb, + void *cb_cls); /** @@ -1820,11 +1910,11 @@ struct TALER_EXCHANGEDB_Plugin * @return statement execution status */ enum GNUNET_DB_QueryStatus - (*get_link_data) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - TALER_EXCHANGEDB_LinkDataCallback ldc, - void *tdc_cls); + (*get_link_data)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + TALER_EXCHANGEDB_LinkDataCallback ldc, + void *tdc_cls); /** @@ -1839,11 +1929,11 @@ struct TALER_EXCHANGEDB_Plugin * @return database transaction status */ enum GNUNET_DB_QueryStatus - (*get_coin_transactions) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - int include_payback, - struct TALER_EXCHANGEDB_TransactionList **tlp); + (*get_coin_transactions)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + int include_payback, + struct TALER_EXCHANGEDB_TransactionList **tlp); /** @@ -1869,11 +1959,11 @@ struct TALER_EXCHANGEDB_Plugin * @return query status of the transaction */ enum GNUNET_DB_QueryStatus - (*lookup_wire_transfer) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_WireTransferIdentifierRawP *wtid, - TALER_EXCHANGEDB_WireTransferDataCallback cb, - void *cb_cls); + (*lookup_wire_transfer)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_WireTransferIdentifierRawP *wtid, + TALER_EXCHANGEDB_WireTransferDataCallback cb, + void *cb_cls); /** @@ -1894,12 +1984,13 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*wire_lookup_deposit_wtid)(void *cls, struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *h_contract_terms, - const struct GNUNET_HashCode *h_wire, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_MerchantPublicKeyP *merchant_pub, - TALER_EXCHANGEDB_TrackTransactionCallback cb, - void *cb_cls); + const struct GNUNET_HashCode *h_contract_terms, + const struct GNUNET_HashCode *h_wire, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct + TALER_MerchantPublicKeyP *merchant_pub, + TALER_EXCHANGEDB_TrackTransactionCallback cb, + void *cb_cls); /** @@ -1914,7 +2005,8 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*insert_aggregation_tracking)(void *cls, struct TALER_EXCHANGEDB_Session *session, - const struct TALER_WireTransferIdentifierRawP *wtid, + const struct + TALER_WireTransferIdentifierRawP *wtid, unsigned long long deposit_serial_id); @@ -1957,15 +2049,15 @@ struct TALER_EXCHANGEDB_Plugin * @return query status of the transaction */ enum GNUNET_DB_QueryStatus - (*get_wire_fee) (void *cls, - struct TALER_EXCHANGEDB_Session *session, - const char *type, - struct GNUNET_TIME_Absolute date, - struct GNUNET_TIME_Absolute *start_date, - struct GNUNET_TIME_Absolute *end_date, - struct TALER_Amount *wire_fee, - struct TALER_Amount *closing_fee, - struct TALER_MasterSignatureP *master_sig); + (*get_wire_fee)(void *cls, + struct TALER_EXCHANGEDB_Session *session, + const char *type, + struct GNUNET_TIME_Absolute date, + struct GNUNET_TIME_Absolute *start_date, + struct GNUNET_TIME_Absolute *end_date, + struct TALER_Amount *wire_fee, + struct TALER_Amount *closing_fee, + struct TALER_MasterSignatureP *master_sig); /** @@ -2093,7 +2185,8 @@ struct TALER_EXCHANGEDB_Plugin (*store_wire_transfer_out)(void *cls, struct TALER_EXCHANGEDB_Session *session, struct GNUNET_TIME_Absolute date, - const struct TALER_WireTransferIdentifierRawP *wtid, + const struct + TALER_WireTransferIdentifierRawP *wtid, const json_t *wire_account, const char *exchange_account_section, const struct TALER_Amount *amount); @@ -2207,10 +2300,13 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_reserves_in_above_serial_id_by_account)(void *cls, - struct TALER_EXCHANGEDB_Session *session, + struct + TALER_EXCHANGEDB_Session * + session, const char *account_name, uint64_t serial_id, - TALER_EXCHANGEDB_ReserveInCallback cb, + TALER_EXCHANGEDB_ReserveInCallback + cb, void *cb_cls); /** @@ -2227,7 +2323,8 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_reserves_out_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session *session, + struct TALER_EXCHANGEDB_Session * + session, uint64_t serial_id, TALER_EXCHANGEDB_WithdrawCallback cb, void *cb_cls); @@ -2264,10 +2361,12 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_wire_out_above_serial_id_by_account)(void *cls, - struct TALER_EXCHANGEDB_Session *session, + struct TALER_EXCHANGEDB_Session + *session, const char *account_name, uint64_t serial_id, - TALER_EXCHANGEDB_WireTransferOutCallback cb, + TALER_EXCHANGEDB_WireTransferOutCallback + cb, void *cb_cls); @@ -2303,9 +2402,11 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_payback_refresh_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session *session, + struct TALER_EXCHANGEDB_Session * + session, uint64_t serial_id, - TALER_EXCHANGEDB_PaybackRefreshCallback cb, + TALER_EXCHANGEDB_PaybackRefreshCallback + cb, void *cb_cls); @@ -2322,9 +2423,11 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*select_reserve_closed_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session *session, + struct TALER_EXCHANGEDB_Session * + session, uint64_t serial_id, - TALER_EXCHANGEDB_ReserveClosedCallback cb, + TALER_EXCHANGEDB_ReserveClosedCallback + cb, void *cb_cls); @@ -2350,7 +2453,8 @@ struct TALER_EXCHANGEDB_Plugin const struct TALER_ReservePublicKeyP *reserve_pub, const struct TALER_CoinPublicInfo *coin, const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_DenominationBlindingKeyP *coin_blind, + const struct + TALER_DenominationBlindingKeyP *coin_blind, const struct TALER_Amount *amount, const struct GNUNET_HashCode *h_blind_ev, struct GNUNET_TIME_Absolute timestamp); @@ -2375,8 +2479,10 @@ struct TALER_EXCHANGEDB_Plugin (*insert_payback_refresh_request)(void *cls, struct TALER_EXCHANGEDB_Session *session, const struct TALER_CoinPublicInfo *coin, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_DenominationBlindingKeyP *coin_blind, + const struct + TALER_CoinSpendSignatureP *coin_sig, + const struct + TALER_DenominationBlindingKeyP *coin_blind, const struct TALER_Amount *amount, const struct GNUNET_HashCode *h_blind_ev, struct GNUNET_TIME_Absolute timestamp); @@ -2429,8 +2535,10 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*insert_denomination_revocation)(void *cls, struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *denom_pub_hash, - const struct TALER_MasterSignatureP *master_sig); + const struct + GNUNET_HashCode *denom_pub_hash, + const struct + TALER_MasterSignatureP *master_sig); /** diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index 53dbec3cf..382bb19ee 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -77,7 +77,7 @@ TALER_JSON_spec_amount (const char *name, */ struct GNUNET_JSON_Specification TALER_JSON_spec_amount_nbo (const char *name, - struct TALER_AmountNBO *r_amount); + struct TALER_AmountNBO *r_amount); /** @@ -163,7 +163,8 @@ TALER_JSON_exchange_wire_signature_hash (const json_t *wire_s, */ int TALER_JSON_exchange_wire_signature_check (const json_t *wire_s, - const struct TALER_MasterPublicKeyP *master_pub); + const struct + TALER_MasterPublicKeyP *master_pub); /** @@ -174,7 +175,8 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s, */ json_t * TALER_JSON_exchange_wire_signature_make (const char *payto_url, - const struct TALER_MasterPrivateKeyP *master_priv); + const struct + TALER_MasterPrivateKeyP *master_priv); /** diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h index 47040ea02..697917568 100644 --- a/src/include/taler_pq_lib.h +++ b/src/include/taler_pq_lib.h @@ -87,7 +87,8 @@ TALER_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x); * @param x pointer to the query parameter to pass */ struct GNUNET_PQ_QueryParam -TALER_PQ_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO *x); +TALER_PQ_query_param_absolute_time_nbo (const struct + GNUNET_TIME_AbsoluteNBO *x); /** diff --git a/src/include/taler_testing_auditor_lib.h b/src/include/taler_testing_auditor_lib.h index 090a1210c..b12cce986 100644 --- a/src/include/taler_testing_auditor_lib.h +++ b/src/include/taler_testing_auditor_lib.h @@ -87,13 +87,12 @@ TALER_TESTING_cmd_exec_wire_auditor (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_deposit_confirmation - (const char *label, - struct TALER_AUDITOR_Handle *auditor, - const char *deposit_reference, - unsigned int coin_index, - const char *amount_without_fee, - unsigned int expected_response_code); +TALER_TESTING_cmd_deposit_confirmation (const char *label, + struct TALER_AUDITOR_Handle *auditor, + const char *deposit_reference, + unsigned int coin_index, + const char *amount_without_fee, + unsigned int expected_response_code); /** @@ -104,7 +103,8 @@ TALER_TESTING_cmd_deposit_confirmation * @return the command with retries enabled */ struct TALER_TESTING_Command -TALER_TESTING_cmd_deposit_confirmation_with_retry (struct TALER_TESTING_Command cmd); +TALER_TESTING_cmd_deposit_confirmation_with_retry (struct TALER_TESTING_Command + cmd); /** @@ -116,10 +116,9 @@ TALER_TESTING_cmd_deposit_confirmation_with_retry (struct TALER_TESTING_Command * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_exchanges - (const char *label, - struct TALER_AUDITOR_Handle *auditor, - unsigned int expected_response_code); +TALER_TESTING_cmd_exchanges (const char *label, + struct TALER_AUDITOR_Handle *auditor, + unsigned int expected_response_code); /** @@ -134,10 +133,9 @@ TALER_TESTING_cmd_exchanges * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_exchanges_with_url - (const char *label, - unsigned int expected_response_code, - const char *exchange_url); +TALER_TESTING_cmd_exchanges_with_url (const char *label, + unsigned int expected_response_code, + const char *exchange_url); /** * Modify an exchanges command to enable retries when we get diff --git a/src/include/taler_testing_bank_lib.h b/src/include/taler_testing_bank_lib.h index 5beaf97f6..9948a7f2d 100644 --- a/src/include/taler_testing_bank_lib.h +++ b/src/include/taler_testing_bank_lib.h @@ -95,19 +95,18 @@ TALER_TESTING_prepare_bank (const char *config_filename); * @param start_row_reference reference to a command that can * offer a row identifier, to be used as the starting row * to accept in the result. - * @param num_result how many rows we want in the result. + * @param num_result how many rows we want in the result. * * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_bank_history - (const char *label, - const char *bank_url, - uint64_t account_no, - enum TALER_BANK_Direction direction, - unsigned int ascending, - const char *start_row_reference, - long long num_results); +TALER_TESTING_cmd_bank_history (const char *label, + const char *bank_url, + uint64_t account_no, + enum TALER_BANK_Direction direction, + unsigned int ascending, + const char *start_row_reference, + long long num_results); /** @@ -127,14 +126,16 @@ TALER_TESTING_cmd_bank_history * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_bank_history_range_with_dates - (const char *label, - const char *bank_url, - uint64_t account_no, - enum TALER_BANK_Direction direction, - unsigned int ascending, - struct GNUNET_TIME_Absolute start_date, - struct GNUNET_TIME_Absolute end_date); +TALER_TESTING_cmd_bank_history_range_with_dates (const char *label, + const char *bank_url, + uint64_t account_no, + enum TALER_BANK_Direction + direction, + unsigned int ascending, + struct GNUNET_TIME_Absolute + start_date, + struct GNUNET_TIME_Absolute + end_date); /** @@ -156,14 +157,13 @@ TALER_TESTING_cmd_bank_history_range_with_dates * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_bank_history_range - (const char *label, - const char *bank_url, - uint64_t account_no, - enum TALER_BANK_Direction direction, - unsigned int ascending, - const char *start_row_reference, - const char *end_row_reference); +TALER_TESTING_cmd_bank_history_range (const char *label, + const char *bank_url, + uint64_t account_no, + enum TALER_BANK_Direction direction, + unsigned int ascending, + const char *start_row_reference, + const char *end_row_reference); /** diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 41cc8b501..4f69a0d01 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -41,7 +41,7 @@ */ #define TALER_TESTING_FAIL(is) \ do \ - {\ + { \ GNUNET_break (0); \ TALER_TESTING_interpreter_fail (is); \ return; \ @@ -113,8 +113,8 @@ TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys, */ int TALER_TESTING_prepare_exchange (const char *config_filename, - char **auditor_base_url, - char **exchange_base_url); + char **auditor_base_url, + char **exchange_base_url); /** * "Canonical" cert_cb used when we are connecting to the @@ -126,10 +126,9 @@ TALER_TESTING_prepare_exchange (const char *config_filename, * @param compat protocol compatibility information. */ void -TALER_TESTING_cert_cb - (void *cls, - const struct TALER_EXCHANGE_Keys *keys, - enum TALER_EXCHANGE_VersionCompatibility compat); +TALER_TESTING_cert_cb (void *cls, + const struct TALER_EXCHANGE_Keys *keys, + enum TALER_EXCHANGE_VersionCompatibility compat); /** @@ -174,7 +173,7 @@ TALER_TESTING_cleanup_files (const char *config_name); */ int TALER_TESTING_cleanup_files_cfg (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg); + const struct GNUNET_CONFIGURATION_Handle *cfg); /** @@ -186,7 +185,7 @@ TALER_TESTING_cleanup_files_cfg (void *cls, */ int TALER_TESTING_run_keyup (const char *config_filename, - const char *output_filename); + const char *output_filename); /** @@ -221,10 +220,10 @@ TALER_TESTING_exchange_db_reset (const char *config_filename); */ int TALER_TESTING_run_auditor_sign (const char *config_filename, - const char *exchange_master_pub, - const char *auditor_base_url, - const char *signdata_in, - const char *signdata_out); + const char *exchange_master_pub, + const char *auditor_base_url, + const char *signdata_in, + const char *signdata_out); /** @@ -464,9 +463,8 @@ struct TALER_TESTING_Command * @return the command, if it is found, or NULL. */ const struct TALER_TESTING_Command * -TALER_TESTING_interpreter_lookup_command - (struct TALER_TESTING_Interpreter *i, - const char *label); +TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *i, + const char *label); /** * Obtain main execution context for the main loop. @@ -475,8 +473,7 @@ TALER_TESTING_interpreter_lookup_command * @return CURL execution context. */ struct GNUNET_CURL_Context * -TALER_TESTING_interpreter_get_context - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_interpreter_get_context (struct TALER_TESTING_Interpreter *is); /** * Obtain label of the command being now run. @@ -485,8 +482,8 @@ TALER_TESTING_interpreter_get_context * @return the label. */ const char * -TALER_TESTING_interpreter_get_current_label - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_interpreter_get_current_label (struct + TALER_TESTING_Interpreter *is); @@ -497,8 +494,7 @@ TALER_TESTING_interpreter_get_current_label * @return the handle. */ struct TALER_FAKEBANK_Handle * -TALER_TESTING_interpreter_get_fakebank - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_interpreter_get_fakebank (struct TALER_TESTING_Interpreter *is); /** * Current command is done, run the next one. @@ -506,8 +502,7 @@ TALER_TESTING_interpreter_get_fakebank * @param is interpreter state. */ void -TALER_TESTING_interpreter_next - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_interpreter_next (struct TALER_TESTING_Interpreter *is); /** * Current command failed, clean up and fail the test case. @@ -515,8 +510,7 @@ TALER_TESTING_interpreter_next * @param is interpreter state. */ void -TALER_TESTING_interpreter_fail - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_interpreter_fail (struct TALER_TESTING_Interpreter *is); /** * Create command array terminator. @@ -536,8 +530,7 @@ TALER_TESTING_cmd_end (); * @param is interpreter state. */ void -TALER_TESTING_wait_for_sigchld - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_wait_for_sigchld (struct TALER_TESTING_Interpreter *is); /** @@ -576,10 +569,9 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is, * @param bank_url base URL of the fake bank. */ void -TALER_TESTING_run_with_fakebank - (struct TALER_TESTING_Interpreter *is, - struct TALER_TESTING_Command *commands, - const char *bank_url); +TALER_TESTING_run_with_fakebank (struct TALER_TESTING_Interpreter *is, + struct TALER_TESTING_Command *commands, + const char *bank_url); /** @@ -655,9 +647,9 @@ struct TALER_TESTING_SetupContext * @return #GNUNET_OK if no errors occurred. */ int -TALER_TESTING_setup_with_exchange_cfg - (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg); +TALER_TESTING_setup_with_exchange_cfg (void *cls, + const struct + GNUNET_CONFIGURATION_Handle *cfg); /** @@ -691,9 +683,10 @@ TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb, * @return #GNUNET_OK if no errors occurred. */ int -TALER_TESTING_setup_with_auditor_and_exchange_cfg - (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg); +TALER_TESTING_setup_with_auditor_and_exchange_cfg (void *cls, + const struct + GNUNET_CONFIGURATION_Handle * + cfg); /** @@ -712,10 +705,9 @@ TALER_TESTING_setup_with_auditor_and_exchange_cfg * @return #GNUNET_OK if no errors occurred. */ int -TALER_TESTING_setup_with_auditor_and_exchange - (TALER_TESTING_Main main_cb, - void *main_cb_cls, - const char *config_file); +TALER_TESTING_setup_with_auditor_and_exchange (TALER_TESTING_Main main_cb, + void *main_cb_cls, + const char *config_file); /* ************** Specific interpreter commands ************ */ @@ -778,16 +770,15 @@ TALER_TESTING_cmd_fakebank_transfer (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_fakebank_transfer_with_subject - (const char *label, - const char *amount, - const char *bank_url, - uint64_t debit_account_no, - uint64_t credit_account_no, - const char *auth_username, - const char *auth_password, - const char *subject, - const char *exchange_url); +TALER_TESTING_cmd_fakebank_transfer_with_subject (const char *label, + const char *amount, + const char *bank_url, + uint64_t debit_account_no, + uint64_t credit_account_no, + const char *auth_username, + const char *auth_password, + const char *subject, + const char *exchange_url); /** @@ -814,16 +805,15 @@ TALER_TESTING_cmd_fakebank_transfer_with_subject * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_fakebank_transfer_with_ref - (const char *label, - const char *amount, - const char *bank_url, - uint64_t debit_account_no, - uint64_t credit_account_no, - const char *auth_username, - const char *auth_password, - const char *ref, - const char *exchange_url); +TALER_TESTING_cmd_fakebank_transfer_with_ref (const char *label, + const char *amount, + const char *bank_url, + uint64_t debit_account_no, + uint64_t credit_account_no, + const char *auth_username, + const char *auth_password, + const char *ref, + const char *exchange_url); /** @@ -858,17 +848,16 @@ TALER_TESTING_cmd_fakebank_transfer_with_ref * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_fakebank_transfer_with_instance - (const char *label, - const char *amount, - const char *bank_url, - uint64_t debit_account_no, - uint64_t credit_account_no, - const char *auth_username, - const char *auth_password, - const char *instance, - const char *exchange_url, - const char *config_filename); +TALER_TESTING_cmd_fakebank_transfer_with_instance (const char *label, + const char *amount, + const char *bank_url, + uint64_t debit_account_no, + uint64_t credit_account_no, + const char *auth_username, + const char *auth_password, + const char *instance, + const char *exchange_url, + const char *config_filename); /** @@ -880,8 +869,7 @@ TALER_TESTING_cmd_fakebank_transfer_with_instance * @return the command with retries enabled */ struct TALER_TESTING_Command -TALER_TESTING_cmd_fakebank_transfer_retry - (struct TALER_TESTING_Command cmd); +TALER_TESTING_cmd_fakebank_transfer_retry (struct TALER_TESTING_Command cmd); /** @@ -931,10 +919,9 @@ TALER_TESTING_cmd_exec_keyup (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_exec_keyup_with_now - (const char *label, - const char *config_filename, - struct GNUNET_TIME_Absolute now); +TALER_TESTING_cmd_exec_keyup_with_now (const char *label, + const char *config_filename, + struct GNUNET_TIME_Absolute now); /** @@ -954,11 +941,10 @@ TALER_TESTING_cmd_exec_keyup_with_now * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_keys_with_now - (const char *label, - unsigned int generation, - unsigned int num_denom_keys, - struct GNUNET_TIME_Absolute now); +TALER_TESTING_cmd_check_keys_with_now (const char *label, + unsigned int generation, + unsigned int num_denom_keys, + struct GNUNET_TIME_Absolute now); /** @@ -986,11 +972,10 @@ TALER_TESTING_cmd_exec_auditor_sign (const char *label, * @return the withdraw command to be executed by the interpreter. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_withdraw_amount - (const char *label, - const char *reserve_reference, - const char *amount, - unsigned int expected_response_code); +TALER_TESTING_cmd_withdraw_amount (const char *label, + const char *reserve_reference, + const char *amount, + unsigned int expected_response_code); /** @@ -1006,11 +991,11 @@ TALER_TESTING_cmd_withdraw_amount * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_withdraw_denomination - (const char *label, - const char *reserve_reference, - const struct TALER_EXCHANGE_DenomPublicKey *dk, - unsigned int expected_response_code); +TALER_TESTING_cmd_withdraw_denomination (const char *label, + const char *reserve_reference, + const struct + TALER_EXCHANGE_DenomPublicKey *dk, + unsigned int expected_response_code); /** @@ -1022,8 +1007,7 @@ TALER_TESTING_cmd_withdraw_denomination * @return the command with retries enabled */ struct TALER_TESTING_Command -TALER_TESTING_cmd_withdraw_with_retry - (struct TALER_TESTING_Command cmd); +TALER_TESTING_cmd_withdraw_with_retry (struct TALER_TESTING_Command cmd); /** @@ -1082,15 +1066,14 @@ TALER_TESTING_cmd_status (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_deposit - (const char *label, - const char *coin_reference, - unsigned int coin_index, - json_t *wire_details, - const char *contract_terms, - struct GNUNET_TIME_Relative refund_deadline, - const char *amount, - unsigned int expected_response_code); +TALER_TESTING_cmd_deposit (const char *label, + const char *coin_reference, + unsigned int coin_index, + json_t *wire_details, + const char *contract_terms, + struct GNUNET_TIME_Relative refund_deadline, + const char *amount, + unsigned int expected_response_code); /** @@ -1101,8 +1084,7 @@ TALER_TESTING_cmd_deposit * @return the command with retries enabled */ struct TALER_TESTING_Command -TALER_TESTING_cmd_deposit_with_retry - (struct TALER_TESTING_Command cmd); +TALER_TESTING_cmd_deposit_with_retry (struct TALER_TESTING_Command cmd); /** @@ -1116,11 +1098,10 @@ TALER_TESTING_cmd_deposit_with_retry * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refresh_melt - (const char *label, - const char *coin_reference, - unsigned int expected_response_code, - ...); +TALER_TESTING_cmd_refresh_melt (const char *label, + const char *coin_reference, + unsigned int expected_response_code, + ...); /** @@ -1136,11 +1117,10 @@ TALER_TESTING_cmd_refresh_melt * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refresh_melt_double - (const char *label, - const char *coin_reference, - unsigned int expected_response_code, - ...); +TALER_TESTING_cmd_refresh_melt_double (const char *label, + const char *coin_reference, + unsigned int expected_response_code, + ...); /** @@ -1150,8 +1130,7 @@ TALER_TESTING_cmd_refresh_melt_double * @return modified command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refresh_melt_with_retry - (struct TALER_TESTING_Command cmd); +TALER_TESTING_cmd_refresh_melt_with_retry (struct TALER_TESTING_Command cmd); /** @@ -1165,10 +1144,9 @@ TALER_TESTING_cmd_refresh_melt_with_retry * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refresh_reveal - (const char *label, - const char *melt_reference, - unsigned int expected_response_code); +TALER_TESTING_cmd_refresh_reveal (const char *label, + const char *melt_reference, + unsigned int expected_response_code); /** @@ -1192,10 +1170,9 @@ TALER_TESTING_cmd_refresh_reveal_with_retry (struct TALER_TESTING_Command cmd); * @return the "refresh link" command */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refresh_link - (const char *label, - const char *reveal_reference, - unsigned int expected_response_code); +TALER_TESTING_cmd_refresh_link (const char *label, + const char *reveal_reference, + unsigned int expected_response_code); /** @@ -1223,12 +1200,11 @@ TALER_TESTING_cmd_refresh_link_with_retry (struct TALER_TESTING_Command cmd); * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_track_transaction - (const char *label, - const char *transaction_reference, - unsigned int coin_index, - unsigned int expected_response_code, - const char *bank_transfer_reference); +TALER_TESTING_cmd_track_transaction (const char *label, + const char *transaction_reference, + unsigned int coin_index, + unsigned int expected_response_code, + const char *bank_transfer_reference); /** * Make a "track transfer" CMD where no "expected"-arguments, @@ -1248,11 +1224,10 @@ TALER_TESTING_cmd_track_transaction * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_track_transfer_empty - (const char *label, - const char *wtid_reference, - unsigned int index, - unsigned int expected_response_code); +TALER_TESTING_cmd_track_transfer_empty (const char *label, + const char *wtid_reference, + unsigned int index, + unsigned int expected_response_code); /** @@ -1272,13 +1247,12 @@ TALER_TESTING_cmd_track_transfer_empty * @return the command */ struct TALER_TESTING_Command -TALER_TESTING_cmd_track_transfer - (const char *label, - const char *wtid_reference, - unsigned int index, - unsigned int expected_response_code, - const char *expected_total_amount, - const char *expected_wire_fee); +TALER_TESTING_cmd_track_transfer (const char *label, + const char *wtid_reference, + unsigned int index, + unsigned int expected_response_code, + const char *expected_total_amount, + const char *expected_wire_fee); /** * Make a "bank check" CMD. It checks whether a @@ -1294,12 +1268,11 @@ TALER_TESTING_cmd_track_transfer * @return the command */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_bank_transfer - (const char *label, - const char *exchange_base_url, - const char *amount, - uint64_t debit_account, - uint64_t credit_account); +TALER_TESTING_cmd_check_bank_transfer (const char *label, + const char *exchange_base_url, + const char *amount, + uint64_t debit_account, + uint64_t credit_account); @@ -1315,9 +1288,8 @@ TALER_TESTING_cmd_check_bank_transfer * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_bank_transfer_with_ref - (const char *label, - const char *deposit_reference); +TALER_TESTING_cmd_check_bank_transfer_with_ref (const char *label, + const char *deposit_reference); /** @@ -1348,13 +1320,12 @@ TALER_TESTING_cmd_check_bank_empty (const char *label); * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_refund_with_id - (const char *label, - unsigned int expected_response_code, - const char *refund_amount, - const char *refund_fee, - const char *deposit_reference, - uint64_t refund_transaction_id); +TALER_TESTING_cmd_refund_with_id (const char *label, + unsigned int expected_response_code, + const char *refund_amount, + const char *refund_fee, + const char *deposit_reference, + uint64_t refund_transaction_id); /** @@ -1468,10 +1439,9 @@ TALER_TESTING_cmd_wait_service (const char *label, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_keys - (const char *label, - unsigned int generation, - unsigned int num_denom_keys); +TALER_TESTING_cmd_check_keys (const char *label, + unsigned int generation, + unsigned int num_denom_keys); /** @@ -1491,10 +1461,9 @@ TALER_TESTING_cmd_check_keys * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_keys_pull_all_keys - (const char *label, - unsigned int generation, - unsigned int num_denom_keys); +TALER_TESTING_cmd_check_keys_pull_all_keys (const char *label, + unsigned int generation, + unsigned int num_denom_keys); /** @@ -1518,11 +1487,11 @@ TALER_TESTING_cmd_check_keys_pull_all_keys * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_check_keys_with_last_denom - (const char *label, - unsigned int generation, - unsigned int num_denom_keys, - struct GNUNET_TIME_Absolute last_denom_date); +TALER_TESTING_cmd_check_keys_with_last_denom (const char *label, + unsigned int generation, + unsigned int num_denom_keys, + struct GNUNET_TIME_Absolute + last_denom_date); /** @@ -1556,8 +1525,7 @@ TALER_TESTING_cmd_is_batch (const struct TALER_TESTING_Command *cmd); * @param is interpreter state. */ void -TALER_TESTING_cmd_batch_next - (struct TALER_TESTING_Interpreter *is); +TALER_TESTING_cmd_batch_next (struct TALER_TESTING_Interpreter *is); /** * Obtain what command the batch is at. @@ -1656,9 +1624,9 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits, */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_reserve_priv - (unsigned int index, - const struct TALER_ReservePrivateKeyP *reserve_priv); +TALER_TESTING_make_trait_reserve_priv (unsigned int index, + const struct + TALER_ReservePrivateKeyP *reserve_priv); /** @@ -1671,10 +1639,10 @@ TALER_TESTING_make_trait_reserve_priv * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_reserve_priv - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_ReservePrivateKeyP **reserve_priv); +TALER_TESTING_get_trait_reserve_priv (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_ReservePrivateKeyP **reserve_priv); /** @@ -1686,9 +1654,9 @@ TALER_TESTING_get_trait_reserve_priv * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_exchange_sig - (unsigned int index, - const struct TALER_ExchangeSignatureP *exchange_sig); +TALER_TESTING_make_trait_exchange_sig (unsigned int index, + const struct + TALER_ExchangeSignatureP *exchange_sig); /** @@ -1700,10 +1668,10 @@ TALER_TESTING_make_trait_exchange_sig * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_exchange_sig - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_ExchangeSignatureP **exchange_sig); +TALER_TESTING_get_trait_exchange_sig (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_ExchangeSignatureP **exchange_sig); /** @@ -1715,9 +1683,9 @@ TALER_TESTING_get_trait_exchange_sig * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_exchange_pub - (unsigned int index, - const struct TALER_ExchangePublicKeyP *exchange_pub); +TALER_TESTING_make_trait_exchange_pub (unsigned int index, + const struct + TALER_ExchangePublicKeyP *exchange_pub); /** @@ -1729,10 +1697,10 @@ TALER_TESTING_make_trait_exchange_pub * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_exchange_pub - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_ExchangePublicKeyP **exchange_pub); +TALER_TESTING_get_trait_exchange_pub (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_ExchangePublicKeyP **exchange_pub); /** @@ -1747,10 +1715,9 @@ TALER_TESTING_get_trait_exchange_pub * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_process - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - struct GNUNET_OS_Process ***processp); // FIXME: why is this a ***!? ** should do! +TALER_TESTING_get_trait_process (const struct TALER_TESTING_Command *cmd, + unsigned int index, + struct GNUNET_OS_Process ***processp); // FIXME: why is this a ***!? ** should do! /** @@ -1763,9 +1730,8 @@ TALER_TESTING_get_trait_process * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_process - (unsigned int index, - struct GNUNET_OS_Process **processp); // FIXME: why is this a "**"? * should do! +TALER_TESTING_make_trait_process (unsigned int index, + struct GNUNET_OS_Process **processp); // FIXME: why is this a "**"? * should do! /** @@ -1777,9 +1743,9 @@ TALER_TESTING_make_trait_process * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_coin_priv - (unsigned int index, - const struct TALER_CoinSpendPrivateKeyP *coin_priv); +TALER_TESTING_make_trait_coin_priv (unsigned int index, + const struct + TALER_CoinSpendPrivateKeyP *coin_priv); /** * Obtain a coin private key from a @a cmd. @@ -1791,10 +1757,10 @@ TALER_TESTING_make_trait_coin_priv * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_coin_priv - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_CoinSpendPrivateKeyP **coin_priv); +TALER_TESTING_get_trait_coin_priv (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_CoinSpendPrivateKeyP **coin_priv); /** @@ -1806,9 +1772,10 @@ TALER_TESTING_get_trait_coin_priv * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_blinding_key - (unsigned int index, - const struct TALER_DenominationBlindingKeyP *blinding_key); +TALER_TESTING_make_trait_blinding_key (unsigned int index, + const struct + TALER_DenominationBlindingKeyP * + blinding_key); /** @@ -1821,10 +1788,11 @@ TALER_TESTING_make_trait_blinding_key * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_blinding_key - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_DenominationBlindingKeyP **blinding_key); +TALER_TESTING_get_trait_blinding_key (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_DenominationBlindingKeyP ** + blinding_key); /** @@ -1836,9 +1804,9 @@ TALER_TESTING_get_trait_blinding_key * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_denom_pub - (unsigned int index, - const struct TALER_EXCHANGE_DenomPublicKey *dpk); +TALER_TESTING_make_trait_denom_pub (unsigned int index, + const struct + TALER_EXCHANGE_DenomPublicKey *dpk); /** @@ -1851,10 +1819,10 @@ TALER_TESTING_make_trait_denom_pub * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_denom_pub - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_EXCHANGE_DenomPublicKey **dpk); +TALER_TESTING_get_trait_denom_pub (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_EXCHANGE_DenomPublicKey **dpk); /** @@ -1867,10 +1835,10 @@ TALER_TESTING_get_trait_denom_pub * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_denom_sig - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_DenominationSignature **dpk); +TALER_TESTING_get_trait_denom_sig (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_DenominationSignature **dpk); /** @@ -1883,9 +1851,9 @@ TALER_TESTING_get_trait_denom_sig * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_denom_sig - (unsigned int index, - const struct TALER_DenominationSignature *sig); +TALER_TESTING_make_trait_denom_sig (unsigned int index, + const struct + TALER_DenominationSignature *sig); /** @@ -1895,9 +1863,8 @@ TALER_TESTING_make_trait_denom_sig * @param n number to offer. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_uint64 - (unsigned int index, - const uint64_t *n); +TALER_TESTING_make_trait_uint64 (unsigned int index, + const uint64_t *n); /** @@ -1910,10 +1877,9 @@ TALER_TESTING_make_trait_uint64 * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_uint64 - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const uint64_t **n); +TALER_TESTING_get_trait_uint64 (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const uint64_t **n); /** @@ -1925,9 +1891,8 @@ TALER_TESTING_get_trait_uint64 * @return #GNUNET_OK on success. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_uint - (unsigned int index, - const unsigned int *i); +TALER_TESTING_make_trait_uint (unsigned int index, + const unsigned int *i); /** @@ -1940,10 +1905,9 @@ TALER_TESTING_make_trait_uint * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_uint - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const unsigned int **n); +TALER_TESTING_get_trait_uint (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const unsigned int **n); /** @@ -1990,9 +1954,9 @@ struct TALER_TESTING_FreshCoinData * @return the trait, */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_fresh_coins - (unsigned int index, - struct TALER_TESTING_FreshCoinData *fresh_coins); +TALER_TESTING_make_trait_fresh_coins (unsigned int index, + struct TALER_TESTING_FreshCoinData * + fresh_coins); /** @@ -2006,10 +1970,10 @@ TALER_TESTING_make_trait_fresh_coins * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_fresh_coins - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_TESTING_FreshCoinData **fresh_coins); +TALER_TESTING_get_trait_fresh_coins (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_TESTING_FreshCoinData **fresh_coins); /** @@ -2022,10 +1986,9 @@ TALER_TESTING_get_trait_fresh_coins * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_contract_terms - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const json_t **contract_terms); +TALER_TESTING_get_trait_contract_terms (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const json_t **contract_terms); /** @@ -2036,9 +1999,8 @@ TALER_TESTING_get_trait_contract_terms * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_contract_terms - (unsigned int index, - const json_t *contract_terms); +TALER_TESTING_make_trait_contract_terms (unsigned int index, + const json_t *contract_terms); /** @@ -2053,10 +2015,9 @@ TALER_TESTING_make_trait_contract_terms * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_wire_details - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const json_t **wire_details); +TALER_TESTING_get_trait_wire_details (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const json_t **wire_details); /** @@ -2070,9 +2031,8 @@ TALER_TESTING_get_trait_wire_details * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_wire_details - (unsigned int index, - const json_t *wire_details); +TALER_TESTING_make_trait_wire_details (unsigned int index, + const json_t *wire_details); /** @@ -2084,10 +2044,9 @@ TALER_TESTING_make_trait_wire_details * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_exchange_keys - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const json_t **keys); +TALER_TESTING_get_trait_exchange_keys (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const json_t **keys); /** @@ -2099,9 +2058,8 @@ TALER_TESTING_get_trait_exchange_keys * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_exchange_keys - (unsigned int index, - const json_t *keys); +TALER_TESTING_make_trait_exchange_keys (unsigned int index, + const json_t *keys); /** @@ -2115,10 +2073,10 @@ TALER_TESTING_make_trait_exchange_keys * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_peer_key - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct GNUNET_CRYPTO_EddsaPrivateKey **priv); +TALER_TESTING_get_trait_peer_key (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + GNUNET_CRYPTO_EddsaPrivateKey **priv); // FIXME: private get_trait_merchant_priv instead, rather have // more traits with precise types than this! @@ -2133,9 +2091,9 @@ TALER_TESTING_get_trait_peer_key * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_peer_key - (unsigned int index, - const struct GNUNET_CRYPTO_EddsaPrivateKey *priv); +TALER_TESTING_make_trait_peer_key (unsigned int index, + const struct + GNUNET_CRYPTO_EddsaPrivateKey *priv); // FIXME: private get_trait_merchant_priv instead, rather have // more traits with precise types than this! @@ -2152,10 +2110,10 @@ TALER_TESTING_make_trait_peer_key * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_peer_key_pub - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct GNUNET_CRYPTO_EddsaPublicKey **pub); +TALER_TESTING_get_trait_peer_key_pub (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + GNUNET_CRYPTO_EddsaPublicKey **pub); /** @@ -2169,9 +2127,8 @@ TALER_TESTING_get_trait_peer_key_pub * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_peer_key_pub - (unsigned int index, - struct GNUNET_CRYPTO_EddsaPublicKey *pub); +TALER_TESTING_make_trait_peer_key_pub (unsigned int index, + struct GNUNET_CRYPTO_EddsaPublicKey *pub); /** @@ -2186,10 +2143,10 @@ TALER_TESTING_make_trait_peer_key_pub * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_transfer_subject - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const char **transfer_subject); +TALER_TESTING_get_trait_transfer_subject (const struct + TALER_TESTING_Command *cmd, + unsigned int index, + const char **transfer_subject); /** @@ -2201,9 +2158,8 @@ TALER_TESTING_get_trait_transfer_subject * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_transfer_subject - (unsigned int index, - const char *transfer_subject); +TALER_TESTING_make_trait_transfer_subject (unsigned int index, + const char *transfer_subject); /** @@ -2216,10 +2172,10 @@ TALER_TESTING_make_trait_transfer_subject * @return #GNUNET_OK on success */ int -TALER_TESTING_get_trait_wtid - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_WireTransferIdentifierRawP **wtid); +TALER_TESTING_get_trait_wtid (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + TALER_WireTransferIdentifierRawP **wtid); /** @@ -2230,9 +2186,9 @@ TALER_TESTING_get_trait_wtid * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_wtid - (unsigned int index, - const struct TALER_WireTransferIdentifierRawP *wtid); +TALER_TESTING_make_trait_wtid (unsigned int index, + const struct + TALER_WireTransferIdentifierRawP *wtid); /** @@ -2244,9 +2200,8 @@ TALER_TESTING_make_trait_wtid * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_amount - (unsigned int index, - const char *amount); +TALER_TESTING_make_trait_amount (unsigned int index, + const char *amount); /** @@ -2260,10 +2215,9 @@ TALER_TESTING_make_trait_amount * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_amount - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const char **amount); +TALER_TESTING_get_trait_amount (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const char **amount); /** @@ -2276,9 +2230,8 @@ TALER_TESTING_get_trait_amount * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_url - (unsigned int index, - const char *url); +TALER_TESTING_make_trait_url (unsigned int index, + const char *url); /** @@ -2292,10 +2245,9 @@ TALER_TESTING_make_trait_url * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_url - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const char **url); +TALER_TESTING_get_trait_url (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const char **url); /** @@ -2309,10 +2261,9 @@ TALER_TESTING_get_trait_url * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_order_id - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const char **order_id); +TALER_TESTING_get_trait_order_id (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const char **order_id); /** @@ -2325,9 +2276,8 @@ TALER_TESTING_get_trait_order_id * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_order_id - (unsigned int index, - const char *order_id); +TALER_TESTING_make_trait_order_id (unsigned int index, + const char *order_id); /** @@ -2341,10 +2291,9 @@ TALER_TESTING_make_trait_order_id * @return #GNUNET_OK on success */ int -TALER_TESTING_get_trait_amount_obj - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct TALER_Amount **amount); +TALER_TESTING_get_trait_amount_obj (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct TALER_Amount **amount); /** @@ -2357,9 +2306,8 @@ TALER_TESTING_get_trait_amount_obj * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_amount_obj - (unsigned int index, - const struct TALER_Amount *amount); +TALER_TESTING_make_trait_amount_obj (unsigned int index, + const struct TALER_Amount *amount); /** @@ -2372,9 +2320,8 @@ TALER_TESTING_make_trait_amount_obj * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_rejected - (unsigned int index, - const char *rejected); +TALER_TESTING_make_trait_rejected (unsigned int index, + const char *rejected); /** @@ -2389,10 +2336,9 @@ TALER_TESTING_make_trait_rejected * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_rejected - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const char **rejected_reference); +TALER_TESTING_get_trait_rejected (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const char **rejected_reference); /** @@ -2407,9 +2353,8 @@ TALER_TESTING_get_trait_rejected * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_cmd - (unsigned int index, - const struct TALER_TESTING_Command *cmd); +TALER_TESTING_make_trait_cmd (unsigned int index, + const struct TALER_TESTING_Command *cmd); /** @@ -2425,10 +2370,9 @@ TALER_TESTING_make_trait_cmd * @return #GNUNET_OK on success. */ int -TALER_TESTING_get_trait_cmd - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - struct TALER_TESTING_Command **_cmd); +TALER_TESTING_get_trait_cmd (const struct TALER_TESTING_Command *cmd, + unsigned int index, + struct TALER_TESTING_Command **_cmd); /** @@ -2441,10 +2385,10 @@ TALER_TESTING_get_trait_cmd * @return #GNUNET_OK on success */ int -TALER_TESTING_get_trait_absolute_time - (const struct TALER_TESTING_Command *cmd, - unsigned int index, - const struct GNUNET_TIME_Absolute **time); +TALER_TESTING_get_trait_absolute_time (const struct TALER_TESTING_Command *cmd, + unsigned int index, + const struct + GNUNET_TIME_Absolute **time); /** @@ -2455,8 +2399,8 @@ TALER_TESTING_get_trait_absolute_time * @return the trait. */ struct TALER_TESTING_Trait -TALER_TESTING_make_trait_absolute_time - (unsigned int index, - const struct GNUNET_TIME_Absolute *time); +TALER_TESTING_make_trait_absolute_time (unsigned int index, + const struct + GNUNET_TIME_Absolute *time); #endif diff --git a/src/include/taler_util.h b/src/include/taler_util.h index 479a45754..310c88955 100644 --- a/src/include/taler_util.h +++ b/src/include/taler_util.h @@ -51,9 +51,9 @@ #define TALER_assert_as(EXP, reason) \ do { \ if (EXP) break; \ - TALER_LOG_ERROR("%s at %s:%d\n", reason, __FILE__, __LINE__); \ - abort(); \ - } while(0) + TALER_LOG_ERROR ("%s at %s:%d\n", reason, __FILE__, __LINE__); \ + abort (); \ + } while (0) /** @@ -61,11 +61,17 @@ * a failure of the command 'cmd' with the message given * by gcry_strerror(rc). */ -#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR("`%s' failed at %s:%d with error: %s\n", cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0) +#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR ( \ + "`%s' failed at %s:%d with error: %s\n", \ + cmd, __FILE__, __LINE__, \ + gcry_strerror (rc)); } while (0) #define TALER_gcry_ok(cmd) \ - do {int rc; rc = cmd; if (!rc) break; TALER_LOG_ERROR("A Gcrypt call failed at %s:%d with error: %s\n", __FILE__, __LINE__, gcry_strerror(rc)); abort(); } while (0) + do {int rc; rc = cmd; if (! rc) break; \ + TALER_LOG_ERROR ("A Gcrypt call failed at %s:%d with error: %s\n", \ + __FILE__, \ + __LINE__, gcry_strerror (rc)); abort (); } while (0) /** diff --git a/src/include/taler_util_wallet.h b/src/include/taler_util_wallet.h index dd08702db..249ee4571 100644 --- a/src/include/taler_util_wallet.h +++ b/src/include/taler_util_wallet.h @@ -55,9 +55,9 @@ extern "C" #define TALER_assert_as(EXP, reason) \ do { \ if (EXP) break; \ - TALER_LOG_ERROR("%s at %s:%d\n", reason, __FILE__, __LINE__); \ - abort(); \ - } while(0) + TALER_LOG_ERROR ("%s at %s:%d\n", reason, __FILE__, __LINE__); \ + abort (); \ + } while (0) /** @@ -65,11 +65,17 @@ extern "C" * a failure of the command 'cmd' with the message given * by gcry_strerror(rc). */ -#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR("`%s' failed at %s:%d with error: %s\n", cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0) +#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR ( \ + "`%s' failed at %s:%d with error: %s\n", \ + cmd, __FILE__, __LINE__, \ + gcry_strerror (rc)); } while (0) #define TALER_gcry_ok(cmd) \ - do {int rc; rc = cmd; if (!rc) break; TALER_LOG_ERROR("A Gcrypt call failed at %s:%d with error: %s\n", __FILE__, __LINE__, gcry_strerror(rc)); abort(); } while (0) + do {int rc; rc = cmd; if (! rc) break; \ + TALER_LOG_ERROR ("A Gcrypt call failed at %s:%d with error: %s\n", \ + __FILE__, \ + __LINE__, gcry_strerror (rc)); abort (); } while (0) /** diff --git a/src/include/taler_wire_lib.h b/src/include/taler_wire_lib.h index 835ea7ca5..3c8510919 100644 --- a/src/include/taler_wire_lib.h +++ b/src/include/taler_wire_lib.h @@ -28,23 +28,23 @@ * Different account types supported by payto://. */ enum TALER_PaytoAccountType - { +{ - /** - * Used to indicate an uninitialized struct. - */ - TALER_PAC_NONE = 0, + /** + * Used to indicate an uninitialized struct. + */ + TALER_PAC_NONE = 0, - /** - * Account type of a bank running the x-taler-bank protocol. - */ - TALER_PAC_X_TALER_BANK, + /** + * Account type of a bank running the x-taler-bank protocol. + */ + TALER_PAC_X_TALER_BANK, - /** - * Account identified by IBAN number. - */ - TALER_PAC_IBAN - }; + /** + * Account identified by IBAN number. + */ + TALER_PAC_IBAN +}; /** * Information about an account extracted from a payto://-URL. @@ -60,13 +60,15 @@ struct TALER_Account /** * Internals depending on @e type. */ - union { + union + { /** * Taler bank address from x-taler-bank. Set if * @e type is #TALER_AC_X_TALER_BANK. */ - struct { + struct + { /** * Hostname of the bank (possibly including port). @@ -88,7 +90,8 @@ struct TALER_Account * Taler bank address from iban. Set if * @e type is #TALER_AC_IBAN. */ - struct { + struct + { /** * IBAN number. diff --git a/src/include/taler_wire_plugin.h b/src/include/taler_wire_plugin.h index 3d05ae01e..94ef7b328 100644 --- a/src/include/taler_wire_plugin.h +++ b/src/include/taler_wire_plugin.h @@ -106,7 +106,8 @@ typedef int enum TALER_BANK_Direction dir, const void *row_off, size_t row_off_size, - const struct TALER_WIRE_TransferDetails *details); + const struct + TALER_WIRE_TransferDetails *details); /** @@ -201,8 +202,8 @@ struct TALER_WIRE_Plugin * @return #TALER_EC_NONE if correctly formatted */ enum TALER_ErrorCode - (*wire_validate) (void *cls, - const char *account_url); + (*wire_validate)(void *cls, + const char *account_url); /** @@ -343,7 +344,7 @@ struct TALER_WIRE_Plugin */ void (*get_history_cancel) (void *cls, - struct TALER_WIRE_HistoryHandle *whh); + struct TALER_WIRE_HistoryHandle *whh); /** |