summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-03 20:40:39 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-03 20:40:39 +0100
commitccd931aee6022853d34f8c8f933183c4ec6472cf (patch)
tree41979298738ac9345266bd4135e7f3aded1e0d5c /src/backend
parentc9650e7ec7542292b233794e14c411405cdd4595 (diff)
downloadmerchant-ccd931aee6022853d34f8c8f933183c4ec6472cf.tar.gz
merchant-ccd931aee6022853d34f8c8f933183c4ec6472cf.tar.bz2
merchant-ccd931aee6022853d34f8c8f933183c4ec6472cf.zip
fix reference counting bug
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/taler-merchant-httpd_history.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_history.c b/src/backend/taler-merchant-httpd_history.c
index 1d59dc3d..a0051ce0 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -53,7 +53,6 @@ unsigned int current = 0;
* @param refund refund deadline
* @param total_amount total amount we receive for the contract after fees
*/
-
static void
pd_cb (void *cls,
const char *order_id,
@@ -71,27 +70,29 @@ pd_cb (void *cls,
"timestamp", &timestamp,
"merchant", "instance", &instance));
- if (current >= start && current < start + delta)
+ if ( (current >= start) &&
+ (current < start + delta) )
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding history element. Current: %d, start: %d, delta: %d\n",
current,
start,
delta);
- GNUNET_break (NULL != (entry = json_pack ("{s:s, s:o, s:s, s:s}",
+ GNUNET_break (NULL != (entry = json_pack ("{s:s, s:O, s:s, s:s}",
"order_id", order_id,
"amount", amount,
"timestamp", json_string_value (timestamp),
"instance", json_string_value (instance))));
- GNUNET_break (0 == json_array_append_new (response, entry));
-
+ GNUNET_break (0 == json_array_append_new (response,
+ entry));
}
// FIXME to zero after returned.
current++;
}
+
/**
* Manage a /history request. Query the db and returns transactions
* younger than the date given as parameter