fixup! lightningd: Add tx_abort routine to lightningd

Author: ddustin

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;

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]);
 	}