There's no reason to hand in the name of the compiled _info file,
since we don't compile it up in safe mode.
recurse, NULL);
else
deps = get_safe_ccan_deps(talloc_autofree_context(),
recurse, NULL);
else
deps = get_safe_ccan_deps(talloc_autofree_context(),
- argv[1], recurse, NULL);
for (i = 0; deps[i]; i++)
if (strstarts(deps[i], "ccan/") == ccan)
for (i = 0; deps[i]; i++)
if (strstarts(deps[i], "ccan/") == ccan)
*strrchr(updir, '/') = '\0';
if (safe_mode)
*strrchr(updir, '/') = '\0';
if (safe_mode)
- deps = get_safe_ccan_deps(m, m->dir, true,
- &m->info_file->compiled);
+ deps = get_safe_ccan_deps(m, m->dir, true);
else
deps = get_deps(m, m->dir, true, &m->info_file->compiled);
else
deps = get_deps(m, m->dir, true, &m->info_file->compiled);
}
char **get_safe_ccan_deps(const void *ctx, const char *dir,
}
char **get_safe_ccan_deps(const void *ctx, const char *dir,
- bool recurse, char **infofile)
{
if (!recurse) {
unsigned int num;
{
if (!recurse) {
unsigned int num;
- return get_one_safe_deps(ctx, dir, &num, infofile);
+ return get_one_safe_deps(ctx, dir, &num, NULL);
- return get_all_deps(ctx, dir, infofile, get_one_safe_deps);
+ return get_all_deps(ctx, dir, NULL, get_one_safe_deps);
char **infofile);
/* This is safer: just looks for ccan/ strings in info */
char **infofile);
/* This is safer: just looks for ccan/ strings in info */
-char **get_safe_ccan_deps(const void *ctx, const char *dir,
- bool recurse, char **infofile);
+char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse);
/* This also needs to compile the info file. */
char **get_libs(const void *ctx, const char *dir,
/* This also needs to compile the info file. */
char **get_libs(const void *ctx, const char *dir,