merchant

commit 62a1f25394868a1a4f3f8132fc7fa68f2f64be64
parent 4073fec59dbf938b850738f539da1aa2ce0de425
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Thu, 23 Mar 2017 20:50:48 +0100

Fix signature of db callback.

Diffstat:
M
src/backend/taler-merchant-httpd_history.c
 | 
5
++---
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
4
++--
M
src/backenddb/test_merchantdb.c
 | 
2
+-
M
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
@@ -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
@@ -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
@@ -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
@@ -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);
 
 /**