[PATCH 4/9] zip: use GIT_OID_HEXSZ for trailers
From: brian m. carlson <hidden>
Date: 2016-06-15 23:00:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
The object.h header is included in archive.h for this constant. It will be used by other parts of the archiving code in the future. Signed-off-by: brian m. carlson <redacted> --- archive-zip.c | 4 ++-- archive.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/archive-zip.c b/archive-zip.c
index 4bde019..5b9fe42 100644
--- a/archive-zip.c
+++ b/archive-zip.c@@ -427,12 +427,12 @@ static void write_zip_trailer(const unsigned char *sha1) copy_le16(trailer.entries, zip_dir_entries); copy_le32(trailer.size, zip_dir_offset); copy_le32(trailer.offset, zip_offset); - copy_le16(trailer.comment_length, sha1 ? 40 : 0); + copy_le16(trailer.comment_length, sha1 ? GIT_OID_HEXSZ : 0); write_or_die(1, zip_dir, zip_dir_offset); write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE); if (sha1) - write_or_die(1, sha1_to_hex(sha1), 40); + write_or_die(1, sha1_to_hex(sha1), GIT_OID_HEXSZ); } static void dos_time(time_t *time, int *dos_date, int *dos_time)
diff --git a/archive.h b/archive.h
index 4a791e1..fd21408 100644
--- a/archive.h
+++ b/archive.h@@ -2,6 +2,7 @@ #define ARCHIVE_H #include "pathspec.h" +#include "object.h" struct archiver_args { const char *base;
--
2.0.0.rc0