The function strbuf_wrap() is not part of the strbuf API, yet prevent to extend the API to include wrapping functions. Renaming it to something more specific allow to use "strbuf_wrap" for the strbut API. Signed-off-by: William Duclot <william.duclot@xxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Simon Rabourg <simon.rabourg@xxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> --- pretty.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pretty.c b/pretty.c index 87c4497..2b9e89a 100644 --- a/pretty.c +++ b/pretty.c @@ -904,8 +904,8 @@ static void parse_commit_message(struct format_commit_context *c) c->commit_message_parsed = 1; } -static void strbuf_wrap(struct strbuf *sb, size_t pos, - size_t width, size_t indent1, size_t indent2) +static void strbuf_wrap_message(struct strbuf *sb, size_t pos, + size_t width, size_t indent1, size_t indent2) { struct strbuf tmp = STRBUF_INIT; @@ -926,7 +926,8 @@ static void rewrap_message_tail(struct strbuf *sb, c->indent2 == new_indent2) return; if (c->wrap_start < sb->len) - strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2); + strbuf_wrap_message(sb, c->wrap_start, c->width, c->indent1, + c->indent2); c->wrap_start = sb->len; c->width = new_width; c->indent1 = new_indent1; -- 2.9.0.rc1.1.geac644e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html