commit a5141141452fb619c235ce5f3bee886cf62a8764
parent 2cb08a5b0fa0025d5b0bf1bec520ef3e4e2d1a9a
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date: Wed, 24 Apr 2024 14:56:59 +0200
[donau] make it compile
Diffstat:
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/donaudb/pg_insert_submitted_receipts.c b/src/donaudb/pg_insert_submitted_receipts.c
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file donaudb/pg_insert_issed_receipt.c
+ * @file donaudb/pg_insert_submitted_receipts.c
* @brief Implementation of the insert_submitted_receipts function for Postgres
* @author Johannes Casaburi
*/
@@ -37,7 +37,7 @@ DH_PG_insert_submitted_receipts (
struct PostgresClosure *pg = cls;
const struct DONAU_DonationUnitHashP *h_donation_unit_pubs[GNUNET_NZL (num_dr)
];
- const union GNUNET_CRYPTO_BlindSessionNonce *nonces[GNUNET_NZL (num_dr)];
+ const struct DONAU_UniqueDonorIdentifierNonce *nonces[GNUNET_NZL (num_dr)];
const struct DONAU_DonauSignatureP *donau_sigs[GNUNET_NZL (num_dr)];
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_auto_from_type (h_tax_number),
@@ -60,7 +60,7 @@ DH_PG_insert_submitted_receipts (
const struct DONAU_DonationReceipt *dr = &donation_receipts[i];
h_donation_unit_pubs[i] = &dr->h_donation_unit_pub;
- nonces[i] = dr->nonce;
+ nonces[i] = &dr->nonce;
donau_sigs[i] = &dr->donau_sig;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/donaudb/pg_insert_submitted_receipts.h b/src/donaudb/pg_insert_submitted_receipts.h
@@ -39,9 +39,9 @@ enum GNUNET_DB_QueryStatus
DH_PG_insert_submitted_receipts (
void *cls,
const struct DONAU_HashDonorTaxId *h_tax_number,
- const struct DONAU_DonationReceipt *donation_receipts,
- const size_t num_dr,
- const uint64_t donation_year
+ size_t num_dr,
+ const struct DONAU_DonationReceipt donation_receipts[static num_dr],
+ uint64_t donation_year
);
#endif
diff --git a/src/lib/donau_api_batch_submit_receipts.c b/src/lib/donau_api_batch_submit_receipts.c
@@ -83,10 +83,10 @@ struct DONAU_DonorReceiptsToStatementHandle
*/
json_t *
submit_request_body_to_json (const size_t num_drs,
- const struct
- DONAU_DonationReceipt drs[num_drs],
- const uint64_t year,
- const struct DONAU_HashDonorTaxId *h_tax_id)
+ const struct
+ DONAU_DonationReceipt drs[num_drs],
+ const uint64_t year,
+ const struct DONAU_HashDonorTaxId *h_tax_id)
{
json_t *donation_receipts = json_array ();
GNUNET_assert (NULL != donation_receipts);
@@ -95,20 +95,20 @@ submit_request_body_to_json (const size_t num_drs,
{
json_t *receipt = GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("h_donation_unit_pub",
- &drs[i].h_donation_unit_pub),
- GNUNET_JSON_pack_data_auto ("nonce",
- &drs[i].nonce),
- GNUNET_JSON_pack_data_auto ("donau_sig",
- &drs[i].donau_sig));
+ &drs[i].h_donation_unit_pub),
+ GNUNET_JSON_pack_data_auto ("nonce",
+ &drs[i].nonce),
+ GNUNET_JSON_pack_data_auto ("donau_sig",
+ &drs[i].donau_sig));
GNUNET_assert (0 ==
json_array_append_new (donation_receipts,
- receipt));
+ receipt));
}
return GNUNET_JSON_PACK (
GNUNET_JSON_pack_array_steal ("donation_receipts",
- donation_receipts),
+ donation_receipts),
GNUNET_JSON_pack_data_auto ("h_tax_number",
- h_tax_id),
+ h_tax_id),
GNUNET_JSON_pack_uint64 ("donation_year",
year));
}
@@ -124,8 +124,8 @@ submit_request_body_to_json (const size_t num_drs,
*/
static void
handle_batch_submit_finished (void *cls,
- long response_code,
- const void *resp_obj)
+ long response_code,
+ const void *resp_obj)
{
struct DONAU_DonorReceiptsToStatementHandle *birh = cls;
const json_t *j = resp_obj;
@@ -180,14 +180,14 @@ handle_batch_submit_finished (void *cls,
struct DONAU_DonorReceiptsToStatementHandle *
DONAU_donor_receipts_to_statement (
- struct GNUNET_CURL_Context *ctx,
- const char *url,
- const size_t num_drs,
- const struct DONAU_DonationReceipt drs[num_drs],
- const uint64_t year,
- const struct DONAU_HashDonorTaxId *h_tax_id,
- DONAU_DonorReceiptsToStatementResultCallback cb,
- void *cls)
+ struct GNUNET_CURL_Context *ctx,
+ const char *url,
+ const size_t num_drs,
+ const struct DONAU_DonationReceipt drs[num_drs],
+ const uint64_t year,
+ const struct DONAU_HashDonorTaxId *h_tax_id,
+ DONAU_DonorReceiptsToStatementResultCallback cb,
+ void *cls)
{
struct DONAU_DonorReceiptsToStatementHandle *birh;
birh = GNUNET_new (struct DONAU_DonorReceiptsToStatementHandle);
@@ -201,7 +201,7 @@ DONAU_donor_receipts_to_statement (
birh->cb_cls = cls;
birh->ctx = ctx;
birh->url = TALER_url_join (url,
- "submit",
+ "submit",
NULL);
if (NULL == birh->url)
{