From 7d1f0c73e4d321561abb74f82c8be97f10d69836 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 21 Sep 2018 17:01:09 +0930 Subject: [PATCH] crypto/shachain/tools: update to new rbuf API. Signed-off-by: Rusty Russell --- ccan/crypto/shachain/tools/Makefile | 5 ++++- ccan/crypto/shachain/tools/shachain48.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ccan/crypto/shachain/tools/Makefile b/ccan/crypto/shachain/tools/Makefile index a1b0177c..f14646ff 100644 --- a/ccan/crypto/shachain/tools/Makefile +++ b/ccan/crypto/shachain/tools/Makefile @@ -5,7 +5,7 @@ CFLAGS=-Wall -Werror -O3 -I$(CCANDIR) -DSHACHAIN_BITS=48 #CFLAGS=-Wall -Werror -g3 -I$(CCANDIR) -DSHACHAIN_BITS=48 # 48 bit index for shachain. This is what lightning uses. -CCAN_OBJS:=ccan-str.o ccan-err.o ccan-hex.o ccan-shachain.o ccan-sha256.o ccan-rbuf.o +CCAN_OBJS:=ccan-str.o ccan-err.o ccan-hex.o ccan-shachain.o ccan-sha256.o ccan-rbuf.o ccan-membuf.o all: shachain48 @@ -15,6 +15,7 @@ shachain48.o: $(CCANDIR)/ccan/crypto/shachain/shachain.h \ $(CCANDIR)/ccan/str/hex/hex.h \ $(CCANDIR)/ccan/str/str.h \ $(CCANDIR)/ccan/err/err.h \ + $(CCANDIR)/ccan/membuf/membuf.h \ $(CCANDIR)/ccan/rbuf/rbuf.h shachain48.o $(CCAN_OBJS): $(CCANDIR)/config.h @@ -37,3 +38,5 @@ ccan-sha256.o: $(CCANDIR)/ccan/crypto/sha256/sha256.c $(CC) $(CFLAGS) -c -o $@ $< ccan-rbuf.o: $(CCANDIR)/ccan/rbuf/rbuf.c $(CC) $(CFLAGS) -c -o $@ $< +ccan-membuf.o: $(CCANDIR)/ccan/membuf/membuf.c + $(CC) $(CFLAGS) -c -o $@ $< diff --git a/ccan/crypto/shachain/tools/shachain48.c b/ccan/crypto/shachain/tools/shachain48.c index 5cc91090..85dbf062 100644 --- a/ccan/crypto/shachain/tools/shachain48.c +++ b/ccan/crypto/shachain/tools/shachain48.c @@ -16,9 +16,9 @@ int main(int argc, char *argv[]) char *p; shachain_init(&s); - rbuf_init(&rbuf, STDIN_FILENO, malloc(size), size); + rbuf_init(&rbuf, STDIN_FILENO, malloc(size), size, membuf_realloc); - while ((p = rbuf_read_str(&rbuf, '\n', realloc)) != NULL) { + while ((p = rbuf_read_str(&rbuf, '\n')) != NULL) { struct sha256 hash; unsigned long long idx; -- 2.39.2