#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
-#include <ccan/grab_file/grab_file.h>
#include <ccan/str/str.h>
#include <sys/types.h>
#include <sys/stat.h>
}
static void check_includes_build(struct manifest *m,
- bool keep,
unsigned int *timeleft, struct score *score)
{
char *contents;
int fd;
struct ccan_file *mainh = main_header(m);
- tmpsrc = maybe_temp_file(m, "-included.c", keep, mainh->fullname);
- tmpobj = maybe_temp_file(m, ".o", keep, tmpsrc);
+ tmpsrc = temp_file(m, "-included.c", mainh->fullname);
+ tmpobj = temp_file(m, ".o", tmpsrc);
fd = open(tmpsrc, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0)
err(1, "Creating temporary file %s", tmpsrc);
- contents = talloc_asprintf(tmpsrc, "#include <ccan/%s/%s.h>\n",
- m->basename, m->basename);
+ contents = tal_fmt(tmpsrc, "#include <ccan/%s/%s.h>\n",
+ m->modname, m->basename);
if (write(fd, contents, strlen(contents)) != strlen(contents))
err(1, "writing to temporary file %s", tmpsrc);
close(fd);
score->pass = true;
score->score = score->total;
} else {
- score->error = talloc_asprintf(score,
+ score->error = tal_fmt(score,
"#include of the main header file:\n%s",
cmdout);
}