X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fnamespacize.c;h=0ed36aa6acf8f7ae8ae2b28636b6c80af3cdeba0;hp=6393d72e3d4a03e97255325d7e2d6f420a03242a;hb=46b1a03e21303e03b68de213b41c0840767fbc96;hpb=30b5119b127b739e369cf497d830e8f2a97591f7

diff --git a/tools/namespacize.c b/tools/namespacize.c
index 6393d72e..0ed36aa6 100644
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -10,14 +10,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "ccan/string/string.h"
+#include "ccan/str/str.h"
+#include "ccan/str_talloc/str_talloc.h"
+#include "ccan/grab_file/grab_file.h"
 #include "ccan/talloc/talloc.h"
 #include "tools.h"
 
-#define IDENT_CHARS	"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-			"abcdefghijklmnopqrstuvwxyz" \
-			"01234567889_"
-
 static bool verbose = false;
 static int indent = 0;
 #define verbose(args...)						\
@@ -481,7 +479,7 @@ static void adjust_dir(const char *dir)
 
 	verbose("Adjusting %s\n", dir);
 	verbose_indent();
-	for (deps = get_deps(parent, dir); *deps; deps++) {
+	for (deps = get_deps(parent, dir, false); *deps; deps++) {
 		char *depdir;
 		struct adjusted *adj = NULL;
 		struct replace *repl;
@@ -509,17 +507,17 @@ static void adjust_dependents(const char *dir)
 	verbose("Looking for dependents in %s\n", parent);
 	verbose_indent();
 	for (file = get_dir(parent); *file; file++) {
-		char *infoc, **deps;
+		char *info, **deps;
 		bool isdep = false;
 
 		if (basename(*file, *file)[0] == '.')
 			continue;
 
-		infoc = talloc_asprintf(*file, "%s/_info.c", *file);
-		if (access(infoc, R_OK) != 0)
+		info = talloc_asprintf(*file, "%s/_info", *file);
+		if (access(info, R_OK) != 0)
 			continue;
 
-		for (deps = get_deps(*file, *file); *deps; deps++) {
+		for (deps = get_deps(*file, *file, false); *deps; deps++) {
 			if (streq(*deps, base))
 				isdep = true;
 		}