aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

libplugin: generalize the plugin_timer callback type

Browse Source 
We don't take the callback result into account, so it can better be void.
Having a general callback parameter is handy, because for bcli we want
to pass it the struct bcli.
This commit is contained in:
darosior
2020-02-03 22:27:46 +01:00
committed by Rusty Russell
parent b0b55d36ef
commit 3eb0f56f87
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/libplugin.c
View File

@@ -25,7 +25,8 @@ bool deprecated_apis;
struct plugin_timer {
struct timer timer;
struct command_result *(*cb)(struct plugin *p);
void (*cb)(void *cb_arg);
void *cb_arg;
};
struct rpc_conn {
@@ -820,7 +821,7 @@ static void call_plugin_timer(struct plugin *p, struct timer *timer)
p->in_timer++;
/* Free this if they don't. */
tal_steal(tmpctx, t);
t->cb(p);
t->cb(t->cb_arg);
}
static void destroy_plugin_timer(struct plugin_timer *timer, struct plugin *p)
@@ -829,10 +830,12 @@ static void destroy_plugin_timer(struct plugin_timer *timer, struct plugin *p)
}
struct plugin_timer *plugin_timer(struct plugin *p, struct timerel t,
struct command_result *(*cb)(struct plugin *p))
void (*cb)(void *cb_arg),
void *cb_arg)
{
struct plugin_timer *timer = tal(NULL, struct plugin_timer);
timer->cb = cb;
timer->cb_arg = cb_arg;
timer_init(&timer->timer);
timer_addrel(&p->timers, &timer->timer, t);
tal_add_destructor2(timer, destroy_plugin_timer, p);