#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
#include <sys/types.h>
#include <sys/stat.h>
/* 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))
if (fprintf(out, "#ifndef %s\n#define %s\n", name, name) < 0)
err(1, "Writing %s", tmpname);
- for (i = 0; i < e->file->num_lines; i++)
+ for (i = 0; e->file->lines[i]; i++)
if (fprintf(out, "%s\n", e->file->lines[i]) < 0)
err(1, "Writing %s", tmpname);
const char *line, *sym;
line_info = get_ccan_line_info(f);
- if (f->num_lines < 3)
+ if (tal_count(f->lines) < 4)
/* FIXME: We assume small headers probably uninteresting. */
return;
- for (i = 0; i < f->num_lines; i++) {
+ for (i = 0; f->lines[i]; i++) {
if (line_info[i].type == DOC_LINE
|| line_info[i].type == COMMENT_LINE)
continue;
}
/* No code at all? Don't complain. */
- if (i == f->num_lines)
+ if (!f->lines[i])
return;
first_preproc_line = i;
- for (i = first_preproc_line+1; i < f->num_lines; i++) {
+ for (i = first_preproc_line+1; f->lines[i]; i++) {
if (line_info[i].type == DOC_LINE
|| line_info[i].type == COMMENT_LINE)
continue;
}
/* No code at all? Weird. */
- if (i == f->num_lines)
+ if (!f->lines[i])
return;
/* We expect a condition on this line. */
}
/* Rest of code should all be covered by that conditional. */
- for (i++; i < f->num_lines; i++) {
+ for (i++; f->lines[i]; i++) {
unsigned int val = 0;
if (line_info[i].type == DOC_LINE
|| line_info[i].type == COMMENT_LINE)