#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>
if (fd < 0)
err(1, "Creating temporary file %s", tmpsrc);
- contents = talloc_asprintf(tmpsrc,
+ contents = tal_fmt(tmpsrc,
"#define alignas #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
"#define class #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
"#define constexpr #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
"#define using #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
"#define virtual #DONT_USE_CPLUSPLUS_RESERVED_NAMES\n"
"#include <ccan/%s/%s.h>\n",
- m->basename, m->basename);
+ m->modname, m->basename);
if (write(fd, contents, strlen(contents)) != strlen(contents))
err(1, "writing to temporary file %s", tmpsrc);
close(fd);
tmpobj, &cmdout)) {
score->score = score->total;
} else {
- score->error = talloc_asprintf(score,
+ score->error = tal_fmt(score,
"Main header file with C++ names:\n%s",
cmdout);
}