taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-style fixes

Browse Source
This commit is contained in:
Christian Grothoff 2015-06-04 10:43:44 +02:00
parent 8a93e84d71
commit b978cba29c
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/taler_mintdb_plugin.h
View File

@ -703,7 +703,7 @@ struct TALER_MINTDB_Plugin
* @param balance the amount that has to be added to the reserve * @param balance the amount that has to be added to the reserve
* @param details bank transaction details justifying the increment, * @param details bank transaction details justifying the increment,
* must be unique for each incoming transaction * 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 * @return #GNUNET_OK upon success; #GNUNET_NO if the given
* @a details are already known for this @a reserve_pub, * @a details are already known for this @a reserve_pub,
* #GNUNET_SYSERR upon failures (DB error, incompatible currency) * #GNUNET_SYSERR upon failures (DB error, incompatible currency)

13
src/mintdb/plugin_mintdb_postgres.c
View File

@ -1118,7 +1118,7 @@ reserves_update (void *cls,
* @param balance the amount that has to be added to the reserve * @param balance the amount that has to be added to the reserve
* @param details bank transaction details justifying the increment, * @param details bank transaction details justifying the increment,
* must be unique for each incoming transaction * 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 * @return #GNUNET_OK upon success; #GNUNET_NO if the given
* @a details are already known for this @a reserve_pub, * @a details are already known for this @a reserve_pub,
* #GNUNET_SYSERR upon failures (DB error, incompatible currency) * #GNUNET_SYSERR upon failures (DB error, incompatible currency)
@ -1154,14 +1154,16 @@ postgres_reserves_in_insert (void *cls,
} }
if (GNUNET_NO == reserve_exists) if (GNUNET_NO == reserve_exists)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, /* New reserve, create balance for the first time */
"Reserve does not exist; creating a new one\n");
struct TALER_PQ_QueryParam params[] = { struct TALER_PQ_QueryParam params[] = {
TALER_PQ_query_param_auto_from_type (reserve_pub), TALER_PQ_query_param_auto_from_type (reserve_pub),
TALER_PQ_query_param_amount (balance), TALER_PQ_query_param_amount (balance),
TALER_PQ_query_param_absolute_time (&expiry), TALER_PQ_query_param_absolute_time (&expiry),
TALER_PQ_query_param_end 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, result = TALER_PQ_exec_prepared (session->conn,
"reserve_create", "reserve_create",
params); params);
@ -1173,7 +1175,7 @@ postgres_reserves_in_insert (void *cls,
} }
else else
{ {
/* Update reserve */ /* Update reserve balance */
updated_reserve.pub = reserve.pub; updated_reserve.pub = reserve.pub;
if (GNUNET_OK != if (GNUNET_OK !=
@ -1195,6 +1197,7 @@ postgres_reserves_in_insert (void *cls,
result = NULL; result = NULL;
/* create new incoming transaction, SQL "primary key" logic /* create new incoming transaction, SQL "primary key" logic
is used to guard against duplicates! */ is used to guard against duplicates! */
{
struct TALER_PQ_QueryParam params[] = { struct TALER_PQ_QueryParam params[] = {
TALER_PQ_query_param_auto_from_type (&reserve.pub), TALER_PQ_query_param_auto_from_type (&reserve.pub),
TALER_PQ_query_param_amount (balance), TALER_PQ_query_param_amount (balance),
@ -1202,9 +1205,11 @@ postgres_reserves_in_insert (void *cls,
TALER_PQ_query_param_absolute_time (&expiry), TALER_PQ_query_param_absolute_time (&expiry),
TALER_PQ_query_param_end TALER_PQ_query_param_end
}; };
result = TALER_PQ_exec_prepared (session->conn, result = TALER_PQ_exec_prepared (session->conn,
"reserves_in_add_transaction", "reserves_in_add_transaction",
params); params);
}
if (PGRES_COMMAND_OK != PQresultStatus(result)) if (PGRES_COMMAND_OK != PQresultStatus(result))
{ {
const char *efield; const char *efield;