[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 01/02: Fix signature of db callback.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 01/02: Fix signature of db callback. |
Date: |
Thu, 23 Mar 2017 21:02:37 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit 62a1f25394868a1a4f3f8132fc7fa68f2f64be64
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 23 20:50:48 2017 +0100
Fix signature of db callback.
---
src/backend/taler-merchant-httpd_history.c | 5 ++---
src/backenddb/plugin_merchantdb_postgres.c | 4 ++--
src/backenddb/test_merchantdb.c | 2 +-
src/include/taler_merchantdb_plugin.h | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_history.c
b/src/backend/taler-merchant-httpd_history.c
index eecb156..a1f3f11 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -46,7 +46,7 @@ static unsigned int delta;
static void
pd_cb (void *cls,
const char *order_id,
- unsigned int row_id,
+ uint64_t row_id,
const json_t *proposal_data)
{
json_t *response = cls;
@@ -54,7 +54,6 @@ pd_cb (void *cls,
json_t *amount;
json_t *timestamp;
json_t *instance;
- uint64_t r64 = (uint64_t) row_id;
GNUNET_assert (-1 != json_unpack ((json_t *) proposal_data,
"{s:o, s:o, s:{s:o}}",
@@ -63,7 +62,7 @@ pd_cb (void *cls,
"merchant", "instance", &instance));
GNUNET_break (NULL != (entry = json_pack ("{s:I, s:s, s:O, s:O, s:O}",
- "row_id", r64,
+ "row_id", row_id,
"order_id", order_id,
"amount", amount,
"timestamp", timestamp,
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index ff1aafc..719bb64 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -880,14 +880,14 @@ postgres_find_proposal_data_by_date_and_range (void *cls,
{
char *order_id;
json_t *proposal_data;
- unsigned int row_id;
+ uint64_t row_id;
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_string ("order_id",
&order_id),
TALER_PQ_result_spec_json ("proposal_data",
&proposal_data),
- GNUNET_PQ_result_spec_uint32 ("row_id",
+ GNUNET_PQ_result_spec_uint64 ("row_id",
&row_id),
GNUNET_PQ_result_spec_end
};
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index f4300b2..cb606c0 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -199,7 +199,7 @@ transaction_cb (void *cls,
static void
pd_cb (void *cls,
const char *order_id,
- unsigned int row_id,
+ uint64_t row_id,
const json_t *proposal_data)
{
return;
diff --git a/src/include/taler_merchantdb_plugin.h
b/src/include/taler_merchantdb_plugin.h
index f6cbcd3..610acb7 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -42,7 +42,7 @@ struct TALER_MERCHANTDB_Plugin;
typedef void
(*TALER_MERCHANTDB_ProposalDataCallback)(void *cls,
const char *order_id,
- unsigned int row_id,
+ uint64_t row_id,
const json_t *proposal_data);
/**
--
To stop receiving notification emails like this one, please contact
address@hidden