Fix handling of one-liner fields.

[ccan] / tools / namespacize.c

diff --git a/tools/namespacize.c b/tools/namespacize.c
index 759ef938482f98a3b3aabd267f7e79c2fe56962d..6393d72e3d4a03e97255325d7e2d6f420a03242a 100644 (file)
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -272,7 +272,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 +348,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 +449,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,7 +476,7 @@ 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);
@@ -497,6 +497,7 @@ static void adjust_dir(const char *dir)
                talloc_free(depdir);
        }
        verbose_unindent();
+       talloc_free(parent);
 }
 
 static void adjust_dependents(const char *dir)