Simplify -I lines: change includes to ccan/

[ccan] / tools / namespacize.c

diff --git a/tools/namespacize.c b/tools/namespacize.c
index 759ef938482f98a3b3aabd267f7e79c2fe56962d..cbee678c3ecf0d03ff02c59cd7b037778aab0989 100644 (file)
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -10,7 +10,9 @@
 #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"
 
@@ -272,7 +274,7 @@ static void analyze_headers(const char *dir, struct replace **repl)
 
        /* Get hold of header, assume that's it. */
        hdr = talloc_asprintf(dir, "%s/%s.h", dir, basename(dir, dir));
-       contents = grab_file(dir, hdr);
+       contents = grab_file(dir, hdr, NULL);
        if (!contents)
                err(1, "Reading %s", hdr);
 
@@ -348,7 +350,7 @@ static const char *rewrite_file(const char *filename,
        int fd;
 
        verbose("Rewriting %s\n", filename);
-       file = grab_file(filename, filename);
+       file = grab_file(filename, filename, NULL);
        if (!file)
                err(1, "Reading file %s", filename);
 
@@ -449,7 +451,7 @@ static struct replace *read_replacement_file(const char *depdir)
        char *replname = talloc_asprintf(depdir, "%s/.namespacize", depdir);
        char *file, **line;
 
-       file = grab_file(replname, replname);
+       file = grab_file(replname, replname, NULL);
        if (!file) {
                if (errno != ENOENT)
                        err(1, "Opening %s", replname);
@@ -476,12 +478,12 @@ static char *parent_dir(const void *ctx, const char *dir)
 
 static void adjust_dir(const char *dir)
 {
-       char *parent = parent_dir(NULL, dir);
+       char *parent = parent_dir(talloc_autofree_context(), dir);
        char **deps;
 
        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;
@@ -497,6 +499,7 @@ static void adjust_dir(const char *dir)
                talloc_free(depdir);
        }
        verbose_unindent();
+       talloc_free(parent);
 }
 
 static void adjust_dependents(const char *dir)
@@ -518,7 +521,7 @@ static void adjust_dependents(const char *dir)
                if (access(infoc, 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;
                }