X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fnamespacize.c;h=931d05f321da8eff3316b57a3abebfd739377637;hp=cf6bc26d7c4983a8d3483c976ecb9428ad8ebaac;hb=786fd5a12b2a0d7f167f5eebf83ff8b96e532c3f;hpb=c6bbde3a1b508d6cbb417ee99d64e4fbd09c865c

diff --git a/tools/namespacize.c b/tools/namespacize.c
index cf6bc26d..931d05f3 100644
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -112,7 +112,7 @@ static void look_for_macros(char *contents, struct replace **repl)
 	for (p = contents; *p; p++) {
 		if (*p == '\n')
 			state = LINESTART;
-		else if (!isspace(*p)) {
+		else if (!cisspace(*p)) {
 			if (state == LINESTART && *p == '#')
 				state = HASH;
 			else if (state==HASH && !strncmp(p, "define", 6)) {
@@ -178,9 +178,9 @@ static char *get_statement(const void *ctx, char **p)
 				return answer;
 			}
 			/* Compress whitespace into a single ' ' */
-			if (isspace(c)) {
+			if (cisspace(c)) {
 				c = ' ';
-				while (isspace((*p)[1]))
+				while (cisspace((*p)[1]))
 					(*p)++;
 			} else if (c == '{' || c == '(' || c == '[') {
 				if (c == '(')
@@ -317,11 +317,11 @@ static char *find_word(char *f, const char *str)
 
 	while ((p = strstr(p, str)) != NULL) {
 		/* Check it's not in the middle of a word. */
-		if (p > f && (isalnum(p[-1]) || p[-1] == '_')) {
+		if (p > f && (cisalnum(p[-1]) || p[-1] == '_')) {
 			p++;
 			continue;
 		}
-		if (isalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
+		if (cisalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
 			p++;
 			continue;
 		}
@@ -351,7 +351,7 @@ static const char *rewrite_file(const char *filename,
 
 			off = p - file;
 			memcpy(new, file, off);
-			if (isupper(repl->string[0]))
+			if (cisupper(repl->string[0]))
 				memcpy(new + off, "CCAN_", 5);
 			else
 				memcpy(new + off, "ccan_", 5);
@@ -458,7 +458,7 @@ static void adjust_dir(const char *dir)
 
 	verbose("Adjusting %s\n", dir);
 	verbose_indent();
-	for (deps = get_deps(parent, dir, false, NULL); *deps; deps++) {
+	for (deps = get_deps(parent, dir, false, compile_info); *deps; deps++) {
 		char *depdir;
 		struct adjusted *adj = NULL;
 		struct replace *repl;
@@ -496,7 +496,7 @@ static void adjust_dependents(const char *dir)
 		if (access(info, R_OK) != 0)
 			continue;
 
-		for (deps = get_deps(*file, *file, false, NULL);
+		for (deps = get_deps(*file, *file, false, compile_info);
 		     *deps; deps++) {
 			if (!strstarts(*deps, "ccan/"))
 				continue;