diff options
| author |  Jeff King <peff@peff.net> | 2014-12-10 05:40:36 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-12-10 09:40:33 -0800 |
| commit | ea417833ea9a07d7b8d568358ff20f57851cb26e (patch) | |
| tree | c3bdd5a211743f6cf8ab88bbdbeff669a3bd9c83 /refs.c | |
| parent | read_packed_refs: pass strbuf to parse_ref_line (diff) | |
| download | tgif-ea417833ea9a07d7b8d568358ff20f57851cb26e.tar.xz | |
read_packed_refs: use skip_prefix instead of static array
We want to recognize the packed-refs header and skip to the
"traits" part of the line. We currently do it by feeding
sizeof() a static const array to strncmp. However, it's a
bit simpler to just skip_prefix, which expresses the
intention more directly, and without remembering to account
for the NUL-terminator in each sizeof() call.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1040,10 +1040,9 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) while (strbuf_getwholeline(&line, f, '\n') != EOF) { unsigned char sha1[20]; const char *refname; - static const char header[] = "# pack-refs with:"; + const char *traits; - if (!strncmp(line.buf, header, sizeof(header)-1)) { - const char *traits = line.buf + sizeof(header) - 1; + if (skip_prefix(line.buf, "# pack-refs with:", &traits)) { if (strstr(traits, " fully-peeled ")) peeled = PEELED_FULLY; else if (strstr(traits, " peeled ")) |