[PATCH 8/9] verify-pack: use strbuf_strip_suffix
- From
Jeff King <peff@peff.net>
- Date
- Jun 30, 2014, 17:02 UTC
- Message-ID
- <20140630170205.GH16637@sigill.intra.peff.net>
- In-Reply-To
- <20140630165526.GA15690@sigill.intra.peff.net>
In this code, we try to convert both "foo.idx" and "foo" into "foo.pack". By stripping the suffix, we can avoid a confusing use of strbuf_splice, and make it clear that both cases are adding ".pack" to the end.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/verify-pack.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index 2fd29ce..972579f 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -27,10 +27,9 @@ static int verify_one_pack(const char *path, unsigned int flags) * normalize these forms to "foo.pack" for "index-pack --verify". */ strbuf_addstr(&arg, path); - if (ends_with(arg.buf, ".idx")) - strbuf_splice(&arg, arg.len - 3, 3, "pack", 4); - else if (!ends_with(arg.buf, ".pack")) - strbuf_add(&arg, ".pack", 5); + if (strbuf_strip_suffix(&arg, ".idx") || + !ends_with(arg.buf, ".pack")) + strbuf_addstr(&arg, ".pack"); argv[2] = arg.buf; memset(&index_pack, 0, sizeof(index_pack));
-- 2.0.0.566.gfe3e6b2