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

[PATCH] assorted delta code cleanup

Browse Source 
This is a wrap-up patch including all the cleanups I've done to the
delta code and its usage.  The most important change is the
factorization of the delta header handling code.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nicolas Pitre
2005-06-29 02:49:56 -04:00
committed by Linus Torvalds
parent e5e3e0f500
commit dcde55bc58
6 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patch-delta.c
View File

@ -20,36 +20,20 @@ void *patch_delta(void *src_buf, unsigned long src_size,
const unsigned char *data, *top;
unsigned char *dst_buf, *out, cmd;
unsigned long size;
int i;
/* the smallest delta size possible is 4 bytes */
if (delta_size < 4)
if (delta_size < DELTA_SIZE_MIN)
return NULL;
data = delta_buf;
top = delta_buf + delta_size;
/* make sure the orig file size matches what we expect */
cmd = *data++;
size = cmd & ~0x80;
i = 7;
while (cmd & 0x80) {
cmd = *data++;
size |= (cmd & ~0x80) << i;
i += 7;
}
size = get_delta_hdr_size(&data);
if (size != src_size)
return NULL;
/* now the result size */
cmd = *data++;
size = cmd & ~0x80;
i = 7;
while (cmd & 0x80) {
cmd = *data++;
size |= (cmd & ~0x80) << i;
i += 7;
}
size = get_delta_hdr_size(&data);
dst_buf = malloc(size);
if (!dst_buf)
return NULL;