From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 03/12] packfile: factor out .pack to .idx name conversion
Date: Thu, 4 Apr 2019 19:22:59 -0400 [thread overview]
Message-ID: <20190404232259.GC21839@sigill.intra.peff.net> (raw)
In-Reply-To: <20190404232104.GA27770@sigill.intra.peff.net>
When we open a pack .idx, we have to convert the "foo.pack" name stored
in the packed_git struct to "foo.idx". This isn't too complicated, but
we do encode some policy in the form of a BUG(). Let's pull this into
its own function so it can be reused.
Signed-off-by: Jeff King <peff@peff.net>
---
packfile.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/packfile.c b/packfile.c
index 16bcb75262..054269ae5d 100644
--- a/packfile.c
+++ b/packfile.c
@@ -186,18 +186,24 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
return 0;
}
+static char *pack_name_to_idx(const char *pack_name)
+{
+ size_t len;
+
+ if (!strip_suffix(pack_name, ".pack", &len))
+ BUG("pack_name does not end in .pack");
+ return xstrfmt("%.*s.idx", (int)len, pack_name);
+}
+
int open_pack_index(struct packed_git *p)
{
char *idx_name;
- size_t len;
int ret;
if (p->index_data)
return 0;
- if (!strip_suffix(p->pack_name, ".pack", &len))
- BUG("pack_name does not end in .pack");
- idx_name = xstrfmt("%.*s.idx", (int)len, p->pack_name);
+ idx_name = pack_name_to_idx(p->pack_name);
ret = check_packed_git_idx(idx_name, p);
free(idx_name);
return ret;
--
2.21.0.714.gd1be1d035b
next prev parent reply other threads:[~2019-04-04 23:23 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 23:21 [PATCH 0/12] a rabbit hole of update-server-info fixes Jeff King
2019-04-04 23:22 ` [PATCH 01/12] t5319: fix bogus cat-file argument Jeff King
2019-04-05 0:44 ` Ramsay Jones
2019-04-05 1:41 ` Jeff King
2019-04-05 1:46 ` Jeff King
2019-04-04 23:22 ` [PATCH 02/12] t5319: drop useless --buffer from cat-file Jeff King
2019-04-04 23:22 ` Jeff King [this message]
2019-04-04 23:25 ` [PATCH 04/12] packfile: check midx coverage with .idx rather than .pack Jeff King
2019-04-05 8:05 ` René Scharfe
2019-04-05 13:21 ` Jeff King
2019-04-05 13:30 ` Jeff King
2019-04-05 12:01 ` SZEDER Gábor
2019-04-05 13:40 ` Jeff King
2019-04-04 23:27 ` [PATCH 05/12] http: simplify parsing of remote objects/info/packs Jeff King
2019-04-05 10:41 ` René Scharfe
2019-04-05 18:11 ` Jeff King
2019-04-05 20:17 ` René Scharfe
2019-04-04 23:27 ` [PATCH 06/12] server-info: fix blind pointer arithmetic Jeff King
2019-04-04 23:28 ` [PATCH 07/12] server-info: simplify cleanup in parse_pack_def() Jeff King
2019-04-04 23:28 ` [PATCH 08/12] server-info: use strbuf to read old info/packs file Jeff King
2019-04-04 23:29 ` [PATCH 09/12] server-info: drop nr_alloc struct member Jeff King
2019-04-04 23:30 ` [PATCH 10/12] packfile.h: drop extern from function declarations Jeff King
2019-04-04 23:30 ` [PATCH 11/12] server-info: drop objdirlen pointer arithmetic Jeff King
2019-04-04 23:31 ` [PATCH 12/12] update_info_refs(): drop unused force parameter Jeff King
2019-04-05 5:46 ` [PATCH 0/12] a rabbit hole of update-server-info fixes Junio C Hamano
2019-04-05 18:03 ` [PATCH v2 0/13] a rabbit hole of update-server-info (and midx!) fixes Jeff King
2019-04-05 18:03 ` [PATCH v2 01/13] packfile.h: drop extern from function declarations Jeff King
2019-04-05 19:19 ` Ramsay Jones
2019-04-05 19:25 ` Jeff King
2019-04-08 5:13 ` Junio C Hamano
2019-04-08 20:32 ` Jeff King
2019-04-09 15:08 ` Junio C Hamano
2019-04-09 15:15 ` Jeff King
2019-04-05 18:04 ` [PATCH v2 02/13] pack-revindex: open index if necessary Jeff King
2019-04-05 18:04 ` [PATCH v2 03/13] t5319: fix bogus cat-file argument Jeff King
2019-04-05 18:05 ` [PATCH v2 04/13] t5319: drop useless --buffer from cat-file Jeff King
2019-04-05 18:06 ` [PATCH v2 05/13] midx: check both pack and index names for containment Jeff King
2019-04-05 20:18 ` René Scharfe
2019-04-05 18:06 ` [PATCH v2 06/13] packfile: fix pack basename computation Jeff King
2019-04-05 18:12 ` [PATCH v2 07/13] http: simplify parsing of remote objects/info/packs Jeff King
2019-04-05 18:13 ` [PATCH v2 08/13] server-info: fix blind pointer arithmetic Jeff King
2019-04-05 18:13 ` [PATCH v2 09/13] server-info: simplify cleanup in parse_pack_def() Jeff King
2019-04-05 18:16 ` Jeff King
2019-04-05 18:13 ` [PATCH v2 10/13] server-info: use strbuf to read old info/packs file Jeff King
2019-04-05 18:14 ` [PATCH v2 11/13] server-info: drop nr_alloc struct member Jeff King
2019-04-05 18:14 ` [PATCH v2 12/13] server-info: drop objdirlen pointer arithmetic Jeff King
2019-04-05 18:14 ` [PATCH v2 13/13] update_info_refs(): drop unused force parameter Jeff King
2019-04-05 18:19 ` [PATCH v2 0/13] a rabbit hole of update-server-info (and midx!) fixes Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190404232259.GC21839@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).