[PATCH 3/3] read_packed_refs: use skip_prefix instead of static array
- From
Jeff King <peff@peff.net>
- Date
- Dec 10, 2014, 10:40 UTC
- Message-ID
- <20141210104035.GC24514@peff.net>
- In-Reply-To
- <20141210103907.GA22186@peff.net>
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> --- refs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/refs.c b/refs.c index 10f8247..c71553f 100644 --- a/refs.c +++ b/refs.c @@ -1135,10 +1135,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 "))
-- 2.2.0.454.g7eca6b7