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>
René Scharfe committed
Apr 25, 2013 at 21:41 UTC
97a17e7721dd026dbc4213608d4c61a9351ae527
1 file changed
+3
-4
pretty.c
+3
-4
@@ -439,8 +439,6 @@ void pp_user_info(const struct pretty_print_context *pp,
439
strbuf_add(&mail, mailbuf, maillen);
440
strbuf_add(&name, namebuf, namelen);
441
442
- namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */
443
-
442
if (pp->fmt == CMIT_FMT_EMAIL) {
443
strbuf_addstr(sb, "From: ");
444
if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) {
@@ -457,9 +455,10 @@ void pp_user_info(const struct pretty_print_context *pp,
455
strbuf_add_wrapped_bytes(sb, name.buf, name.len,
456
-6, 1, max_length);
457
}
460
- if (namelen - name.len + last_line_length(sb) > max_length)
461
- strbuf_addch(sb, '\n');
458
459
+ if (max_length <
460
+ last_line_length(sb) + strlen(" <") + maillen + strlen(">"))
461
+ strbuf_addch(sb, '\n');
462
strbuf_addf(sb, " <%s>\n", mail.buf);
463
} else {
464
strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,