X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fread_config_header.c;h=bd268722bb2f9d7cb63c04a87c6f0e40dc08a28b;hb=dc8042b42500f79f613b1197df6cdf739615a89f;hp=b168a2f9494d50024410786159aeabef669c03df;hpb=3ea7b4d695237414015f33674d6ba01009e77fd1;p=ccan

diff --git a/tools/read_config_header.c b/tools/read_config_header.c
index b168a2f9..bd268722 100644
--- a/tools/read_config_header.c
+++ b/tools/read_config_header.c
@@ -1,11 +1,8 @@
-#include <ccan/grab_file/grab_file.h>
+#include <ccan/err/err.h>
 #include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc/talloc.h>
 #include "read_config_header.h"
 #include "tools.h"
 #include <string.h>
-#include <err.h>
 
 /* Get an identifier token. */
 char *get_symbol_token(void *ctx, const char **line)
@@ -17,7 +14,7 @@ char *get_symbol_token(void *ctx, const char **line)
 	toklen = strspn(*line, IDENT_CHARS);
 	if (!toklen)
 		return NULL;
-	ret = talloc_strndup(ctx, *line, toklen);
+	ret = tal_strndup(ctx, *line, toklen);
 	*line += toklen;
 	return ret;
 }
@@ -93,19 +90,19 @@ char *read_config_header(const char *ccan_dir,
 			 const char **compiler, const char **cflags,
 			 bool verbose)
 {
-	char *fname = talloc_asprintf(NULL, "%s/config.h", ccan_dir);
+	char *fname = tal_fmt(NULL, "%s/config.h", ccan_dir);
 	char **lines;
 	unsigned int i;
 	char *config_header;
 
-	config_header = grab_file(NULL, fname, NULL);
-	talloc_free(fname);
+	config_header = tal_grab_file(NULL, fname, NULL);
+	tal_free(fname);
 
 	if (!config_header)
 		goto out;
 
-	lines = strsplit(config_header, config_header, "\n");
-	for (i = 0; i < talloc_array_length(lines) - 1; i++) {
+	lines = tal_strsplit(config_header, config_header, "\n", STR_EMPTY_OK);
+	for (i = 0; i < tal_count(lines) - 1; i++) {
 		char *sym;
 		const char **line = (const char **)&lines[i];