Skip to content

Commit 35925f1

Browse files
committed
diff: call emit_callback ecbdata everywhere
Everybody else, except for emit_rewrite_lines(), calls the emit_callback data ecbdata. Make sure we call the same thing by the same name for consistency. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 29228cb commit 35925f1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

diff.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,7 @@ static void add_line_count(struct strbuf *out, int count)
17801780
}
17811781
}
17821782

1783-
static void emit_rewrite_lines(struct emit_callback *ecb,
1783+
static void emit_rewrite_lines(struct emit_callback *ecbdata,
17841784
int prefix, const char *data, int size)
17851785
{
17861786
const char *endp = NULL;
@@ -1791,17 +1791,17 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
17911791
endp = memchr(data, '\n', size);
17921792
len = endp ? (endp - data + 1) : size;
17931793
if (prefix != '+') {
1794-
ecb->lno_in_preimage++;
1795-
emit_del_line(ecb, data, len);
1794+
ecbdata->lno_in_preimage++;
1795+
emit_del_line(ecbdata, data, len);
17961796
} else {
1797-
ecb->lno_in_postimage++;
1798-
emit_add_line(ecb, data, len);
1797+
ecbdata->lno_in_postimage++;
1798+
emit_add_line(ecbdata, data, len);
17991799
}
18001800
size -= len;
18011801
data += len;
18021802
}
18031803
if (!endp)
1804-
emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
1804+
emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
18051805
}
18061806

18071807
static void emit_rewrite_diff(const char *name_a,

0 commit comments

Comments
 (0)