X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=35e45ca03f26116b5584a34c5486cbc0a5d387a3;hp=a0a3dd64c57bf61bbde8d92ae24e140038c5f6e5;hb=12652625db55f6586e95fc5edc73e1e85bae8a5c;hpb=080b5ccd653a9d5f145a479c859831a540978f81 diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index a0a3dd64..35e45ca0 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,7 @@ static void add_dep(struct manifest ***deps, const char *basename) m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s", ccan_dir, basename)); - errstr = build_submodule(m); + errstr = build_submodule(m, cflags, COMPILE_NORMAL); if (errstr) errx(1, "%s", errstr); @@ -61,7 +62,8 @@ static void add_dep(struct manifest ***deps, const char *basename) if (m->info_file) { char **infodeps; - infodeps = get_deps(m, m->dir, false, &m->info_file->compiled); + infodeps = get_deps(m, m->dir, false, + &m->info_file->compiled[COMPILE_NORMAL]); for (i = 0; infodeps[i]; i++) { if (strstarts(infodeps[i], "ccan/")) @@ -70,7 +72,7 @@ static void add_dep(struct manifest ***deps, const char *basename) } } -static char *obj_list(struct manifest *m, struct ccan_file *f) +static char *example_obj_list(struct manifest *m, struct ccan_file *f) { struct manifest **deps = talloc_array(f, struct manifest *, 0); char **lines, *list; @@ -95,19 +97,23 @@ static char *obj_list(struct manifest *m, struct ccan_file *f) list = talloc_strdup(f, ""); for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) { - if (deps[i]->compiled) + if (deps[i]->compiled[COMPILE_NORMAL]) list = talloc_asprintf_append(list, " %s", - deps[i]->compiled); + deps[i]->compiled + [COMPILE_NORMAL]); } return list; } +/* FIXME: Test with reduced features! */ static char *lib_list(const struct manifest *m) { unsigned int i, num; - char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled); + char **libs; char *ret = talloc_strdup(m, ""); + libs = get_libs(m, m->dir, &num, + &m->info_file->compiled[COMPILE_NORMAL]); for (i = 0; i < num; i++) ret = talloc_asprintf_append(ret, "-l%s ", libs[i]); return ret; @@ -118,16 +124,18 @@ static bool compile(const void *ctx, struct ccan_file *file, bool keep, char **output) { - file->compiled = maybe_temp_file(ctx, "", keep, file->fullname); + file->compiled[COMPILE_NORMAL] + = maybe_temp_file(ctx, "", keep, file->fullname); if (!compile_and_link(ctx, file->fullname, ccan_dir, - obj_list(m, file), + example_obj_list(m, file), compiler, cflags, - lib_list(m), file->compiled, output)) { + lib_list(m), file->compiled[COMPILE_NORMAL], + output)) { /* Don't keep failures. */ if (keep) - unlink(file->compiled); - talloc_free(file->compiled); - file->compiled = NULL; + unlink(file->compiled[COMPILE_NORMAL]); + talloc_free(file->compiled[COMPILE_NORMAL]); + file->compiled[COMPILE_NORMAL] = NULL; return false; } return true; @@ -145,13 +153,13 @@ static char *start_main(char *ret, const char *why) static char *add_func(char *others, const char *line) { const char *p, *end = strchr(line, '(') - 1; - while (isspace(*end)) { + while (cisspace(*end)) { end--; if (end == line) return others; } - for (p = end; isalnum(*p) || *p == '_'; p--) { + for (p = end; cisalnum(*p) || *p == '_'; p--) { if (p == line) return others; } @@ -188,48 +196,52 @@ static bool looks_internal(char **lines, char **why) const char *line = lines[i] + strspn(lines[i], " \t"); unsigned len = strspn(line, IDENT_CHARS); - if (!line[0] || isspace(line[0]) || strstarts(line, "//")) + if (!line[0] || cisspace(line[0]) || strstarts(line, "//")) continue; /* The winners. */ if (strstarts(line, "if") && len == 2) { - *why = "starts with if"; + *why = cast_const(char *, "starts with if"); return true; } if (strstarts(line, "for") && len == 3) { - *why = "starts with for"; + *why = cast_const(char *, "starts with for"); return true; } if (strstarts(line, "while") && len == 5) { - *why = "starts with while"; + *why = cast_const(char *, "starts with while"); return true; } if (strstarts(line, "do") && len == 2) { - *why = "starts with do"; + *why = cast_const(char *, "starts with do"); return true; } /* The losers. */ if (strstarts(line, "#include")) { - *why = "starts with #include"; + *why = cast_const(char *, "starts with #include"); return false; } if (last_ended && strchr(line, '(')) { if (strstarts(line, "static")) { - *why = "starts with static and contains ("; + *why = cast_const(char *, + "starts with static" + " and contains ("); return false; } if (strends(line, ")")) { - *why = "contains ( and ends with )"; + *why = cast_const(char *, + "contains ( and ends with )"); return false; } } /* Single identifier then operator == inside function. */ if (last_ended && len - && ispunct(line[len+strspn(line+len, " ")])) { - *why = "starts with identifier then punctuation"; + && cispunct(line[len+strspn(line+len, " ")])) { + *why = cast_const(char *, "starts with identifier" + " then punctuation"); return true; } @@ -239,7 +251,7 @@ static bool looks_internal(char **lines, char **why) } /* No idea... Say yes? */ - *why = "gave no clues"; + *why = cast_const(char *, "gave no clues"); return true; } @@ -361,7 +373,7 @@ static char *mangle(struct manifest *m, char **lines) } else { /* Character at start of line, with ( and no ; * == function start. Ignore comments. */ - if (!isspace(line[0]) + if (!cisspace(line[0]) && strchr(line, '(') && !strchr(line, ';') && !strstr(line, "//")) { @@ -521,7 +533,7 @@ static void build_examples(struct manifest *m, bool keep, bool res[3]; unsigned num, j; char **lines[3]; - char *error; + const char *error; score->total++;