tree-diff: diff_tree() should now be static

Kirill Smelkov · gitster · commit ad6f3cc7d2ea · 2014-03-26T14:30:47.000-07:00
We reworked all its users to use the functionality through
diff_tree_sha1 variant in recent patches (see "tree-diff: allow
diff_tree_sha1 to accept NULL sha1" and what comes next).

diff_tree() is now not used outside tree-diff.c - make it static.

Signed-off-by: Kirill Smelkov &lt;kirr@mns.spb.ru&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.h b/diff.h
@@ -189,8 +189,6 @@ const char *diff_line_prefix(struct diff_options *);
 
 extern const char mime_boundary_leader[];
 
-extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
-		     const char *base, struct diff_options *opt);
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 			  const char *base, struct diff_options *opt);
 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
diff --git a/tree-diff.c b/tree-diff.c
@@ -141,8 +141,8 @@ static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
 	}
 }
 
-int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
-	      const char *base_str, struct diff_options *opt)
+static int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
+		     const char *base_str, struct diff_options *opt)
 {
 	struct strbuf base;
 	int baselen = strlen(base_str);

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ static void skip_uninteresting(struct tree_desc t, struct strbuf base,`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`-int diff_tree(struct tree_desc t1, struct tree_desc t2,`
`145`		`- const char base_str, struct diff_options opt)`
	`144`	`+static int diff_tree(struct tree_desc t1, struct tree_desc t2,`
	`145`	`+ const char base_str, struct diff_options opt)`
`146`	`146`	`{`
`147`	`147`	`struct strbuf base;`
`148`	`148`	`int baselen = strlen(base_str);`