count-delta: match get_delta_hdr_size() changes.

[git.git] / count-delta.c

diff --git a/count-delta.c b/count-delta.c
index 7559ff6..54215df 100644 (file)
--- a/count-delta.c
+++ b/count-delta.c
@@ -16,11 +16,7 @@
  *
  * Number of bytes that are _not_ copied from the source is deletion,
  * and number of inserted literal bytes are addition, so sum of them
- * is the extent of damage.  xdelta can express an edit that copies
- * data inside of the destination which originally came from the
- * source.  We do not count that in the following routine, so we are
- * undercounting the source material that remains in the final output
- * that way.
+ * is the extent of damage.
  */
 int count_delta(void *delta_buf, unsigned long delta_size,
                unsigned long *src_copied, unsigned long *literal_added)
@@ -36,8 +32,8 @@ int count_delta(void *delta_buf, unsigned long delta_size,
        data = delta_buf;
        top = delta_buf + delta_size;
 
-       src_size = get_delta_hdr_size(&data);
-       dst_size = get_delta_hdr_size(&data);
+       src_size = get_delta_hdr_size(&data, top);
+       dst_size = get_delta_hdr_size(&data, top);
 
        added_literal = copied_from_source = out = 0;
        while (data < top) {
@@ -50,13 +46,10 @@ int count_delta(void *delta_buf, unsigned long delta_size,
                        if (cmd & 0x08) cp_off |= (*data++ << 24);
                        if (cmd & 0x10) cp_size = *data++;
                        if (cmd & 0x20) cp_size |= (*data++ << 8);
+                       if (cmd & 0x40) cp_size |= (*data++ << 16);
                        if (cp_size == 0) cp_size = 0x10000;
 
-                       if (cmd & 0x40)
-                               /* copy from dst */
-                               ;
-                       else
-                               copied_from_source += cp_size;
+                       copied_from_source += cp_size;
                        out += cp_size;
                } else {
                        /* write literal into dst */