diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-28 11:58:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-28 11:58:27 -0800 |
| commit | 597388f6a1c18a117904c307c20542d8a79a1fcd (patch) | |
| tree | 035f1083845981205f2f73b5db158f1598c89d19 /archive-zip.c | |
| parent | fbe3d87e5fcef2e0fff41c3b0589331c889dfb59 (diff) | |
| parent | 66035a6b3d629b546daef3784f5351d58f4f17b1 (diff) | |
| download | git-597388f6a1c18a117904c307c20542d8a79a1fcd.tar.gz git-597388f6a1c18a117904c307c20542d8a79a1fcd.tar.xz | |
Merge branch 'np/types'
* np/types:
Cleanup check_valid in commit-tree.
make sure enum object_type is signed
get rid of lookup_object_type()
convert object type handling from a string to a number
formalize typename(), and add its reverse type_from_string()
sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
sha1_file.c: cleanup "offset" usage
sha1_file.c: cleanup hdr usage
Diffstat (limited to 'archive-zip.c')
| -rw-r--r-- | archive-zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-zip.c b/archive-zip.c index f31b8ed82..7c4984886 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -167,7 +167,7 @@ static int write_zip_entry(const unsigned char *sha1, int pathlen; unsigned char *out; char *path; - char type[20]; + enum object_type type; void *buffer = NULL; void *deflated = NULL; @@ -195,7 +195,7 @@ static int write_zip_entry(const unsigned char *sha1, if (S_ISREG(mode) && zlib_compression_level != 0) method = 8; result = 0; - buffer = read_sha1_file(sha1, type, &size); + buffer = read_sha1_file(sha1, &type, &size); if (!buffer) die("cannot read %s", sha1_to_hex(sha1)); crc = crc32(crc, buffer, size); |