X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fheaders_idempotent.c;h=f23784e4a2870c4b93cb9f7813aeb3b1d60464ef;hp=a1d30961f2035bc0dadbd9d557d9444f78f2edd5;hb=ad6a6711a1b703793e49206e10d6dcf1722eb424;hpb=7bb7cd58c2d9df126dd6072e5f3bec1eb4dc916b diff --git a/tools/ccanlint/tests/headers_idempotent.c b/tools/ccanlint/tests/headers_idempotent.c index a1d30961..f23784e4 100644 --- a/tools/ccanlint/tests/headers_idempotent.c +++ b/tools/ccanlint/tests/headers_idempotent.c @@ -27,7 +27,7 @@ static void fix_name(char *name) unsigned int i; for (i = 0; name[i]; i++) { - if (isalnum(name[i])) + if (cisalnum(name[i])) name[i] = toupper(name[i]); else name[i] = '_'; @@ -145,18 +145,16 @@ static void check_idem(struct ccan_file *f, struct score *score) if (!get_token(&line, "#")) abort(); if (!get_token(&line, "define")) { - char *str = talloc_asprintf(score, - "expected '#define %s'", - line_info[i].cond->symbol); - score_file_error(score, f, i+1, str); + score_file_error(score, f, i+1, + "expected '#define %s'", + line_info[i].cond->symbol); return; } sym = get_symbol_token(f, &line); if (!sym || !streq(sym, line_info[i].cond->symbol)) { - char *str = talloc_asprintf(score, - "expected '#define %s'", - line_info[i].cond->symbol); - score_file_error(score, f, i+1, str); + score_file_error(score, f, i+1, + "expected '#define %s'", + line_info[i].cond->symbol); return; } @@ -181,11 +179,13 @@ static void check_idempotent(struct manifest *m, { struct ccan_file *f; + /* We don't fail ccanlint for this. */ + score->pass = true; + list_for_each(&m->h_files, f, list) { check_idem(f, score); } if (!score->error) { - score->pass = true; score->score = score->total; } }