undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/pretty-use-prefixcmp'

Browse Source 
* rs/pretty-use-prefixcmp:
  pretty: use prefixcmp instead of memcmp on NUL-terminated strings
This commit is contained in:
Junio C Hamano 2013-01-18 11:20:08 -08:00
commit 3ab4c543e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pretty.c
View File

@ -966,7 +966,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
if (!end) if (!end)
return 0; return 0;
if (!memcmp(begin, "auto,", 5)) { if (!prefixcmp(begin, "auto,")) {
if (!want_color(c->pretty_ctx->color)) if (!want_color(c->pretty_ctx->color))
return end - placeholder + 1; return end - placeholder + 1;
begin += 5; begin += 5;
@ -1301,7 +1301,7 @@ static void pp_header(const struct pretty_print_context *pp,
continue; continue;
} }
if (!memcmp(line, "parent ", 7)) { if (!prefixcmp(line, "parent ")) {
if (linelen != 48) if (linelen != 48)
die("bad parent line in commit"); die("bad parent line in commit");
continue; continue;
@ -1325,11 +1325,11 @@ static void pp_header(const struct pretty_print_context *pp,
* FULL shows both authors but not dates. * FULL shows both authors but not dates.
* FULLER shows both authors and dates. * FULLER shows both authors and dates.
*/ */
if (!memcmp(line, "author ", 7)) { if (!prefixcmp(line, "author ")) {
strbuf_grow(sb, linelen + 80); strbuf_grow(sb, linelen + 80);
pp_user_info(pp, "Author", sb, line + 7, encoding); 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)) { (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
strbuf_grow(sb, linelen + 80); strbuf_grow(sb, linelen + 80);
pp_user_info(pp, "Commit", sb, line + 10, encoding); pp_user_info(pp, "Commit", sb, line + 10, encoding);