ccanlint: rename obj_list in examples_compile.c to example_obj_list.

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

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 578805fe0c62a23db549a6e54e6fb0018980a15a..646e5ae3325a575f94e83ab496fcef66792016a6 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -1,6 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
+#include <ccan/cast/cast.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -70,7 +71,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;
@@ -120,8 +121,9 @@ static bool compile(const void *ctx,
 {
        file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
        if (!compile_and_link(ctx, file->fullname, ccan_dir,
-                             obj_list(m, file),
-                             "", lib_list(m), file->compiled, output)) {
+                             example_obj_list(m, file),
+                             compiler, cflags,
+                             lib_list(m), file->compiled, output)) {
                /* Don't keep failures. */
                if (keep)
                        unlink(file->compiled);
@@ -144,13 +146,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;
        }
@@ -187,48 +189,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;
                }
 
@@ -238,7 +244,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;
 }
 
@@ -313,23 +319,24 @@ static char *mangle(struct manifest *m, char **lines)
        bool in_function = false, fake_function = false, has_main = false;
        unsigned int i;
 
-       ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
-                           "#include <assert.h>\n"
-                           "#include <err.h>\n"
-                           "#include <errno.h>\n"
-                           "#include <fcntl.h>\n"
-                           "#include <limits.h>\n"
-                           "#include <stdbool.h>\n"
-                           "#include <stdint.h>\n"
-                           "#include <stdio.h>\n"
-                           "#include <stdlib.h>\n"
-                           "#include <string.h>\n"
-                           "#include <sys/stat.h>\n"
-                           "#include <sys/types.h>\n"
-                           "#include <unistd.h>\n");
-       ret = talloc_asprintf_append(ret, "/* Include header from module. */\n"
-                                    "#include <ccan/%s/%s.h>\n",
-                                    m->basename, m->basename);
+       ret = talloc_asprintf(m, 
+                             "/* Include header from module. */\n"
+                             "#include <ccan/%s/%s.h>\n"
+                             "/* Prepend a heap of headers. */\n"
+                             "#include <assert.h>\n"
+                             "#include <err.h>\n"
+                             "#include <errno.h>\n"
+                             "#include <fcntl.h>\n"
+                             "#include <limits.h>\n"
+                             "#include <stdbool.h>\n"
+                             "#include <stdint.h>\n"
+                             "#include <stdio.h>\n"
+                             "#include <stdlib.h>\n"
+                             "#include <string.h>\n"
+                             "#include <sys/stat.h>\n"
+                             "#include <sys/types.h>\n"
+                             "#include <unistd.h>\n",
+                             m->basename, m->basename);
 
        ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
                                     "extern int somefunc(void);\n"
@@ -359,7 +366,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, "//")) {
@@ -519,7 +526,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++;