summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:08 (GMT)
commit3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614 (patch)
tree21d8881b4064aab8ea57f3c401da3ead44e3cb2a /pretty.c
parent78292536846149eba74387ee7a8315bf9597268e (diff)
parent8a692d277795e426167d76d652cf86656c9c162e (diff)
downloadgit-3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614.zip
git-3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614.tar.gz
git-3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614.tar.bz2
Merge branch 'rs/pretty-use-prefixcmp'
* rs/pretty-use-prefixcmp: pretty: use prefixcmp instead of memcmp on NUL-terminated strings
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pretty.c b/pretty.c
index 92c839f..01795de 100644
--- a/pretty.c
+++ b/pretty.c
@@ -966,7 +966,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
if (!end)
return 0;
- if (!memcmp(begin, "auto,", 5)) {
+ if (!prefixcmp(begin, "auto,")) {
if (!want_color(c->pretty_ctx->color))
return end - placeholder + 1;
begin += 5;
@@ -1301,7 +1301,7 @@ static void pp_header(const struct pretty_print_context *pp,
continue;
}
- if (!memcmp(line, "parent ", 7)) {
+ if (!prefixcmp(line, "parent ")) {
if (linelen != 48)
die("bad parent line in commit");
continue;
@@ -1325,11 +1325,11 @@ static void pp_header(const struct pretty_print_context *pp,
* FULL shows both authors but not dates.
* FULLER shows both authors and dates.
*/
- if (!memcmp(line, "author ", 7)) {
+ if (!prefixcmp(line, "author ")) {
strbuf_grow(sb, linelen + 80);
pp_user_info(pp, "Author", sb, line + 7, encoding);
}
- if (!memcmp(line, "committer ", 10) &&
+ if (!prefixcmp(line, "committer ") &&
(pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
strbuf_grow(sb, linelen + 80);
pp_user_info(pp, "Commit", sb, line + 10, encoding);