summaryrefslogtreecommitdiff
path: root/count-delta.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2005-06-29 06:49:56 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 16:11:38 (GMT)
commitdcde55bc58ae845307efbdce3a1071f75ccd758e (patch)
treefc76dbd773c225cef239a0774304335c8116f2bc /count-delta.c
parente5e3e0f5001f51fe388d530481e56651729add1a (diff)
downloadgit-dcde55bc58ae845307efbdce3a1071f75ccd758e.zip
git-dcde55bc58ae845307efbdce3a1071f75ccd758e.tar.gz
git-dcde55bc58ae845307efbdce3a1071f75ccd758e.tar.bz2
[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 <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'count-delta.c')
-rw-r--r--count-delta.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/count-delta.c b/count-delta.c
index 8901034..7559ff6 100644
--- a/count-delta.c
+++ b/count-delta.c
@@ -6,23 +6,9 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
+#include "delta.h"
#include "count-delta.h"
-static unsigned long get_hdr_size(const unsigned char **datap)
-{
- const unsigned char *data = *datap;
- unsigned char cmd = *data++;
- unsigned long size = cmd & ~0x80;
- int i = 7;
- while (cmd & 0x80) {
- cmd = *data++;
- size |= (cmd & ~0x80) << i;
- i += 7;
- }
- *datap = data;
- return size;
-}
-
/*
* NOTE. We do not _interpret_ delta fully. As an approximation, we
* just count the number of bytes that are copied from the source, and
@@ -44,15 +30,14 @@ int count_delta(void *delta_buf, unsigned long delta_size,
unsigned char cmd;
unsigned long src_size, dst_size, out;
- /* the smallest delta size possible is 4 bytes */
- if (delta_size < 4)
+ if (delta_size < DELTA_SIZE_MIN)
return -1;
data = delta_buf;
top = delta_buf + delta_size;
- src_size = get_hdr_size(&data);
- dst_size = get_hdr_size(&data);
+ src_size = get_delta_hdr_size(&data);
+ dst_size = get_delta_hdr_size(&data);
added_literal = copied_from_source = out = 0;
while (data < top) {