From 30e77bcb5008d1947c721fb084e21eeaa591c45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 25 Apr 2013 21:40:25 +0200 Subject: pretty: simplify input line length calculation in pp_user_info() Instead of searching for LF and NUL with two strchr() calls use a single strchrnul() call. We don't need to check if the returned pointer is NULL because either we'll find the NUL at the end of line, or the caller forgot to NUL-terminate the string and we'll overrun the buffer in any case. Also we don't need to pass LF or NUL to split_ident_line() as it ignores it anyway. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- pretty.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pretty.c') diff --git a/pretty.c b/pretty.c index acbfceb5fe..a9c35812dc 100644 --- a/pretty.c +++ b/pretty.c @@ -413,7 +413,6 @@ void pp_user_info(const struct pretty_print_context *pp, struct strbuf name; struct strbuf mail; struct ident_split ident; - int linelen; char *line_end; const char *mailbuf, *namebuf; size_t namelen, maillen; @@ -422,18 +421,10 @@ void pp_user_info(const struct pretty_print_context *pp, if (pp->fmt == CMIT_FMT_ONELINE) return; - line_end = strchr(line, '\n'); - if (!line_end) { - line_end = strchr(line, '\0'); - if (!line_end) - return; - } - - linelen = ++line_end - line; - if (split_ident_line(&ident, line, linelen)) + line_end = strchrnul(line, '\n'); + if (split_ident_line(&ident, line, line_end - line)) return; - mailbuf = ident.mail_begin; maillen = ident.mail_end - ident.mail_begin; namebuf = ident.name_begin; -- cgit v1.2.1