[PATCH 26/28] makes show_entry void
From: David Rientjes <rientjes@google.com>
Date: 2016-06-15 22:42:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Makes show_entry void. David Signed-off-by: David Rientjes <rientjes@google.com> --- tree-diff.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tree-diff.c b/tree-diff.c
index 1cdf8aa..916f489 100644
--- a/tree-diff.c
+++ b/tree-diff.c@@ -15,7 +15,8 @@ static char *malloc_base(const char *bas return newbase; } -static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base); +static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, + const char *base); static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt) {
@@ -131,7 +132,8 @@ static void show_tree(struct diff_option } /* A file entry went away or appeared */ -static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base) +static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, + const char *base) { unsigned mode; const char *path;
@@ -152,11 +154,9 @@ static int show_entry(struct diff_option free(tree); free(newbase); - return 0; + } else { + opt->add_remove(opt, prefix[0], mode, sha1, base, path); } - - opt->add_remove(opt, prefix[0], mode, sha1, base, path); - return 0; } int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
--
1.4.2.g89bb-dirty