aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-06-04 10:43:44 +0200
committerChristian Grothoff <christian@grothoff.org>2015-06-04 10:43:44 +0200
commitb978cba29cc2209481fcdb60b9ae44877962b9b6 (patch)
tree7aca71021377565666a3e5b785c4bceab449ae43 /src
parent8a93e84d7142aa5d5826a6b51cb19c093f71ca1b (diff)
-style fixes
Diffstat (limited to 'src')
-rw-r--r--src/include/taler_mintdb_plugin.h2
-rw-r--r--src/mintdb/plugin_mintdb_postgres.c33
2 files changed, 20 insertions, 15 deletions
diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index d7f8e6b4f..d41538fb1 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -703,7 +703,7 @@ struct TALER_MINTDB_Plugin
* @param balance the amount that has to be added to the reserve
* @param details bank transaction details justifying the increment,
* must be unique for each incoming transaction
- * @param expiry the new expiration time for the reserve
+ * @param expiry the new expiration time for the reserve (#3809)
* @return #GNUNET_OK upon success; #GNUNET_NO if the given
* @a details are already known for this @a reserve_pub,
* #GNUNET_SYSERR upon failures (DB error, incompatible currency)
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index 1cc2cfe53..d7f37517f 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -1118,7 +1118,7 @@ reserves_update (void *cls,
* @param balance the amount that has to be added to the reserve
* @param details bank transaction details justifying the increment,
* must be unique for each incoming transaction
- * @param expiry the new expiration time for the reserve
+ * @param expiry the new expiration time for the reserve (#3809)
* @return #GNUNET_OK upon success; #GNUNET_NO if the given
* @a details are already known for this @a reserve_pub,
* #GNUNET_SYSERR upon failures (DB error, incompatible currency)
@@ -1154,14 +1154,16 @@ postgres_reserves_in_insert (void *cls,
}
if (GNUNET_NO == reserve_exists)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Reserve does not exist; creating a new one\n");
+ /* New reserve, create balance for the first time */
struct TALER_PQ_QueryParam params[] = {
TALER_PQ_query_param_auto_from_type (reserve_pub),
TALER_PQ_query_param_amount (balance),
TALER_PQ_query_param_absolute_time (&expiry),
TALER_PQ_query_param_end
};
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserve does not exist; creating a new one\n");
result = TALER_PQ_exec_prepared (session->conn,
"reserve_create",
params);
@@ -1173,7 +1175,7 @@ postgres_reserves_in_insert (void *cls,
}
else
{
- /* Update reserve */
+ /* Update reserve balance */
updated_reserve.pub = reserve.pub;
if (GNUNET_OK !=
@@ -1195,16 +1197,19 @@ postgres_reserves_in_insert (void *cls,
result = NULL;
/* create new incoming transaction, SQL "primary key" logic
is used to guard against duplicates! */
- struct TALER_PQ_QueryParam params[] = {
- TALER_PQ_query_param_auto_from_type (&reserve.pub),
- TALER_PQ_query_param_amount (balance),
- TALER_PQ_query_param_fixed_size (details, strlen (details)),
- TALER_PQ_query_param_absolute_time (&expiry),
- TALER_PQ_query_param_end
- };
- result = TALER_PQ_exec_prepared (session->conn,
- "reserves_in_add_transaction",
- params);
+ {
+ struct TALER_PQ_QueryParam params[] = {
+ TALER_PQ_query_param_auto_from_type (&reserve.pub),
+ TALER_PQ_query_param_amount (balance),
+ TALER_PQ_query_param_fixed_size (details, strlen (details)),
+ TALER_PQ_query_param_absolute_time (&expiry),
+ TALER_PQ_query_param_end
+ };
+
+ result = TALER_PQ_exec_prepared (session->conn,
+ "reserves_in_add_transaction",
+ params);
+ }
if (PGRES_COMMAND_OK != PQresultStatus(result))
{
const char *efield;