On Wed, Sep 7, 2016 at 4:36 PM, Stefan Beller <sbel...@google.com> wrote:
> The value of `ecbdata->opt` is accessible via the short variable `o`
> already, so let's use that instead.
>
> Signed-off-by: Stefan Beller <sbel...@google.com>
Seems reasonable.
> ---
> diff.c | 21 ++++++++++-----------
> 1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 534c12e..4a6501c 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -1217,7 +1217,7 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> const char *line_prefix = diff_line_prefix(o);
>
> if (ecbdata->header) {
> - fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf);
> + fprintf(o->file, "%s", ecbdata->header->buf);
> strbuf_reset(ecbdata->header);
> ecbdata->header = NULL;
> }
> @@ -1229,9 +1229,9 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
> name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
>
> - fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n",
> + fprintf(o->file, "%s%s--- %s%s%s\n",
> line_prefix, meta, ecbdata->label_path[0], reset,
> name_a_tab);
> - fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n",
> + fprintf(o->file, "%s%s+++ %s%s%s\n",
> line_prefix, meta, ecbdata->label_path[1], reset,
> name_b_tab);
> ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
> }
> @@ -1249,15 +1249,15 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> find_lno(line, ecbdata);
> emit_hunk_header(ecbdata, line, len);
> if (line[len-1] != '\n')
> - putc('\n', ecbdata->opt->file);
> + putc('\n', o->file);
> return;
> }
>
> if (len < 1) {
> - emit_line(ecbdata->opt, reset, reset, line, len);
> + emit_line(o, reset, reset, line, len);
> if (ecbdata->diff_words
> && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
> - fputs("~\n", ecbdata->opt->file);
> + fputs("~\n", o->file);
> return;
> }
>
> @@ -1282,8 +1282,8 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> }
> diff_words_flush(ecbdata);
> if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
> - emit_line(ecbdata->opt, context, reset, line, len);
> - fputs("~\n", ecbdata->opt->file);
> + emit_line(o, context, reset, line, len);
> + fputs("~\n", o->file);
> } else {
> /*
> * Skip the prefix character, if any. With
> @@ -1294,7 +1294,7 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> line++;
> len--;
> }
> - emit_line(ecbdata->opt, context, reset, line, len);
> + emit_line(o, context, reset, line, len);
> }
> return;
> }
> @@ -1316,8 +1316,7 @@ static void fn_out_consume(void *priv, char *line,
> unsigned long len)
> default:
> /* incomplete line at the end */
> ecbdata->lno_in_preimage++;
> - emit_line(ecbdata->opt,
> - diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
> + emit_line(o, diff_get_color(ecbdata->color_diff,
> DIFF_CONTEXT),
> reset, line, len);
> break;
> }
> --
> 2.10.0.2.g0676c79.dirty
>
