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 <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pretty.c b/pretty.c
index a9c35812dc2bcef8d552e6d8fa75c52011269700..2031c77f156d2a8f47e9c23e466934e30c99f2d1 100644 (file)
--- 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,