X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdoc_extract.c;h=99c3202ca0bf2ccd1034b113a02cc71a6a27fe32;hp=b819038888c9df5aee2f879c11eac5b2e7f669a8;hb=8d9d288e9a77cc58bbc2a0cb9274962139638c5b;hpb=2f780d578cf2c102957f7872f6edbcbffb8cba69

diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index b8190388..99c3202c 100644
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -1,11 +1,10 @@
 /* This merely extracts, doesn't do XML or anything. */
-#include <err.h>
+#include <ccan/str/str.h>
+#include <ccan/err/err.h>
+#include <ccan/tal/grab_file/grab_file.h>
+#include "tools.h"
 #include <string.h>
 #include <stdio.h>
-#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc/talloc.h>
-#include <ccan/grab_file/grab_file.h>
 #include "doc_extract.h"
 
 /* We regard non-alphanumerics as equiv. */
@@ -47,15 +46,15 @@ int main(int argc, char *argv[])
 		struct list_head *list;
 		struct doc_section *d;
 
-		file = grab_file(NULL, argv[i], NULL);
+		file = grab_file(NULL, argv[i]);
 		if (!file)
 			err(1, "Reading file %s", argv[i]);
-		lines = strsplit(file, file, "\n");
+		lines = tal_strsplit(file, file, "\n", STR_EMPTY_OK);
 
-		list = extract_doc_sections(lines);
+		list = extract_doc_sections(lines, argv[i]);
 		if (list_empty(list))
 			errx(1, "No documentation in file %s", argv[i]);
-		talloc_free(file);
+		tal_free(file);
 
 		if (streq(type, "functions")) {
 			const char *last = NULL;
@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
 					printf("%s\n", d->lines[j]);
 			}
 		}
-		talloc_free(list);
+		tal_free(list);
 	}
 	return 0;
 }