X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fheaders_idempotent.c;h=d7c890916b1f541037bc50ace35ee10cdf0aa533;hb=49a1a4366fdcea418582a97cb0bf700373b89868;hp=bf8c9f2dad8e61e406c40b6399aeae98fa12129b;hpb=af5b1a18948345c5f9f9abf4eda3ab9fe0aa9a9f;p=ccan diff --git a/tools/ccanlint/tests/headers_idempotent.c b/tools/ccanlint/tests/headers_idempotent.c index bf8c9f2d..d7c89091 100644 --- a/tools/ccanlint/tests/headers_idempotent.c +++ b/tools/ccanlint/tests/headers_idempotent.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -46,13 +45,13 @@ static void handle_idem(struct manifest *m, struct score *score) /* Main header gets CCAN_FOO_H, others CCAN_FOO_XXX_H */ if (strstarts(e->file->name, m->basename) || strlen(e->file->name) == strlen(m->basename) + 2) - name = talloc_asprintf(score, "CCAN_%s_H", m->basename); + name = tal_fmt(score, "CCAN_%s_H", m->modname); else - name = talloc_asprintf(score, "CCAN_%s_%s", - m->basename, e->file->name); + name = tal_fmt(score, "CCAN_%s_%s", + m->modname, e->file->name); fix_name(name); - q = talloc_asprintf(score, + q = tal_fmt(score, "Should I wrap %s in #ifndef/#define %s for you?", e->file->name, name); if (!ask(q))