X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=5180368b3dda56c080f4eb97ed83fb5875168b13;hp=b8dd467a18e78e76891dd2143962084cb1bde8a5;hb=3b200f895cb7884c72d9e2409f047284027abc68;hpb=27b8937c5ed206e515c7b933f9593d7bc7f350e0

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index b8dd467a..5180368b 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -499,7 +499,7 @@ static char *demangle_string(char *string)
 		if (string[i] == '\\') {
 			char repl;
 			unsigned len = 0;
-			char *p = strchr(mapfrom, string[i+1]);
+			const char *p = strchr(mapfrom, string[i+1]);
 			if (p) {
 				repl = mapto[p - mapfrom];
 				len = 1;
@@ -508,7 +508,7 @@ static char *demangle_string(char *string)
 					repl = (string[i+2]-'0')*16
 						+ string[i+3]-'0';
 					len = 3;
-				} else if (isdigit(string[i+1])) {
+				} else if (cisdigit(string[i+1])) {
 					repl = (string[i+2]-'0')*8*8
 						+ (string[i+3]-'0')*8
 						+ (string[i+4]-'0');
@@ -665,7 +665,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* --target overrides known FAIL from _info */
-	add_info_options(m->info_file, !target);
+	if (m->info_file)
+		add_info_options(m->info_file, !target);
 
 	while ((i = get_next_test(&normal_tests)) != NULL)
 		run_test(i, summary, &score, &total_score, m);