[PATCH 4/7] diff.c: refactor fn_out_diff_words_write_helper()

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 diff.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/diff.c b/diff.c
index 1354368..8a9e42f 100644
--- a/diff.c
+++ b/diff.c
@@ -807,12 +807,13 @@ static void diff_words_append(struct diff_words_data 
*diff_words,
        buffer->text.ptr[buffer->text.size] = '\0';
 }
 
-static int fn_out_diff_words_write_helper(FILE *fp,
+static int fn_out_diff_words_write_helper(struct diff_words_data *dw,
                                          struct diff_words_style_elem *st_el,
                                          const char *newline,
                                          size_t count, const char *buf,
                                          const char *line_prefix)
 {
+       FILE *fp = dw->opt->file;
        int print = 0;
 
        while (count) {
@@ -919,7 +920,7 @@ static void fn_out_diff_words_aux(void *priv, char *line, 
unsigned long len)
                fputs(line_prefix, diff_words->opt->file);
        }
        if (diff_words->current_plus != plus_begin) {
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                                &style->ctx, style->newline,
                                plus_begin - diff_words->current_plus,
                                diff_words->current_plus, line_prefix);
@@ -927,13 +928,13 @@ static void fn_out_diff_words_aux(void *priv, char *line, 
unsigned long len)
                        fputs(line_prefix, diff_words->opt->file);
        }
        if (minus_begin != minus_end) {
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                                &style->old, style->newline,
                                minus_end - minus_begin, minus_begin,
                                line_prefix);
        }
        if (plus_begin != plus_end) {
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                                &style->new, style->newline,
                                plus_end - plus_begin, plus_begin,
                                line_prefix);
@@ -1030,7 +1031,7 @@ static void diff_words_show(struct diff_words_data 
*diff_words)
        /* special case: only removal */
        if (!diff_words->plus.text.size) {
                fputs(line_prefix, diff_words->opt->file);
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                        &style->old, style->newline,
                        diff_words->minus.text.size,
                        diff_words->minus.text.ptr, line_prefix);
@@ -1040,7 +1041,7 @@ static void diff_words_show(struct diff_words_data 
*diff_words)
        /* special case: only addition */
        if (!diff_words->minus.text.size) {
                fputs(line_prefix, diff_words->opt->file);
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                        &style->new, style->newline,
                        diff_words->plus.text.size,
                        diff_words->plus.text.ptr, line_prefix);
@@ -1067,7 +1068,7 @@ static void diff_words_show(struct diff_words_data 
*diff_words)
                        diff_words->plus.text.size) {
                if (color_words_output_graph_prefix(diff_words))
                        fputs(line_prefix, diff_words->opt->file);
-               fn_out_diff_words_write_helper(diff_words->opt->file,
+               fn_out_diff_words_write_helper(diff_words,
                        &style->ctx, style->newline,
                        diff_words->plus.text.ptr + diff_words->plus.text.size
                        - diff_words->current_plus, diff_words->current_plus,
-- 
2.3.0.rc1.137.g477eb31

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html