archive-zip: remove uncompressed_size
We only need size and compressed_size. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
May 3, 2012 at 08:51 UTC
60df6bd19ad40e3eae2926f3785a63e670c150ea
1 file changed
+3
-5
archive-zip.c
+3
-5
@@ -129,7 +129,6 @@ static int write_zip_entry(struct archiver_args *args,
129
struct zip_dir_header dirent;
130
unsigned long attr2;
131
unsigned long compressed_size;
132
- unsigned long uncompressed_size;
132
unsigned long crc;
133
unsigned long direntsize;
134
int method;
@@ -149,7 +148,7 @@ static int write_zip_entry(struct archiver_args *args,
148
method = 0;
149
attr2 = 16;
150
out = NULL;
152
- uncompressed_size = 0;
151
+ size = 0;
152
compressed_size = 0;
153
buffer = NULL;
154
size = 0;
@@ -166,7 +165,6 @@ static int write_zip_entry(struct archiver_args *args,
165
method = 8;
166
crc = crc32(crc, buffer, size);
167
out = buffer;
169
- uncompressed_size = size;
168
compressed_size = size;
169
} else {
170
return error("unsupported file mode: 0%o (SHA1: %s)", mode,
@@ -204,7 +202,7 @@ static int write_zip_entry(struct archiver_args *args,
202
copy_le16(dirent.mdate, zip_date);
203
copy_le32(dirent.crc32, crc);
204
copy_le32(dirent.compressed_size, compressed_size);
207
- copy_le32(dirent.size, uncompressed_size);
205
+ copy_le32(dirent.size, size);
206
copy_le16(dirent.filename_length, pathlen);
207
copy_le16(dirent.extra_length, 0);
208
copy_le16(dirent.comment_length, 0);
@@ -226,7 +224,7 @@ static int write_zip_entry(struct archiver_args *args,
224
copy_le16(header.mdate, zip_date);
225
copy_le32(header.crc32, crc);
226
copy_le32(header.compressed_size, compressed_size);
229
- copy_le32(header.size, uncompressed_size);
227
+ copy_le32(header.size, size);
228
copy_le16(header.filename_length, pathlen);
229
copy_le16(header.extra_length, 0);
230
write_or_die(1, &header, ZIP_LOCAL_HEADER_SIZE);