From c2d71497ff1238b84c53e09eb9fb8c120d00a705 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 9 Nov 2016 18:56:38 +1030 Subject: [PATCH] opt, utils: new arg for wrappers due to low-level tal change. Signed-off-by: Rusty Russell --- daemon/lightning-cli.c | 3 ++- daemon/lightningd.c | 2 +- utils.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/daemon/lightning-cli.c b/daemon/lightning-cli.c index 0df904e3a..de6cfd6ca 100644 --- a/daemon/lightning-cli.c +++ b/daemon/lightning-cli.c @@ -23,7 +23,8 @@ /* Tal wrappers for opt. */ static void *opt_allocfn(size_t size) { - return tal_alloc_(NULL, size, false, TAL_LABEL("opt_allocfn", "")); + return tal_alloc_(NULL, size, false, false, + TAL_LABEL("opt_allocfn", "")); } static void *tal_reallocfn(void *ptr, size_t size) diff --git a/daemon/lightningd.c b/daemon/lightningd.c index 996960228..bf0deb41c 100644 --- a/daemon/lightningd.c +++ b/daemon/lightningd.c @@ -376,7 +376,7 @@ static struct lightningd_state *lightningd_state(void) /* Tal wrappers for opt. */ static void *opt_allocfn(size_t size) { - return tal_alloc_(NULL, size, false, TAL_LABEL("opt_allocfn", "")); + return tal_alloc_(NULL, size, false, false, TAL_LABEL("opt_allocfn", "")); } static void *tal_reallocfn(void *ptr, size_t size) diff --git a/utils.h b/utils.h index cf6d0492a..963bcbfb1 100644 --- a/utils.h +++ b/utils.h @@ -11,7 +11,7 @@ char *tal_hexstr(const tal_t *ctx, const void *data, size_t len); u8 *tal_hexdata(const tal_t *ctx, const void *str, size_t len); #define tal_tmpctx(ctx) \ - tal_alloc_((ctx), 0, false, \ + tal_alloc_((ctx), 0, false, false, \ __FILE__ ":" stringify(__LINE__) ":tal_tmpctx") #endif /* LIGHTNING_UTILS_H */