diff options
| author | David Rientjes <rientjes@google.com> | 2006-08-14 20:39:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 01:43:49 (GMT) |
| commit | cf995ede2cf53d70e5de2525184597211c827dc5 (patch) | |
| tree | 7ff0cdc8c3523b21e419b074a33264b636ba02fc | |
| parent | eddd1c8cefa596abbb81ac5a0af21ba104033b3d (diff) | |
| download | git-cf995ede2cf53d70e5de2525184597211c827dc5.zip git-cf995ede2cf53d70e5de2525184597211c827dc5.tar.gz git-cf995ede2cf53d70e5de2525184597211c827dc5.tar.bz2 | |
Make show_entry void
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | 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 *base, const char *path, int pathlen) 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_options *opt, const char *prefix, struct tree_ } /* 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_options *opt, const char *prefix, struct tree_ 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) |