@matheusbsbs / matheus-bagliano / commits / cf995ede2c
Fork 0

Make show_entry void

Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

David Rientjes committed Aug 14, 2006 at 13:39 UTC cf995ede2cf53d70e5de2525184597211c827dc5
1 file changed +6 -6
tree-diff.c
+6 -6
@@ -15,7 +15,8 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
15 return newbase;
16 }
17
18 -static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base);
18 +static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
19 + const char *base);
20
21 static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
22 {
@@ -131,7 +132,8 @@ static void show_tree(struct diff_options *opt, const char *prefix, struct tree_
132 }
133
134 /* A file entry went away or appeared */
134 -static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base)
135 +static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
136 + const char *base)
137 {
138 unsigned mode;
139 const char *path;
@@ -152,11 +154,9 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
154
155 free(tree);
156 free(newbase);
155 - return 0;
157 + } else {
158 + opt->add_remove(opt, prefix[0], mode, sha1, base, path);
159 }
157 -
158 - opt->add_remove(opt, prefix[0], mode, sha1, base, path);
159 - return 0;
160 }
161
162 int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)