[PATCH 13/19] tree-diff: diff_tree() should now be static
- From
Kirill Smelkov <kirr@mns.spb.ru>
- Date
- Feb 24, 2014, 16:21 UTC
- Message-ID
- <dcab79b62b86dea995828195ec8a7693d487d385.1393257006.git.kirr@mns.spb.ru>
- In-Reply-To
- <cover.1393257006.git.kirr@mns.spb.ru>
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 <kirr@mns.spb.ru> ---
( new patch )
diff.h | 2 -- tree-diff.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/diff.h b/diff.h index e79f3b3..5d7b9f7 100644 --- 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 index 2fd6d0e..b99622c 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -137,8 +137,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);
-- 1.9.rc1.181.g641f458