X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=d72ad1db8973b25deef327bc986fea73babe5f73;hp=e2bcaa874b4a64daccd1f2c0205c87ac1d7b8c4b;hb=a560351e7c4fc40039ba25ff5a48b0a6d7bf0c90;hpb=c0d13d46aa13624db0e6a3b084a7666e510c745f

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index e2bcaa87..d72ad1db 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -21,8 +21,9 @@ static char *obj_list(const struct manifest *m)
 	char *list;
 	struct ccan_file *i;
 
-	/* This CCAN module. */
-	list = talloc_asprintf(m, " %s.o", m->dir);
+	/* Object files for this module. */
+	list_for_each(&m->c_files, i, list)
+		list = talloc_asprintf_append(list, " %s", i->compiled);
 
 	/* Other ccan modules we depend on. */
 	list_for_each(&m->dep_dirs, i, list) {
@@ -74,11 +75,46 @@ static char *start_main(char *ret)
 				      "{\n");
 }
 
+/* We only handle simple function definitions here. */
+static char *add_func(char *others, const char *line)
+{
+	const char *p, *end = strchr(line, '(') - 1;
+	while (isblank(*end)) {
+		end--;
+		if (end == line)
+			return others;
+	}
+
+	for (p = end; isalnum(*p) || *p == '_'; p--) {
+		if (p == line)
+			return others;
+	}
+
+	return talloc_asprintf_append(others, "printf(\"%%p\", %.*s);\n",
+				      end - p + 1, p);
+}
+
+static bool looks_internal(const char *p)
+{
+	return (strncmp(p, "#", 1) != 0
+		&& strncmp(p, "static", 6) != 0
+		&& strncmp(p, "struct", 6) != 0
+		&& strncmp(p, "union", 5) != 0);
+}
+
+static void strip_leading_whitespace(char **lines, unsigned prefix_len)
+{
+	unsigned int i;
+
+	for (i = 0; lines[i]; i++)
+		lines[i] += prefix_len;
+}
+
 static char *mangle(struct manifest *m, struct ccan_file *example)
 {
 	char **lines = get_ccan_file_lines(example);
-	char *ret;
-	bool in_function = false, fake_function = false;
+	char *ret, *use_funcs = NULL;
+	bool in_function = false, fake_function = false, has_main = false;
 	unsigned int i;
 
 	ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
@@ -97,11 +133,21 @@ static char *mangle(struct manifest *m, struct ccan_file *example)
 				     "#include <ccan/%s/%s.h>\n",
 				     m->basename, m->basename);
 
-	/* Starts indented?  Wrap it in a main() function. */
+	ret = talloc_asprintf_append(ret, "/* Useful dummmy functions. */\n"
+				     "int somefunc(void);\n"
+				     "int somefunc(void) { return 0; }\n");
+
+	/* Starts indented? */
 	if (lines[0] && isblank(lines[0][0])) {
-		ret = start_main(ret);
-		fake_function = true;
-		in_function = true;
+		unsigned prefix = strspn(lines[0], " \t");
+		if (looks_internal(lines[0] + prefix)) {
+			/* Wrap it all in main(). */
+			ret = start_main(ret);
+			fake_function = true;
+			in_function = true;
+			has_main = true;
+		} else
+			strip_leading_whitespace(lines, prefix);
 	}
 
 	/* Primitive, very primitive. */
@@ -115,8 +161,15 @@ static char *mangle(struct manifest *m, struct ccan_file *example)
 			 * == function start. */
 			if (!isblank(lines[i][0])
 			    && strchr(lines[i], '(')
-			    && !strchr(lines[i], ';'))
+			    && !strchr(lines[i], ';')) {
 				in_function = true;
+				if (strncmp(lines[i], "int main", 8) == 0)
+					has_main = true;
+				if (strncmp(lines[i], "static", 6) == 0) {
+					use_funcs = add_func(use_funcs,
+							     lines[i]);
+				}
+			}
 		}
 		/* ... means elided code.  If followed by spaced line, means
 		 * next part is supposed to be inside a function. */
@@ -136,6 +189,23 @@ static char *mangle(struct manifest *m, struct ccan_file *example)
 		ret = talloc_asprintf_append(ret, "%s\n", lines[i]);
 	}
 
+	/* Need a main to link successfully. */
+	if (!has_main) {
+		ret = talloc_asprintf_append(ret, "int main(void)\n{\n");
+		fake_function = true;
+	}
+
+	/* Get rid of unused warnings by printing addresses of static funcs. */
+	if (use_funcs) {
+		if (!fake_function) {
+			ret = talloc_asprintf_append(ret,
+						     "int use_funcs(void);\n"
+						     "int use_funcs(void) {\n");
+			fake_function = true;
+		}
+		ret = talloc_asprintf_append(ret, "	%s\n", use_funcs);
+	}
+
 	if (fake_function)
 		ret = talloc_asprintf_append(ret, "return 0;\n"
 					     "}\n");