diff options
author | Rohit Mani <rohit.mani@outlook.com> | 2014-03-07 22:48:31 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-10 08:35:30 -0700 |
commit | 2c5495f7b60d6ddcd6a411b48d2f6dbc4a24717a (patch) | |
tree | 9900454e2b547e2fee8e9e67b39ced68ea0c650e /pretty.c | |
parent | Git 1.9.0 (diff) | |
download | tgif-2c5495f7b60d6ddcd6a411b48d2f6dbc4a24717a.tar.xz |
use strchrnul() in place of strchr() and strlen()
Avoid scanning strings twice, once with strchr() and then with
strlen(), by using strchrnul().
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rohit Mani <rohit.mani@outlook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -549,14 +549,13 @@ static char *get_header(const struct commit *commit, const char *msg, const char *line = msg; while (line) { - const char *eol = strchr(line, '\n'), *next; + const char *eol = strchrnul(line, '\n'), *next; if (line == eol) return NULL; - if (!eol) { + if (!*eol) { warning("malformed commit (header is missing newline): %s", sha1_to_hex(commit->object.sha1)); - eol = line + strlen(line); next = NULL; } else next = eol + 1; |