X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;fp=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;h=83a19e2cea57ad041f5c71584a9eb5beb23b008d;hp=2a47d0eb97fc7f3ded74a6ef01e676a1cd8fae75;hb=10e5e329a1a8804ff6461e1724071364cf6be572;hpb=a64257be339a8485f66ca9bafd6be7077aa873cd diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c index 2a47d0eb..83a19e2c 100644 --- a/tools/ccanlint/tests/depends_accurate.c +++ b/tools/ccanlint/tests/depends_accurate.c @@ -22,7 +22,7 @@ static bool has_dep(struct manifest *m, char **deps, bool *used, unsigned int i; /* We can include ourselves, of course. */ - if (streq(depname + strlen("ccan/"), m->basename)) + if (streq(depname + strlen("ccan/"), m->modname)) return true; for (i = 0; deps[i]; i++) { @@ -48,7 +48,7 @@ static bool check_dep_includes(struct manifest *m, char *mod; if (!strreg(f, lines[i], "^[ \t]*#[ \t]*include[ \t]*[<\"]" - "(ccan/+[^/]+)/", &mod)) + "(ccan/+.+)/+[^/]+.h", &mod)) continue; if (has_dep(m, deps, used, mod))