[PATCH] combine-diff.c remove unused return variable
From: dave rientjes <rientjes@google.com>
Date: 2016-06-15 22:42:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
Removes unused return variable. David Signed-off-by: David Rientjes <rientjes@google.com> --- combine-diff.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c
index ba8baca..ed85b0e 100644
--- a/combine-diff.c
+++ b/combine-diff.c@@ -617,7 +617,7 @@ static int show_patch_diff(struct combin char *result, *cp; struct sline *sline; /* survived lines */ int mode_differs = 0; - int i, show_hunks, shown_header = 0; + int i, show_hunks; int working_tree_file = !memcmp(elem->sha1, null_sha1, 20); int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV; mmfile_t result_file;
@@ -769,7 +769,7 @@ static int show_patch_diff(struct combin } free(sline[0].p_lno); free(sline); - return shown_header; + return 0; } #define COLONS "::::::::::::::::::::::::::::::::"
--
1.4.2.g182a