ls-tree: major rewrite to do pathspec

diff --git a/count-delta.c b/count-delta.c
index c7f3767880aa0e1e5f3922f96176e4dfad3fa296..7559ff68b10925154af3d52b8134f47fcf7c5233 100644 (file)
--- a/count-delta.c
+++ b/count-delta.c
@@ -6,26 +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 long size;
-       unsigned char cmd;
-       int i;
-       size = i = 0;
-       cmd = *data++;
-       while (cmd) {
-               if (cmd & 1)
-                       size |= *data++ << i;
-               i += 8;
-               cmd >>= 1;
-       }
-       *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
@@ -47,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 6 bytes */
-       if (delta_size < 6)
+       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) {