diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-06-22 19:48:18 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-06-22 19:48:18 +0200 |
commit | 9fb6ea320337fba12437f70c3172917a2e76cb3b (patch) | |
tree | 28154d16390de4e99ca92ed7d4ab8eade3531835 | |
parent | ba5af82db137c465a84e44b85aeb7aa6fed0c957 (diff) | |
download | exchange-9fb6ea320337fba12437f70c3172917a2e76cb3b.tar.gz exchange-9fb6ea320337fba12437f70c3172917a2e76cb3b.zip |
fix auditor-offline issue
-rw-r--r-- | src/exchange-tools/taler-auditor-offline.c | 14 | ||||
-rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 1 |
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 17ae10834..81e2bfeb7 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) | |||
884 | { | 884 | { |
885 | json_error_t err; | 885 | json_error_t err; |
886 | 886 | ||
887 | out = json_loadf (stdin, | 887 | in = json_loadf (stdin, |
888 | JSON_REJECT_DUPLICATES, | 888 | JSON_REJECT_DUPLICATES, |
889 | &err); | 889 | &err); |
890 | if (NULL == in) | 890 | if (NULL == in) |
891 | { | 891 | { |
892 | fprintf (stderr, | 892 | fprintf (stderr, |
@@ -958,7 +958,11 @@ do_show (char *const *args) | |||
958 | 958 | ||
959 | keys = parse_keys ("show"); | 959 | keys = parse_keys ("show"); |
960 | if (NULL == keys) | 960 | if (NULL == keys) |
961 | { | ||
962 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
963 | "Showing failed: no valid input\n"); | ||
961 | return; | 964 | return; |
965 | } | ||
962 | if (GNUNET_OK != | 966 | if (GNUNET_OK != |
963 | GNUNET_JSON_parse (keys, | 967 | GNUNET_JSON_parse (keys, |
964 | spec, | 968 | spec, |
@@ -1155,7 +1159,11 @@ do_sign (char *const *args) | |||
1155 | 1159 | ||
1156 | keys = parse_keys ("sign"); | 1160 | keys = parse_keys ("sign"); |
1157 | if (NULL == keys) | 1161 | if (NULL == keys) |
1162 | { | ||
1163 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
1164 | "Signing failed: no valid input\n"); | ||
1158 | return; | 1165 | return; |
1166 | } | ||
1159 | if (GNUNET_OK != | 1167 | if (GNUNET_OK != |
1160 | load_offline_key (GNUNET_NO)) | 1168 | load_offline_key (GNUNET_NO)) |
1161 | { | 1169 | { |
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 9032d0da1..0be6b3eee 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, | |||
3551 | 3551 | ||
3552 | /* Create new incoming transaction, "ON CONFLICT DO NOTHING" | 3552 | /* Create new incoming transaction, "ON CONFLICT DO NOTHING" |
3553 | is again used to guard against duplicates. */ | 3553 | is again used to guard against duplicates. */ |
3554 | |||
3555 | { | 3554 | { |
3556 | enum GNUNET_DB_QueryStatus qs2; | 3555 | enum GNUNET_DB_QueryStatus qs2; |
3557 | 3556 | ||