diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
| commit | 50c08d48722149d95f46bcc80a5211ea04b8a809 (patch) | |
| tree | 15c465be37ba4fdd8824edb95085b81076b73af9 /diff-delta.c | |
| parent | a248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff) | |
| parent | be65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff) | |
| download | git-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.gz | |
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 'diff-delta.c')
| -rw-r--r-- | diff-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-delta.c b/diff-delta.c index 1188b31cd0..5bc22047f8 100644 --- a/diff-delta.c +++ b/diff-delta.c @@ -131,8 +131,8 @@ static struct index ** delta_index(const unsigned char *buf, /* the maximum size for any opcode */ #define MAX_OP_SIZE COPYOP_SIZE(0xffffffff, 0xffffffff) -void *diff_delta(void *from_buf, unsigned long from_size, - void *to_buf, unsigned long to_size, +void *diff_delta(const void *from_buf, unsigned long from_size, + const void *to_buf, unsigned long to_size, unsigned long *delta_size, unsigned long max_size) { |