mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Fixlets on top of Nico's clean-up.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-06-29 00:32:11 -07:00
committed by Linus Torvalds
parent dcde55bc58
commit 3c84974207
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diffcore-break.c
View File

@ -65,7 +65,7 @@ static int should_break(struct diff_filespec *src,
delta = diff_delta(src->data, src->size, delta = diff_delta(src->data, src->size,
dst->data, dst->size, dst->data, dst->size,
&delta_size, ~0UL); &delta_size, 0);
/* Estimate the edit size by interpreting delta. */ /* Estimate the edit size by interpreting delta. */
if (count_delta(delta, delta_size, if (count_delta(delta, delta_size,

11
sha1_file.c
View File

@ -598,9 +598,9 @@ static int packed_delta_info(unsigned char *base_sha1,
char *type, char *type,
unsigned long *sizep) unsigned long *sizep)
{ {
unsigned char *data; const unsigned char *data;
unsigned char delta_head[64]; 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; z_stream stream;
int st; int st;
@ -609,13 +609,10 @@ static int packed_delta_info(unsigned char *base_sha1,
if (sha1_object_info(base_sha1, type, &base_size)) if (sha1_object_info(base_sha1, type, &base_size))
die("cannot get info for delta-pack base"); die("cannot get info for delta-pack base");
data = base_sha1 + 20;
data_size = left - 20;
memset(&stream, 0, sizeof(stream)); memset(&stream, 0, sizeof(stream));
stream.next_in = data; data = stream.next_in = base_sha1 + 20;
stream.avail_in = data_size; stream.avail_in = left - 20;
stream.next_out = delta_head; stream.next_out = delta_head;
stream.avail_out = sizeof(delta_head); stream.avail_out = sizeof(delta_head);

2
test-delta.c
View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
if (argv[1][1] == 'd') if (argv[1][1] == 'd')
out_buf = diff_delta(from_buf, from_size, out_buf = diff_delta(from_buf, from_size,
data_buf, data_size, data_buf, data_size,
&out_size, ~0UL); &out_size, 0);
else else
out_buf = patch_delta(from_buf, from_size, out_buf = patch_delta(from_buf, from_size,
data_buf, data_size, data_buf, data_size,