Add output_prefix_length to diff_options

Add output_prefix_length to diff_options. Initialize the value to 0 and only
set it when graph.c:diff_output_prefix_callback() is called.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lucian Poston 2012-04-16 03:44:50 -07:00 коммит произвёл Junio C Hamano
Родитель 8c188c74e3
Коммит 5e71a84a2d
2 изменённых файлов: 4 добавлений и 0 удалений

1
diff.h
Просмотреть файл

@ -150,6 +150,7 @@ struct diff_options {
diff_format_fn_t format_callback; diff_format_fn_t format_callback;
void *format_callback_data; void *format_callback_data;
diff_prefix_fn_t output_prefix; diff_prefix_fn_t output_prefix;
int output_prefix_length;
void *output_prefix_data; void *output_prefix_data;
}; };

Просмотреть файл

@ -194,8 +194,10 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void
struct git_graph *graph = data; struct git_graph *graph = data;
static struct strbuf msgbuf = STRBUF_INIT; static struct strbuf msgbuf = STRBUF_INIT;
assert(opt);
assert(graph); assert(graph);
opt->output_prefix_length = graph->width;
strbuf_reset(&msgbuf); strbuf_reset(&msgbuf);
graph_padding_line(graph, &msgbuf); graph_padding_line(graph, &msgbuf);
return &msgbuf; return &msgbuf;
@ -245,6 +247,7 @@ struct git_graph *graph_init(struct rev_info *opt)
*/ */
opt->diffopt.output_prefix = diff_output_prefix_callback; opt->diffopt.output_prefix = diff_output_prefix_callback;
opt->diffopt.output_prefix_data = graph; opt->diffopt.output_prefix_data = graph;
opt->diffopt.output_prefix_length = 0;
return graph; return graph;
} }