mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

lightningd/opening_control.c: Remove predeclaration.

Browse Source
This commit is contained in:
ZmnSCPxj jxPCSnmZ 2020-10-17 08:05:56 +08:00 committed by ZmnSCPxj, ZmnSCPxj jxPCSmnZ
parent 0fd87b85da
commit 2604a81aba
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lightningd/opening_control.c
View File

@ -543,32 +543,6 @@ failed:
tal_free(uc);
}
/* These two functions used to be a single function, pre-declaring
* here in order to reduce review load since the original function
* is not really changed at all in its operation, just need access
* to the cleanup part in a separate piece of code.
*/
static void
opening_funder_failed_cancel_commands(struct uncommitted_channel *uc,
const char *desc);
static void opening_funder_failed(struct subd *openingd, const u8 *msg,
struct uncommitted_channel *uc)
{
char *desc;
if (!fromwire_openingd_funder_failed(msg, msg, &desc)) {
log_broken(uc->log,
"bad OPENING_FUNDER_FAILED %s",
tal_hex(tmpctx, msg));
was_pending(command_fail(uc->fc->cmd, LIGHTNINGD,
"bad OPENING_FUNDER_FAILED %s",
tal_hex(uc->fc->cmd, msg)));
tal_free(uc);
return;
}
opening_funder_failed_cancel_commands(uc, desc);
}
static void
opening_funder_failed_cancel_commands(struct uncommitted_channel *uc,
const char *desc)
@ -598,6 +572,24 @@ opening_funder_failed_cancel_commands(struct uncommitted_channel *uc,
*/
uc->fc = tal_free(uc->fc);
}
static void opening_funder_failed(struct subd *openingd, const u8 *msg,
struct uncommitted_channel *uc)
{
char *desc;
if (!fromwire_openingd_funder_failed(msg, msg, &desc)) {
log_broken(uc->log,
"bad OPENING_FUNDER_FAILED %s",
tal_hex(tmpctx, msg));
was_pending(command_fail(uc->fc->cmd, LIGHTNINGD,
"bad OPENING_FUNDER_FAILED %s",
tal_hex(uc->fc->cmd, msg)));
tal_free(uc);
return;
}
opening_funder_failed_cancel_commands(uc, desc);
}
struct openchannel_hook_payload {
struct subd *openingd;