summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-29 07:32:11 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 16:11:38 (GMT)
commit3c84974207fb6a98eaa393cd4c3481d8ecdb8ce2 (patch)
treeefc70d4b3da5059ea0eeb6a48791aa6dc1805256 /sha1_file.c
parentdcde55bc58ae845307efbdce3a1071f75ccd758e (diff)
downloadgit-3c84974207fb6a98eaa393cd4c3481d8ecdb8ce2.zip
git-3c84974207fb6a98eaa393cd4c3481d8ecdb8ce2.tar.gz
git-3c84974207fb6a98eaa393cd4c3481d8ecdb8ce2.tar.bz2
[PATCH] Fixlets on top of Nico's clean-up.
If we prefer 0 as maxsize for diff_delta() to say "unlimited", let's be consistent about it. This patch also fixes type mismatch in a call to get_delta_hdr_size() from packed_delta_info(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 737ecb4..fdb8a45 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -598,9 +598,9 @@ static int packed_delta_info(unsigned char *base_sha1,
char *type,
unsigned long *sizep)
{
- unsigned char *data;
+ const unsigned char *data;
unsigned char delta_head[64];
- unsigned long data_size, result_size, base_size, verify_base_size;
+ unsigned long result_size, base_size, verify_base_size;
z_stream stream;
int st;
@@ -609,13 +609,10 @@ static int packed_delta_info(unsigned char *base_sha1,
if (sha1_object_info(base_sha1, type, &base_size))
die("cannot get info for delta-pack base");
- data = base_sha1 + 20;
- data_size = left - 20;
-
memset(&stream, 0, sizeof(stream));
- stream.next_in = data;
- stream.avail_in = data_size;
+ data = stream.next_in = base_sha1 + 20;
+ stream.avail_in = left - 20;
stream.next_out = delta_head;
stream.avail_out = sizeof(delta_head);