]> git.ozlabs.org Git - ccan/blobdiff - tools/read_config_header.c
base64: fix for unsigned chars (e.g. ARM).
[ccan] / tools / read_config_header.c
index 2701c9023ec92f1e68e3b16bb768f68bb396831c..da3e00cd73ba7088981d7a40ad3b995c4ad48e2b 100644 (file)
@@ -1,6 +1,7 @@
 #include <ccan/err/err.h>
 #include <ccan/str/str.h>
 #include <ccan/tal/path/path.h>
+#include <ccan/tal/grab_file/grab_file.h>
 #include "read_config_header.h"
 #include "tools.h"
 #include <string.h>
@@ -94,11 +95,12 @@ char *read_config_header(const char *ccan_dir, bool verbose)
        unsigned int i;
        char *config_header;
 
-       config_header = tal_grab_file(NULL, fname, NULL);
-       tal_free(fname);
+       config_header = grab_file(NULL, fname);
 
-       if (!config_header)
+       if (!config_header) {
+               tal_free(fname);
                return NULL;
+       }
 
        lines = tal_strsplit(config_header, config_header, "\n", STR_EMPTY_OK);
        for (i = 0; i < tal_count(lines) - 1; i++) {
@@ -128,5 +130,6 @@ char *read_config_header(const char *ccan_dir, bool verbose)
                                       fname, cflags);
                }
        }
+       tal_free(fname);
        return config_header;
 }