diff options
| author | René Scharfe <l.s.r@web.de> | 2016-05-28 18:20:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-29 17:10:05 -0700 |
| commit | 2bb73ae8037ae6fd82f002257d04f8cda2a721cd (patch) | |
| tree | 1378704186665446d414d87be1fbf8055f238f97 | |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d (diff) | |
| download | git-rs/patch-id-use-skip-prefix.tar.gz | |
patch-id: use starts_with() and skip_prefix()rs/patch-id-use-skip-prefix
Get rid of magic numbers and avoid running over the end of a NUL
terminated string by using starts_with() and skip_prefix() instead
of memcmp().
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/patch-id.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 77db8739b5..f21b6e34f6 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -81,16 +81,13 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { char *line = line_buf->buf; - char *p = line; + const char *p = line; int len; - if (!memcmp(line, "diff-tree ", 10)) - p += 10; - else if (!memcmp(line, "commit ", 7)) - p += 7; - else if (!memcmp(line, "From ", 5)) - p += 5; - else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line)) + if (!skip_prefix(line, "diff-tree ", &p) && + !skip_prefix(line, "commit ", &p) && + !skip_prefix(line, "From ", &p) && + starts_with(line, "\\ ") && 12 < strlen(line)) continue; if (!get_sha1_hex(p, next_sha1)) { @@ -99,14 +96,14 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, } /* Ignore commit comments */ - if (!patchlen && memcmp(line, "diff ", 5)) + if (!patchlen && !starts_with(line, "diff ")) continue; /* Parsing diff header? */ if (before == -1) { - if (!memcmp(line, "index ", 6)) + if (starts_with(line, "index ")) continue; - else if (!memcmp(line, "--- ", 4)) + else if (starts_with(line, "--- ")) before = after = 1; else if (!isalpha(line[0])) break; @@ -114,14 +111,14 @@ static int get_one_patchid(unsigned char *next_sha1, unsigned char *result, /* Looking for a valid hunk header? */ if (before == 0 && after == 0) { - if (!memcmp(line, "@@ -", 4)) { + if (starts_with(line, "@@ -")) { /* Parse next hunk, but ignore line numbers. */ scan_hunk_header(line, &before, &after); continue; } /* Split at the end of the patch. */ - if (memcmp(line, "diff ", 5)) + if (!starts_with(line, "diff ")) break; /* Else we're parsing another header. */ |