[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-donau] 02/06: merge
|
From: |
gnunet |
|
Subject: |
[taler-donau] 02/06: merge |
|
Date: |
Tue, 23 Apr 2024 16:57:24 +0200 |
This is an automated email from the git hooks/post-receive script.
lukas-matyja pushed a commit to branch master
in repository donau.
commit dfeb76c9f3e09bd2f322cd47f7fcbc9c17c2f0bf
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Tue Apr 23 16:34:44 2024 +0200
merge
---
src/donau/donau-httpd_batch-issue.c | 8 +++---
src/donaudb/pg_insert_issued_receipt.c | 24 +++++++++-------
src/donaudb/pg_insert_issued_receipt.h | 14 ++++-----
src/include/donaudb_plugin.h | 52 +++++++++++++++++-----------------
4 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/src/donau/donau-httpd_batch-issue.c
b/src/donau/donau-httpd_batch-issue.c
index d1b7306..e9d095e 100644
--- a/src/donau/donau-httpd_batch-issue.c
+++ b/src/donau/donau-httpd_batch-issue.c
@@ -364,11 +364,11 @@ start:
second_time = true;
goto start;
case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
- if (!smaller_than_max_per_year)
+ if (! smaller_than_max_per_year)
return TALER_MHD_reply_with_error (rc->connection,
- MHD_HTTP_BAD_REQUEST,
-
TALER_EC_DONAU_EXCEEDING_DONATION_LIMIT,
- NULL);
+ MHD_HTTP_BAD_REQUEST,
+
TALER_EC_DONAU_EXCEEDING_DONATION_LIMIT,
+ NULL);
break;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/donaudb/pg_insert_issued_receipt.c
b/src/donaudb/pg_insert_issued_receipt.c
index c63df20..6b57ed5 100644
--- a/src/donaudb/pg_insert_issued_receipt.c
+++ b/src/donaudb/pg_insert_issued_receipt.c
@@ -31,18 +31,19 @@
enum GNUNET_DB_QueryStatus
DH_PG_insert_issued_receipt (
- void *cls,
- const size_t num_blinded_sig,
- const struct DONAU_BlindedDonationUnitSignature
signatures[num_blinded_sig],
- const uint64_t charity_id,
- const struct DONAU_DonationReceiptHashP *h_receipt,
- const struct TALER_Amount *amount_receipts_request,
- bool *smaller_than_max_per_year)
+ void *cls,
+ const size_t num_blinded_sig,
+ const struct DONAU_BlindedDonationUnitSignature signatures[num_blinded_sig],
+ const uint64_t charity_id,
+ const struct DONAU_DonationReceiptHashP *h_receipt,
+ const struct TALER_Amount *amount_receipts_request,
+ bool *smaller_than_max_per_year)
{
struct PostgresClosure *pc = cls;
struct GNUNET_PQ_ResultSpec rs[] = {
- GNUNET_PQ_result_spec_bool ("smaller_than_max_per_year",
smaller_than_max_per_year),
+ GNUNET_PQ_result_spec_bool ("smaller_than_max_per_year",
+ smaller_than_max_per_year),
GNUNET_PQ_result_spec_end
};
@@ -52,7 +53,7 @@ DH_PG_insert_issued_receipt (
// signatures,
pc->conn),
GNUNET_PQ_query_param_auto_from_type (&h_receipt->hash),
TALER_PQ_query_param_amount (pc->conn,
- amount_receipts_request),
+ amount_receipts_request),
GNUNET_PQ_query_param_end
};
@@ -69,7 +70,8 @@ DH_PG_insert_issued_receipt (
"insert_issued_receipts_request",
params, rs);
GNUNET_PQ_cleanup_query_params_closures (params);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Is the new receipts_to_day smaller than the max_per_year (1 =
true): %d\n", (*smaller_than_max_per_year));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Is the new receipts_to_day smaller than the max_per_year (1 =
true): %d\n",
+ (*smaller_than_max_per_year));
return qs;
}
diff --git a/src/donaudb/pg_insert_issued_receipt.h
b/src/donaudb/pg_insert_issued_receipt.h
index 22ef511..ae644a4 100644
--- a/src/donaudb/pg_insert_issued_receipt.h
+++ b/src/donaudb/pg_insert_issued_receipt.h
@@ -39,13 +39,13 @@
*/
enum GNUNET_DB_QueryStatus
DH_PG_insert_issued_receipt (
- void *cls,
- const size_t num_blinded_sig,
- const struct DONAU_BlindedDonationUnitSignature
signatures[num_blinded_sig],
- const uint64_t charity_id,
- const struct DONAU_DonationReceiptHashP *h_receipt,
- const struct TALER_Amount *amount_receipts_request,
- bool *smaller_than_max_per_year
+ void *cls,
+ const size_t num_blinded_sig,
+ const struct DONAU_BlindedDonationUnitSignature signatures[num_blinded_sig],
+ const uint64_t charity_id,
+ const struct DONAU_DonationReceiptHashP *h_receipt,
+ const struct TALER_Amount *amount_receipts_request,
+ bool *smaller_than_max_per_year
);
#endif
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index fc103c2..8bc45ea 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -216,7 +216,7 @@ struct DONAUDB_Plugin
* @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
*/
enum GNUNET_GenericReturnValue
- (*drop_tables)(void *cls);
+ (*drop_tables)(void *cls);
/**
* Create the necessary tables if they are not present
@@ -229,7 +229,7 @@ struct DONAUDB_Plugin
* @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
*/
enum GNUNET_GenericReturnValue
- (*create_tables)(void *cls);
+ (*create_tables)(void *cls);
/**
@@ -241,8 +241,8 @@ struct DONAUDB_Plugin
* @return #GNUNET_OK on success
*/
enum GNUNET_GenericReturnValue
- (*start)(void *cls,
- const char *name);
+ (*start)(void *cls,
+ const char *name);
/**
@@ -254,8 +254,8 @@ struct DONAUDB_Plugin
* @return #GNUNET_OK on success
*/
enum GNUNET_GenericReturnValue
- (*start_read_committed)(void *cls,
- const char *name);
+ (*start_read_committed)(void *cls,
+ const char *name);
/**
* Start a READ ONLY serializable transaction.
@@ -266,8 +266,8 @@ struct DONAUDB_Plugin
* @return #GNUNET_OK on success
*/
enum GNUNET_GenericReturnValue
- (*start_read_only)(void *cls,
- const char *name);
+ (*start_read_only)(void *cls,
+ const char *name);
/**
@@ -277,7 +277,7 @@ struct DONAUDB_Plugin
* @return transaction status
*/
enum GNUNET_DB_QueryStatus
- (*commit)(void *cls);
+ (*commit)(void *cls);
/**
@@ -291,7 +291,7 @@ struct DONAUDB_Plugin
* #GNUNET_SYSERR on hard errors
*/
enum GNUNET_GenericReturnValue
- (*preflight)(void *cls);
+ (*preflight)(void *cls);
/**
@@ -312,7 +312,7 @@ struct DONAUDB_Plugin
* #GNUNET_SYSERR on DB errors
*/
enum GNUNET_GenericReturnValue
- (*gc)(void *cls);
+ (*gc)(void *cls);
/**
@@ -367,7 +367,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*lookup_charity)(
+ (*lookup_charity)(
void *cls,
uint64_t charity_id,
struct DONAUDB_CharityMetaData *meta);
@@ -382,7 +382,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*do_charity_delete)(
+ (*do_charity_delete)(
void *cls,
uint64_t charity_id);
@@ -395,7 +395,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*get_charities)(
+ (*get_charities)(
void *cls,
DONAUDB_GetCharitiesCallback cb,
void *cb_cls);
@@ -409,7 +409,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*insert_charity)(
+ (*insert_charity)(
void *cls,
const struct DONAU_CharityPublicKeyP *charity_pub,
const char *charity_name,
@@ -428,7 +428,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*iterate_donation_units)(
+ (*iterate_donation_units)(
void *cls,
DONAUDB_IterateDonationUnitsCallback cb,
void *cb_cls);
@@ -442,7 +442,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*get_history)(
+ (*get_history)(
void *cls,
DONAUDB_GetHistoryCallback cb,
void *cb_cls);
@@ -456,7 +456,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*lookup_history_entry)(
+ (*lookup_history_entry)(
void *cls,
const unsigned long long charity_id,
const struct TALER_Amount *final_amount,
@@ -470,7 +470,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*insert_donation_unit)(
+ (*insert_donation_unit)(
void *cls,
const struct DONAU_DonationUnitHashP *h_donation_unit_pub,
const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
@@ -487,7 +487,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*insert_history_entry)(
+ (*insert_history_entry)(
void *cls,
const uint64_t charity_id,
const struct TALER_Amount *final_amount,
@@ -506,7 +506,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*insert_issued_receipt)(
+ (*insert_issued_receipt)(
void *cls,
const size_t num_blinded_sig,
const struct DONAU_BlindedDonationUnitSignature
signatures[num_blinded_sig],
@@ -527,7 +527,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*insert_submitted_receipt)(
+ (*insert_submitted_receipt)(
void *cls,
const struct DONAU_HashDonorTaxId *h_tax_number,
const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
@@ -544,7 +544,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*lookup_issued_receipts)(
+ (*lookup_issued_receipts)(
void *cls,
struct DONAU_DonationReceiptHashP *h_receitps,
struct DONAUDB_IssuedReceiptsMetaData *meta);
@@ -558,7 +558,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*insert_signing_key)(
+ (*insert_signing_key)(
void *cls,
const struct DONAU_DonauPublicKeyP *donau_pub,
struct DONAUDB_SignkeyMetaData *meta);
@@ -572,7 +572,7 @@ struct DONAUDB_Plugin
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
- (*lookup_signing_key)(
+ (*lookup_signing_key)(
void *cls,
const struct DONAU_DonauPublicKeyP *donau_pub,
struct DONAUDB_SignkeyMetaData *meta);
@@ -586,7 +586,7 @@ struct DONAUDB_Plugin
* @return database transaction status
*/
enum GNUNET_DB_QueryStatus
- (*iterate_active_signing_keys)(
+ (*iterate_active_signing_keys)(
void *cls,
DONAUDB_IterateActiveSigningKeysCallback cb,
void *cb_cls);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-donau] branch master updated (8c2edbc -> 122eac7), gnunet, 2024/04/23
- [taler-donau] 04/06: merge3, gnunet, 2024/04/23
- [taler-donau] 03/06: merge2, gnunet, 2024/04/23
- [taler-donau] 02/06: merge,
gnunet <=
- [taler-donau] 05/06: Merge remote-tracking branch 'refs/remotes/origin/master', gnunet, 2024/04/23
- [taler-donau] 01/06: [donaudb] finish insert issued receipts, gnunet, 2024/04/23
- [taler-donau] 06/06: merge4, gnunet, 2024/04/23