summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-06-22 19:48:18 +0200
committerChristian Grothoff <christian@grothoff.org>2021-06-22 19:48:18 +0200
commit9fb6ea320337fba12437f70c3172917a2e76cb3b (patch)
tree28154d16390de4e99ca92ed7d4ab8eade3531835
parentba5af82db137c465a84e44b85aeb7aa6fed0c957 (diff)
downloadexchange-9fb6ea320337fba12437f70c3172917a2e76cb3b.tar.gz
exchange-9fb6ea320337fba12437f70c3172917a2e76cb3b.tar.bz2
exchange-9fb6ea320337fba12437f70c3172917a2e76cb3b.zip
fix auditor-offline issue
-rw-r--r--src/exchange-tools/taler-auditor-offline.c14
-rw-r--r--src/exchangedb/plugin_exchangedb_postgres.c1
2 files changed, 11 insertions, 4 deletions
diff --git a/src/exchange-tools/taler-auditor-offline.c b/src/exchange-tools/taler-auditor-offline.c
index 17ae1083..81e2bfeb 100644
--- a/src/exchange-tools/taler-auditor-offline.c
+++ b/src/exchange-tools/taler-auditor-offline.c
@@ -884,9 +884,9 @@ parse_keys (const char *command_name)
{
json_error_t err;
- out = json_loadf (stdin,
- JSON_REJECT_DUPLICATES,
- &err);
+ in = json_loadf (stdin,
+ JSON_REJECT_DUPLICATES,
+ &err);
if (NULL == in)
{
fprintf (stderr,
@@ -958,7 +958,11 @@ do_show (char *const *args)
keys = parse_keys ("show");
if (NULL == keys)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Showing failed: no valid input\n");
return;
+ }
if (GNUNET_OK !=
GNUNET_JSON_parse (keys,
spec,
@@ -1155,7 +1159,11 @@ do_sign (char *const *args)
keys = parse_keys ("sign");
if (NULL == keys)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Signing failed: no valid input\n");
return;
+ }
if (GNUNET_OK !=
load_offline_key (GNUNET_NO))
{
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 9032d0da..0be6b3ee 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -3551,7 +3551,6 @@ postgres_reserves_in_insert (void *cls,
/* Create new incoming transaction, "ON CONFLICT DO NOTHING"
is again used to guard against duplicates. */
-
{
enum GNUNET_DB_QueryStatus qs2;