mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
pretty: use prefixcmp instead of memcmp on NUL-terminated strings
This conversion avoids the need for magic string length numbers in the code. And unlike memcmp(), prefixcmp() is careful to not run over the end of a string. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
30825178fb
commit
8a692d2777
8
pretty.c
8
pretty.c
|
@ -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;
|
||||||
|
@ -1310,7 +1310,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;
|
||||||
|
@ -1334,11 +1334,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);
|
||||||
|
|
Loading…
Reference in a new issue