X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fnamespacize.c;h=5ac85f502f2abb0f5cc9cea1d583c68fdf5546d0;hp=3a3fe47ea94503effe8622b1fc9369e4ebeca2f9;hb=62bbea8e5feea7b716c7bc8b41444080a24abc95;hpb=3612661714e86333ceacca7314959a5ed938dc6a

diff --git a/tools/namespacize.c b/tools/namespacize.c
index 3a3fe47e..5ac85f50 100644
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -406,7 +406,7 @@ static void setup_adjust_files(const char *dir,
 static void rename_files(const struct adjusted *adj)
 {
 	while (adj) {
-		if (rename(adj->tmpfile, adj->file) != 0)
+		if (!move_file(adj->tmpfile, adj->file))
 			warn("Could not rename over '%s', we're in trouble",
 			     adj->file);
 		adj = adj->next;
@@ -445,7 +445,7 @@ static struct replace *read_replacement_file(const char *depdir)
 		return NULL;
 	}
 
-	for (line = strsplit(file, file, "\n", NULL); *line; line++)
+	for (line = strsplit(file, file, "\n"); *line; line++)
 		add_replace(&repl, *line);
 	return repl;
 }
@@ -457,9 +457,7 @@ static void adjust_dir(const char *dir)
 
 	verbose("Adjusting %s\n", dir);
 	verbose_indent();
-	for (deps = get_deps(parent, parent, talloc_basename(parent, dir),
-			     false, NULL);
-	     *deps; deps++) {
+	for (deps = get_deps(parent, dir, false, NULL); *deps; deps++) {
 		char *depdir;
 		struct adjusted *adj = NULL;
 		struct replace *repl;
@@ -497,8 +495,7 @@ static void adjust_dependents(const char *dir)
 		if (access(info, R_OK) != 0)
 			continue;
 
-		for (deps = get_deps(*file, talloc_dirname(*file, *file),
-				     talloc_basename(*file, *file), false, NULL);
+		for (deps = get_deps(*file, *file, false, NULL);
 		     *deps; deps++) {
 			if (!strstarts(*deps, "ccan/"))
 				continue;