From 38bc04907ba1257eb1a92cab8f71c439ae4308f8 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 23 Mar 2023 16:18:09 +1030 Subject: [PATCH] onchaind: two minor tidyups. Firstly, amount should not be `static`, so use a separate line to declare those (fee is static, as it's cached across calls). Secondly, new_tracked_output doesn't take(), it copies. Signed-off-by: Rusty Russell --- onchaind/onchaind.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c index 654a6f72d..30c4c4386 100644 --- a/onchaind/onchaind.c +++ b/onchaind/onchaind.c @@ -493,7 +493,8 @@ static bool set_htlc_timeout_fee(struct bitcoin_tx *tx, const struct bitcoin_signature *remotesig, const u8 *wscript) { - static struct amount_sat amount, fee = AMOUNT_SAT_INIT(UINT64_MAX); + static struct amount_sat fee = AMOUNT_SAT_INIT(UINT64_MAX); + struct amount_sat amount; struct amount_asset asset = bitcoin_tx_output_get_amount(tx, 0); size_t weight; @@ -541,7 +542,8 @@ static void set_htlc_success_fee(struct bitcoin_tx *tx, const struct bitcoin_signature *remotesig, const u8 *wscript) { - static struct amount_sat amt, fee = AMOUNT_SAT_INIT(UINT64_MAX); + static struct amount_sat fee = AMOUNT_SAT_INIT(UINT64_MAX); + struct amount_sat amt; struct amount_asset asset; size_t weight; @@ -990,7 +992,7 @@ new_tracked_output(struct tracked_output ***outs, enum output_type output_type, const struct htlc_stub *htlc, const u8 *wscript, - const struct bitcoin_signature *remote_htlc_sig TAKES) + const struct bitcoin_signature *remote_htlc_sig) { struct tracked_output *out = tal(*outs, struct tracked_output);