From: Junio C Hamano <junkio@cox.net>
Date: Wed, 29 Jun 2005 07:32:11 +0000 (-0700)
Subject: [PATCH] Fixlets on top of Nico's clean-up.
X-Git-Tag: v0.99~128
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3c84974207fb6a98eaa393cd4c3481d8ecdb8ce2;p=git.git

[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>
---

diff --git a/diffcore-break.c b/diffcore-break.c
index 9852f9716..06f9a7f0e 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -65,7 +65,7 @@ static int should_break(struct diff_filespec *src,
 
 	delta = diff_delta(src->data, src->size,
 			   dst->data, dst->size,
-			   &delta_size, ~0UL);
+			   &delta_size, 0);
 
 	/* Estimate the edit size by interpreting delta. */
 	if (count_delta(delta, delta_size,
diff --git a/sha1_file.c b/sha1_file.c
index 737ecb480..fdb8a45c4 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);
 
diff --git a/test-delta.c b/test-delta.c
index da51efc24..37ef86b28 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 	if (argv[1][1] == 'd')
 		out_buf = diff_delta(from_buf, from_size,
 				     data_buf, data_size,
-				     &out_size, ~0UL);
+				     &out_size, 0);
 	else
 		out_buf = patch_delta(from_buf, from_size,
 				      data_buf, data_size,