From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: Nicolas Pitre <nico@fluxnic.net>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/9] pack v4: move v2 tree entry generation code out of decode_entries
Date: Wed, 9 Oct 2013 21:46:09 +0700 [thread overview]
Message-ID: <1381329976-32082-3-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1381329976-32082-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
packv4-parse.c | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/packv4-parse.c b/packv4-parse.c
index 31c89c7..7b096cb 100644
--- a/packv4-parse.c
+++ b/packv4-parse.c
@@ -443,6 +443,31 @@ static int tree_entry_prefix(unsigned char *buf, unsigned long size,
return len;
}
+static int generate_tree_entry(struct packed_git *p,
+ const unsigned char **bufp,
+ unsigned char **dstp, unsigned long *sizep,
+ int what)
+{
+ const unsigned char *path, *sha1;
+ unsigned mode;
+ int len, pathlen;
+
+ path = get_pathref(p, what >> 1, &pathlen);
+ sha1 = get_sha1ref(p, bufp);
+ if (!path || !sha1)
+ return -1;
+ mode = (path[0] << 8) | path[1];
+ len = tree_entry_prefix(*dstp, *sizep,
+ path + 2, pathlen - 2, mode);
+ if (!len || len + 20 > *sizep)
+ return -1;
+ hashcpy(*dstp + len, sha1);
+ len += 20;
+ *dstp += len;
+ *sizep -= len;
+ return 0;
+}
+
static int decode_entries(struct packed_git *p, struct pack_window **w_curs,
off_t obj_offset, unsigned int start, unsigned int count,
unsigned char **dstp, unsigned long *sizep)
@@ -543,22 +568,8 @@ static int decode_entries(struct packed_git *p, struct pack_window **w_curs,
/*
* This is an actual tree entry to recreate.
*/
- const unsigned char *path, *sha1;
- unsigned mode;
- int len, pathlen;
-
- path = get_pathref(p, what >> 1, &pathlen);
- sha1 = get_sha1ref(p, &scp);
- if (!path || !sha1)
- return -1;
- mode = (path[0] << 8) | path[1];
- len = tree_entry_prefix(*dstp, *sizep,
- path + 2, pathlen - 2, mode);
- if (!len || len + 20 > *sizep)
+ if (generate_tree_entry(p, &scp, dstp, sizep, what))
return -1;
- hashcpy(*dstp + len, sha1);
- *dstp += len + 20;
- *sizep -= len + 20;
count--;
curpos++;
} else if (what & 1) {
--
1.8.2.83.gc99314b
next prev parent reply other threads:[~2013-10-09 14:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 14:46 [BAD PATCH 0/9] v4-aware tree walker API Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 1/9] sha1_file: provide real packed type in object_info_extended Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` Nguyễn Thái Ngọc Duy [this message]
2013-10-09 14:46 ` [PATCH 3/9] pv4_tree_desc: introduce new struct for pack v4 tree walker Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 4/9] pv4_tree_desc: use struct tree_desc from pv4_tree_desc Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 5/9] pv4_tree_desc: allow decode_entries to return v4 trees, one at a time Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 6/9] pv4_tree_desc: complete interface Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 7/9] pv4_tree_desc: don't bother looking for v4 trees if no v4 packs are present Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 8/9] pv4_tree_desc: avoid lookup_object() when possible Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 9/9] list-object.c: take "advantage" of new pv4_tree_desc interface Nguyễn Thái Ngọc Duy
2013-10-09 16:51 ` [BAD PATCH 0/9] v4-aware tree walker API Nicolas Pitre
2013-10-11 12:22 ` Duy Nguyen
2013-10-11 13:05 ` Duy Nguyen
2013-10-12 14:42 ` Nicolas Pitre
2013-10-12 15:59 ` Duy Nguyen
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=1381329976-32082-3-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=nico@fluxnic.net \
/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).