From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Christian Couder <chriscool@tuxfamily.org>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
Jonathan Tan <jonathantanmy@google.com>
Subject: [PATCH v4 02/12] packfile: expose get_delta_base()
Date: Wed, 18 Dec 2019 12:25:37 +0100 [thread overview]
Message-ID: <20191218112547.4974-3-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20191218112547.4974-1-chriscool@tuxfamily.org>
From: Jeff King <peff@peff.net>
In a following commit get_delta_base() will be used outside
packfile.c, so let's make it non static and declare it in
packfile.h.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
packfile.c | 10 +++++-----
packfile.h | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/packfile.c b/packfile.c
index 355066de17..81e66847bf 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1173,11 +1173,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r,
return NULL;
}
-static off_t get_delta_base(struct packed_git *p,
- struct pack_window **w_curs,
- off_t *curpos,
- enum object_type type,
- off_t delta_obj_offset)
+off_t get_delta_base(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t *curpos,
+ enum object_type type,
+ off_t delta_obj_offset)
{
unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
off_t base_offset;
diff --git a/packfile.h b/packfile.h
index fc7904ec81..ec536a4ae5 100644
--- a/packfile.h
+++ b/packfile.h
@@ -151,6 +151,9 @@ void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object
unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs,
+ off_t *curpos, enum object_type type,
+ off_t delta_obj_offset);
void release_pack_memory(size_t);
--
2.24.1.498.g561400140f
next prev parent reply other threads:[~2019-12-18 11:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 11:25 [PATCH v4 00/12] Rewrite packfile reuse code Christian Couder
2019-12-18 11:25 ` [PATCH v4 01/12] builtin/pack-objects: report reused packfile objects Christian Couder
2019-12-18 11:25 ` Christian Couder [this message]
2019-12-18 11:25 ` [PATCH v4 03/12] ewah/bitmap: introduce bitmap_word_alloc() Christian Couder
2019-12-18 11:25 ` [PATCH v4 04/12] pack-bitmap: introduce bitmap_walk_contains() Christian Couder
2019-12-18 11:25 ` [PATCH v4 05/12] pack-bitmap: uninteresting oid can be outside bitmapped packfile Christian Couder
2019-12-18 11:25 ` [PATCH v4 06/12] pack-bitmap: simplify bitmap_has_oid_in_uninteresting() Christian Couder
2019-12-18 11:25 ` [PATCH v4 07/12] csum-file: introduce hashfile_total() Christian Couder
2019-12-18 11:25 ` [PATCH v4 08/12] pack-objects: introduce pack.allowPackReuse Christian Couder
2019-12-18 11:25 ` [PATCH v4 09/12] builtin/pack-objects: introduce obj_is_packed() Christian Couder
2019-12-18 11:25 ` [PATCH v4 10/12] pack-objects: improve partial packfile reuse Christian Couder
2019-12-18 11:25 ` [PATCH v4 11/12] pack-objects: add checks for duplicate objects Christian Couder
2019-12-18 11:25 ` [PATCH v4 12/12] pack-bitmap: don't rely on bitmap_git->reuse_objects Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191218112547.4974-3-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
/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.
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 NNTP newsgroup(s).