From: René Scharfe Date: Thu, 25 Apr 2013 19:41:57 +0000 (+0200) Subject: pretty: simplify output line length calculation in pp_user_info() X-Git-Tag: v1.8.3-rc1~6^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97a17e7721dd026dbc4213608d4c61a9351ae527;p=thirdparty%2Fgit.git pretty: simplify output line length calculation in pp_user_info() Keep namelen unchanged and don't use it to hold a value that we're not interested in anyway -- we can use maillen and the constant part directly instead. This simplifies the code slightly and prepares for the next patch that makes use of the original value of namelen. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- diff --git a/pretty.c b/pretty.c index a9c35812dc..2031c77f15 100644 --- a/pretty.c +++ b/pretty.c @@ -439,8 +439,6 @@ void pp_user_info(const struct pretty_print_context *pp, strbuf_add(&mail, mailbuf, maillen); strbuf_add(&name, namebuf, namelen); - namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */ - if (pp->fmt == CMIT_FMT_EMAIL) { strbuf_addstr(sb, "From: "); if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) { @@ -457,9 +455,10 @@ void pp_user_info(const struct pretty_print_context *pp, strbuf_add_wrapped_bytes(sb, name.buf, name.len, -6, 1, max_length); } - if (namelen - name.len + last_line_length(sb) > max_length) - strbuf_addch(sb, '\n'); + if (max_length < + last_line_length(sb) + strlen(" <") + maillen + strlen(">")) + strbuf_addch(sb, '\n'); strbuf_addf(sb, " <%s>\n", mail.buf); } else { strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,