From f75ec9aba2af0dcf69965d076e76f475e4f9c761 Mon Sep 17 00:00:00 2001 From: Dusty Daemon Date: Sat, 10 Feb 2024 12:40:05 -0500 Subject: [PATCH] fixup! lightningd: Add tx_abort routine to lightningd --- common/wire_error.c | 2 +- lightningd/channel_control.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/wire_error.c b/common/wire_error.c index f99a9f3f0bd6..bb9c6c5b98cf 100644 --- a/common/wire_error.c +++ b/common/wire_error.c @@ -84,7 +84,7 @@ char *sanitize_error(const tal_t *ctx, const u8 *errmsg, struct channel_id dummy; u8 *data; size_t i; - char *tag; + const char *tag; if (!channel_id) channel_id = &dummy; diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c index c61c52ad0320..2cdc75f8e78f 100644 --- a/lightningd/channel_control.c +++ b/lightningd/channel_control.c @@ -323,6 +323,7 @@ static void handle_splice_abort(struct lightningd *ld, &inflight->funding->outpoint)); wallet_inflight_del(ld->wallet, channel, inflight); + tal_free(inflight); } cc = splice_command_for_chan(ld, channel); @@ -366,8 +367,7 @@ static void handle_splice_abort(struct lightningd *ld, &channel->cid))); subd_send_fd(ld->connectd, fds[1]); log_info(channel->log, "Sent the peer fd to channeld"); - } - else { + } else { log_info(channel->log, "peer_start_channeld failed"); close(fds[1]); }