ccanlint: remove argument to -k/--keep

[ccan] / tools / ccanlint / tests / reduce_features.c

diff --git a/tools/ccanlint/tests/reduce_features.c b/tools/ccanlint/tests/reduce_features.c
index 39a2bde067a96dbc0072514f5633eebff39974aa..6b4bd1571a857e97a09dbb7b0cbb559fb14b5d5d 100644 (file)
--- a/tools/ccanlint/tests/reduce_features.c
+++ b/tools/ccanlint/tests/reduce_features.c
@@ -40,7 +40,20 @@ static bool option_cmp(const char *name1, const char *name2)
        return streq(name1, name2);
 }
 
-HTABLE_DEFINE_TYPE(char, option_name, option_hash, option_cmp, option);
+HTABLE_DEFINE_TYPE(char, option_name, option_hash, option_cmp, htable_option);
+
+static struct htable_option *htable_option_new(void)
+{
+       struct htable_option *opts = malloc(sizeof(*opts));
+       htable_option_init(opts);
+       return opts;
+}
+
+static void htable_option_free(struct htable_option *opts)
+{
+       htable_option_clear(opts);
+       free(opts);
+}
 
 static unsigned int add_options(struct htable_option *opts,
                                struct pp_conditions *cond)
@@ -116,7 +129,6 @@ static struct htable_option *get_config_options(struct manifest *m)
 }
 
 static void do_reduce_features(struct manifest *m,
-                              bool keep,
                               unsigned int *timeleft, struct score *score)
 {
        struct htable_option *options_used, *options_avail, *options;
@@ -160,10 +172,10 @@ static void do_reduce_features(struct manifest *m,
                hdr = talloc_asprintf_append
                        (hdr, "#undef %s\n#define %s 0\n", sym, sym);
        }
-       if (mkdir("reduced-features", 0700) != 0)
+       if (mkdir("reduced-features", 0700) != 0 && errno != EEXIST)
                err(1, "Creating reduced-features directory");
 
-       fd = open("reduced-features/config.h", O_EXCL|O_CREAT|O_RDWR, 0600);
+       fd = open("reduced-features/config.h", O_TRUNC|O_CREAT|O_RDWR, 0600);
        if (fd < 0)
                err(1, "Creating reduced-features/config.h");
        if (!write_all(fd, hdr, strlen(hdr)))