#include <tools/tools.h>
#include <ccan/htable/htable_type.h>
#include <ccan/foreach/foreach.h>
-#include <ccan/talloc/talloc.h>
-#include <ccan/grab_file/grab_file.h>
#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
#include <ccan/hash/hash.h>
#include <ccan/read_write_all/read_write_all.h>
#include <errno.h>
static const char *can_run(struct manifest *m)
{
if (!config_header)
- return talloc_strdup(m, "Could not read config.h");
+ return tal_strdup(m, "Could not read config.h");
return NULL;
}
info = get_ccan_line_info(f);
struct pp_conditions *prev = NULL;
- for (i = 0; i < f->num_lines; i++) {
+ for (i = 0; f->lines[i]; i++) {
if (info[i].cond && info[i].cond != prev) {
num += add_options(opts, info[i].cond);
prev = info[i].cond;
static struct htable_option *get_config_options(struct manifest *m)
{
- const char **lines = (const char **)strsplit(m, config_header, "\n");
+ const char **lines = (const char **)tal_strsplit(m, config_header, "\n",
+ STR_EMPTY_OK);
unsigned int i;
struct htable_option *opts = htable_option_new();
- for (i = 0; i < talloc_array_length(lines) - 1; i++) {
+ for (i = 0; i < tal_count(lines) - 1; i++) {
char *sym;
if (!get_token(&lines[i], "#"))
}
static void do_reduce_features(struct manifest *m,
- unsigned int *timeleft, struct score *score)
+ unsigned int *timeleft UNNEEDED,
+ struct score *score)
{
struct htable_option *options_used, *options_avail, *options;
struct htable_option_iter i;
return;
/* Now make our own config.h variant, with our own options. */
- hdr = talloc_strdup(m, "/* Modified by reduce_features */\n");
- hdr = talloc_append_string(hdr, config_header);
+ hdr = tal_strcat(m, "/* Modified by reduce_features */\n",
+ config_header);
for (sym = htable_option_first(options, &i);
sym;
sym = htable_option_next(options, &i)) {
- hdr = talloc_asprintf_append
- (hdr, "#undef %s\n#define %s 0\n", sym, sym);
+ tal_append_fmt(&hdr, "#undef %s\n#define %s 0\n", sym, sym);
}
if (mkdir("reduced-features", 0700) != 0 && errno != EEXIST)
err(1, "Creating reduced-features directory");
err(1, "Creating reduced-features/config.h");
if (!write_all(fd, hdr, strlen(hdr)))
err(1, "Writing reduced-features/config.h");
+ htable_option_free(options);
close(fd);
features_were_reduced = true;
}