X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-objects.c;h=136a7f5aad61e8a90866ee7d0b4bc22e387f0396;hb=4a6c77cc0a2c9826d532c0ef1da4def8d8188584;hp=d6a3463604bf3e61d8cf8b7d55947c229def8f07;hpb=df45467ec98aa1c532196732c96a62589223353e;p=git.git

diff --git a/pack-objects.c b/pack-objects.c
index d6a34636..136a7f5a 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -204,7 +204,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e
 	if (!otherbuf)
 		die("unable to read %s", sha1_to_hex(entry->delta->sha1));
         delta_buf = diff_delta(otherbuf, othersize,
-			       buf, size, &delta_size, 0, NULL);
+			       buf, size, &delta_size, 0);
         if (!delta_buf || delta_size != entry->delta_size)
         	die("delta size changed");
         free(buf);
@@ -810,7 +810,6 @@ static int type_size_sort(const struct object_entry *a, const struct object_entr
 struct unpacked {
 	struct object_entry *entry;
 	void *data;
-	void **delta_index;
 };
 
 /*
@@ -892,8 +891,7 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
 	if (sizediff >= max_size)
 		return -1;
 	delta_buf = diff_delta(old->data, oldsize,
-			       cur->data, size, &delta_size,
-			       max_size, old->delta_index);
+			       cur->data, size, &delta_size, max_size);
 	if (!delta_buf)
 		return 0;
 	cur_entry->delta = old_entry;
@@ -950,7 +948,6 @@ static void find_deltas(struct object_entry **list, int window, int depth)
 			 */
 			continue;
 
-		free(n->delta_index);
 		free(n->data);
 		n->entry = entry;
 		n->data = read_sha1_file(entry->sha1, type, &size);
@@ -977,10 +974,8 @@ static void find_deltas(struct object_entry **list, int window, int depth)
 	if (progress)
 		fputc('\n', stderr);
 
-	for (i = 0; i < window; ++i) {
-		free(array[i].delta_index);
+	for (i = 0; i < window; ++i)
 		free(array[i].data);
-	}
 	free(array);
 }