ccan: update to get improved grab_file API, and adapt code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

ccan/README

@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2602-gfd3fd70c
+CCAN version: init-2605-gc47bf0d9

ccan/ccan/cdump/_info

@@ -33,7 +33,7 @@
  *	size_t j;
  *
  * 	// Read code from stdin.
- * 	code = grab_file(NULL, NULL);
+ * 	code = grab_file_str(NULL, NULL);
  *
  * 	defs = cdump_extract(NULL, code, &problems);
  * 	if (!defs)

ccan/ccan/cdump/tools/cdump-enumstr.c

@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 	if (argc < 2)
 		errx(1, "Usage: cdump-enumstr <filename> [<enums>...]");
 
-	code = grab_file(NULL, streq(argv[1], "-") ? NULL : argv[1]);
+	code = grab_file_str(NULL, streq(argv[1], "-") ? NULL : argv[1]);
 	if (!code)
 		err(1, "Reading %s", argv[1]);
 

ccan/ccan/crc32c/benchmark/bench.c

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
 	if (argc < 2 || (runs = atol(argv[1])) == 0)
 		errx(1, "Usage: bench <num-runs> [<file>]");
 
-	p = grab_file(NULL, argv[2]);
+	p = grab_file_str(NULL, argv[2]);
 	if (!p)
 		err(1, "Reading %s", argv[2] ? argv[2] : "<stdin>");
 	len = tal_count(p) - 1;

ccan/ccan/htable/tools/hsearchspeed.c

@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 	char **w;
 	ENTRY *words, *misswords;
 
-	w = tal_strsplit(NULL, grab_file(NULL,
+	w = tal_strsplit(NULL, grab_file_str(NULL,
 					 argv[1] ? argv[1] : "/usr/share/dict/words"), "\n", STR_NO_EMPTY);
 	num = tal_count(w) - 1;
 	printf("%zu words\n", num);

ccan/ccan/htable/tools/stringspeed.c

@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 	struct htable_str ht;
 	char **words, **misswords;
 
-	words = tal_strsplit(NULL, grab_file(NULL,
+	words = tal_strsplit(NULL, grab_file_str(NULL,
 					     argv[1] ? argv[1] : "/usr/share/dict/words"), "\n",
 			     STR_NO_EMPTY);
 	htable_str_init(&ht);

ccan/ccan/rune/test/run.c

@@ -39,7 +39,7 @@ int main(void)
 	mr = rune_new(NULL, secret_zero, sizeof(secret_zero), NULL); 
 
 	/* Python runes library generates test vectors */
-	vecs = grab_file(mr, "test/test_vectors.csv");
+	vecs = grab_file_str(mr, "test/test_vectors.csv");
 	assert(vecs);
 	lines = tal_strsplit(mr, take(vecs), "\n", STR_NO_EMPTY);
 

ccan/ccan/strset/_info

@@ -32,7 +32,7 @@
  *		char *file, *word;
  *
  *		strset_init(&words);
- *		file = grab_fd(NULL, 0);
+ *		file = grab_fd_str(NULL, 0);
  *		if (!file)
  *			err(1, "Reading stdin");
  *

ccan/ccan/strset/tools/cbspeed.c

@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
 	critbit0_tree ct;
 	char **words, **misswords;
 
-	words = tal_strsplit(NULL, grab_file(NULL,
+	words = tal_strsplit(NULL, grab_file_str(NULL,
 					 argv[1] ? argv[1] : "/usr/share/dict/words"), "\n", STR_NO_EMPTY);
 	ct.root = NULL;
 	num = tal_count(words) - 1;

ccan/ccan/strset/tools/speed.c

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	struct strset set;
 	char **words, **misswords;
 
-	words = tal_strsplit(NULL, grab_file(NULL,
+	words = tal_strsplit(NULL, grab_file_str(NULL,
 					     argv[1] ? argv[1] : "/usr/share/dict/words"),
 			     "\n", STR_NO_EMPTY);
 	strset_init(&set);