diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/benchmark/taler-aggregator-benchmark.c | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_batch-withdraw.c | 5 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 2 | ||||
| -rw-r--r-- | src/mhd/mhd_parsing.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c index 665077be..bb7e47b0 100644 --- a/src/benchmark/taler-aggregator-benchmark.c +++ b/src/benchmark/taler-aggregator-benchmark.c @@ -504,7 +504,7 @@ run (void *cls, { struct GNUNET_HashCode seed; struct TALER_AgeMask mask = { - .bits = 1 || 1 << 8 || 1 << 12 || 1 << 16 || 1 << 18 + .bits = 1 | (1 << 8) | (1 << 12) | (1 << 16) | (1 << 18) }; struct TALER_AgeCommitmentProof acp = {0}; diff --git a/src/exchange/taler-exchange-httpd_batch-withdraw.c b/src/exchange/taler-exchange-httpd_batch-withdraw.c index a0a13d93..cf238204 100644 --- a/src/exchange/taler-exchange-httpd_batch-withdraw.c +++ b/src/exchange/taler-exchange-httpd_batch-withdraw.c @@ -173,7 +173,6 @@ batch_withdraw_transaction (void *cls, MHD_RESULT *mhd_ret) { struct BatchWithdrawContext *wc = cls; - struct GNUNET_TIME_Timestamp now; uint64_t ruuid; enum GNUNET_DB_QueryStatus qs; bool balance_ok = false; @@ -213,7 +212,7 @@ batch_withdraw_transaction (void *cls, } wc->kyc.ok = true; qs = TEH_plugin->do_batch_withdraw (TEH_plugin->cls, - now, + wc->now, wc->reserve_pub, &wc->batch_total, &found, @@ -262,7 +261,7 @@ batch_withdraw_transaction (void *cls, qs = TEH_plugin->do_batch_withdraw_insert (TEH_plugin->cls, nonce, &pc->collectable, - now, + wc->now, ruuid, &denom_unknown, &conflict, diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 481c2730..5fb79797 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -10210,6 +10210,7 @@ reserve_expired_cb (void *cls, ret = GNUNET_SYSERR; break; } + // FIXME: ret here is a qs! Bad enum conversion! FIX DESIGN!!! ret = erc->rec (erc->rec_cls, &reserve_pub, &remaining_balance, @@ -15300,6 +15301,7 @@ postgres_delete_shard_locks (void *cls) GNUNET_PQ_EXECUTE_STATEMENT_END }; + // FIXME: rval is a GNUNET_GenericReturnValue, not DB status! return GNUNET_PQ_exec_statements (pg->conn, es); } diff --git a/src/mhd/mhd_parsing.c b/src/mhd/mhd_parsing.c index bae10e72..ee647f4b 100644 --- a/src/mhd/mhd_parsing.c +++ b/src/mhd/mhd_parsing.c @@ -60,7 +60,7 @@ TALER_MHD_parse_post_json (struct MHD_Connection *connection, GNUNET_break (NULL == *json); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Closing connection, upload too large\n"); - return MHD_NO; + return GNUNET_SYSERR; case GNUNET_JSON_PR_JSON_INVALID: GNUNET_break (NULL == *json); return (MHD_YES == |