mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
cleanups: Remove unused vars from combine-diff.c
Mod_type in particular sure looks like it wants to be used, but isn't. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
da2a95b2a8
commit
310f8b5b6d
|
@ -589,7 +589,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
|
|||
struct diff_options *opt)
|
||||
{
|
||||
unsigned long result_size, cnt, lno;
|
||||
char *result, *cp, *ep;
|
||||
char *result, *cp;
|
||||
struct sline *sline; /* survived lines */
|
||||
int mode_differs = 0;
|
||||
int i, show_hunks, shown_header = 0;
|
||||
|
@ -641,7 +641,6 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
|
|||
cnt++; /* incomplete line */
|
||||
|
||||
sline = xcalloc(cnt+2, sizeof(*sline));
|
||||
ep = result;
|
||||
sline[0].bol = result;
|
||||
for (lno = 0; lno <= cnt + 1; lno++) {
|
||||
sline[lno].lost_tail = &sline[lno].lost_head;
|
||||
|
@ -752,7 +751,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
|
|||
|
||||
static void show_raw_diff(struct combine_diff_path *p, int num_parent, const char *header, struct diff_options *opt)
|
||||
{
|
||||
int i, offset, mod_type = 'A';
|
||||
int i, offset;
|
||||
const char *prefix;
|
||||
int line_termination, inter_name_termination;
|
||||
|
||||
|
@ -764,13 +763,6 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, const cha
|
|||
if (header)
|
||||
printf("%s%c", header, line_termination);
|
||||
|
||||
for (i = 0; i < num_parent; i++) {
|
||||
if (p->parent[i].mode)
|
||||
mod_type = 'M';
|
||||
}
|
||||
if (!p->mode)
|
||||
mod_type = 'D';
|
||||
|
||||
if (opt->output_format == DIFF_FORMAT_RAW) {
|
||||
offset = strlen(COLONS) - num_parent;
|
||||
if (offset < 0)
|
||||
|
|
Loading…
Reference in a new issue