mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archive-zip: use enum for compression method

Browse Source 
Add an enumeration to assign names to the magic values that determine
the ZIP compression method to use.  Use those names to improve code
readability.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2019-12-07 13:20:33 +01:00
committed by Junio C Hamano
parent 75b2f01a0f
commit e05e8cf074
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
archive-zip.c
View File

@ -24,6 +24,11 @@ static unsigned int max_creator_version;
#define ZIP_STREAM (1 << 3) #define ZIP_STREAM (1 << 3)
#define ZIP_UTF8 (1 << 11) #define ZIP_UTF8 (1 << 11)
enum zip_method {
ZIP_METHOD_STORE = 0,
ZIP_METHOD_DEFLATE = 8
};
struct zip_local_header { struct zip_local_header {
unsigned char magic[4]; unsigned char magic[4];
unsigned char version[2]; unsigned char version[2];
@ -291,7 +296,7 @@ static int write_zip_entry(struct archiver_args *args,
unsigned long attr2; unsigned long attr2;
unsigned long compressed_size; unsigned long compressed_size;
unsigned long crc; unsigned long crc;
int method; enum zip_method method;
unsigned char *out; unsigned char *out;
void *deflated = NULL; void *deflated = NULL;
void *buffer; void *buffer;
@ -320,7 +325,7 @@ static int write_zip_entry(struct archiver_args *args,
} }
if (S_ISDIR(mode) || S_ISGITLINK(mode)) { if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
method = 0; method = ZIP_METHOD_STORE;
attr2 = 16; attr2 = 16;
out = NULL; out = NULL;
size = 0; size = 0;
@ -330,13 +335,13 @@ static int write_zip_entry(struct archiver_args *args,
enum object_type type = oid_object_info(args->repo, oid, enum object_type type = oid_object_info(args->repo, oid,
&size); &size);
method = 0; method = ZIP_METHOD_STORE;
attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) : attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
(mode & 0111) ? ((mode) << 16) : 0; (mode & 0111) ? ((mode) << 16) : 0;
if (S_ISLNK(mode) || (mode & 0111)) if (S_ISLNK(mode) || (mode & 0111))
creator_version = 0x0317; creator_version = 0x0317;
if (S_ISREG(mode) && args->compression_level != 0 && size > 0) if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
method = 8; method = ZIP_METHOD_DEFLATE;
if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert && if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
size > big_file_threshold) { size > big_file_threshold) {
@ -358,7 +363,7 @@ static int write_zip_entry(struct archiver_args *args,
buffer, size); buffer, size);
out = buffer; out = buffer;
} }
compressed_size = (method == 0) ? size : 0; compressed_size = (method == ZIP_METHOD_STORE) ? size : 0;
} else { } else {
return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode, return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode,
oid_to_hex(oid)); oid_to_hex(oid));
@ -367,13 +372,13 @@ static int write_zip_entry(struct archiver_args *args,
if (creator_version > max_creator_version) if (creator_version > max_creator_version)
max_creator_version = creator_version; max_creator_version = creator_version;
if (buffer && method == 8) { if (buffer && method == ZIP_METHOD_DEFLATE) {
out = deflated = zlib_deflate_raw(buffer, size, out = deflated = zlib_deflate_raw(buffer, size,
args->compression_level, args->compression_level,
&compressed_size); &compressed_size);
if (!out || compressed_size >= size) { if (!out || compressed_size >= size) {
out = buffer; out = buffer;
method = 0; method = ZIP_METHOD_STORE;
compressed_size = size; compressed_size = size;
} }
} }
@ -420,7 +425,7 @@ static int write_zip_entry(struct archiver_args *args,
zip_offset += ZIP64_EXTRA_SIZE; zip_offset += ZIP64_EXTRA_SIZE;
} }
if (stream && method == 0) { if (stream && method == ZIP_METHOD_STORE) {
unsigned char buf[STREAM_BUFFER_SIZE]; unsigned char buf[STREAM_BUFFER_SIZE];
ssize_t readlen; ssize_t readlen;
@ -443,7 +448,7 @@ static int write_zip_entry(struct archiver_args *args,
zip_offset += compressed_size; zip_offset += compressed_size;
write_zip_data_desc(size, compressed_size, crc); write_zip_data_desc(size, compressed_size, crc);
} else if (stream && method == 8) { } else if (stream && method == ZIP_METHOD_DEFLATE) {
unsigned char buf[STREAM_BUFFER_SIZE]; unsigned char buf[STREAM_BUFFER_SIZE];
ssize_t readlen; ssize_t readlen;
git_zstream zstream; git_zstream zstream;