From dcde55bc58ae845307efbdce3a1071f75ccd758e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 29 Jun 2005 02:49:56 -0400 Subject: [PATCH] assorted delta code cleanup 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 Signed-off-by: Linus Torvalds --- patch-delta.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'patch-delta.c') diff --git a/patch-delta.c b/patch-delta.c index b68dd13c63..26281ea123 100644 --- a/patch-delta.c +++ b/patch-delta.c @@ -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; -- cgit v1.2.3