#include <ccan/noerr/noerr.h>
#include <ccan/foreach/foreach.h>
#include <ccan/asort/asort.h>
+#include <ccan/array_size/array_size.h>
#include "../tools.h"
#include <unistd.h>
#include <sys/types.h>
return strcmp(m->dir, dir) == 0;
}
-HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp, manifest);
+HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp,
+ htable_manifest);
static struct htable_manifest *manifests;
const char *get_ccan_file_contents(struct ccan_file *f)
struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
{
struct ccan_file *f;
+ unsigned int i;
assert(dir[0] == '/');
f->lines = NULL;
f->line_info = NULL;
f->doc_sections = NULL;
- f->compiled[COMPILE_NORMAL] = f->compiled[COMPILE_NOFEAT] = NULL;
+ for (i = 0; i < ARRAY_SIZE(f->compiled); i++)
+ f->compiled[i] = NULL;
f->name = talloc_steal(f, name);
f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
f->contents = NULL;
- f->cov_compiled = NULL;
f->simplified = NULL;
return f;
}
unsigned int len;
struct list_head *list;
- if (!manifests)
- manifests = htable_manifest_new();
+ if (!manifests) {
+ manifests = talloc(NULL, struct htable_manifest);
+ htable_manifest_init(manifests);
+ }
olddir = talloc_getcwd(NULL);
if (!olddir)