This patch is no-op, to reduce noise in the next one.
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
diff.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/diff.c b/diff.c
index 3b7317e..47d22e3 100644
--- a/diff.c
+++ b/diff.c
@@ -458,7 +458,9 @@ struct tagged_pointer {
};
static void emit_line_0(struct diff_options *o, const char *set, const char
*reset,
- int first, const char *line, int len)
+ int first, const char *line, int len,
+ struct tagged_pointer *begin,
+ struct tagged_pointer *end)
{
int has_trailing_newline, has_trailing_carriage_return;
int nofirst;
@@ -497,7 +499,7 @@ static void emit_line_0(struct diff_options *o, const char
*set, const char *res
static void emit_line(struct diff_options *o, const char *set, const char
*reset,
const char *line, int len)
{
- emit_line_0(o, set, reset, line[0], line+1, len-1);
+ emit_line_0(o, set, reset, line[0], line+1, len-1, NULL, NULL);
}
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char
*line, int len)
@@ -516,7 +518,9 @@ static void emit_line_checked(const char *reset,
const char *line, int len,
enum color_diff color,
unsigned ws_error_highlight,
- char sign)
+ char sign,
+ struct tagged_pointer *begin,
+ struct tagged_pointer *end)
{
const char *set = diff_get_color(ecbdata->color_diff, color);
const char *ws = NULL;
@@ -528,13 +532,16 @@ static void emit_line_checked(const char *reset,
}
if (!ws)
- emit_line_0(ecbdata->opt, set, reset, sign, line, len);
+ emit_line_0(ecbdata->opt, set, reset, sign,
+ line, len, begin, end);
else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
/* Blank line at EOF - paint '+' as well */
- emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
+ emit_line_0(ecbdata->opt, ws, reset, sign,
+ line, len, begin, end);
else {
/* Emit just the prefix, then the rest. */
- emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
+ emit_line_0(ecbdata->opt, set, reset, sign,
+ "", 0, NULL, NULL);
ws_check_emit(line, len, ecbdata->ws_rule,
ecbdata->opt->file, set, reset, ws);
}
@@ -545,7 +552,8 @@ static void emit_add_line(const char *reset,
const char *line, int len)
{
emit_line_checked(reset, ecbdata, line, len,
- DIFF_FILE_NEW, WSEH_NEW, '+');
+ DIFF_FILE_NEW, WSEH_NEW, '+',
+ NULL, NULL);
}
static void emit_del_line(const char *reset,
@@ -553,7 +561,8 @@ static void emit_del_line(const char *reset,
const char *line, int len)
{
emit_line_checked(reset, ecbdata, line, len,
- DIFF_FILE_OLD, WSEH_OLD, '-');
+ DIFF_FILE_OLD, WSEH_OLD, '-',
+ NULL, NULL);
}
static void emit_context_line(const char *reset,
@@ -561,7 +570,8 @@ static void emit_context_line(const char *reset,
const char *line, int len)
{
emit_line_checked(reset, ecbdata, line, len,
- DIFF_CONTEXT, WSEH_CONTEXT, ' ');
+ DIFF_CONTEXT, WSEH_CONTEXT, ' ',
+ NULL, NULL);
}
static void emit_hunk_header(struct emit_callback *ecbdata,
@@ -682,7 +692,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
DIFF_CONTEXT);
putc('\n', ecb->opt->file);
emit_line_0(ecb->opt, context, reset, '\\',
- nneof, strlen(nneof));
+ nneof, strlen(nneof), NULL, NULL);
}
}
@@ -1301,7 +1311,8 @@ static void diff_words_flush_unified(struct emit_callback
*ecb,
assert(end_line->tag == TAG_END_LINE);
emit_line_checked(reset, ecb, begin_line->str,
end_line->str - begin_line->str,
- color, ws_error_highlight, sign);
+ color, ws_error_highlight, sign,
+ NULL, NULL);
}
b->mark_nr = 0;
}
--
2.3.0.rc1.137.g477eb31
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
