Support zone.tab in bionic, and remove the file format version.
Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c
index 31068f1..0ab9e0f 100644
--- a/libc/tzcode/localtime.c
+++ b/libc/tzcode/localtime.c
@@ -2247,13 +2247,11 @@
}
// byte[12] tzdata_version -- "tzdata2012f\0"
- // int file_format_version -- 1
// int index_offset
// int data_offset
// int zonetab_offset
struct bionic_tzdata_header {
char tzdata_version[12];
- int32_t file_format_version;
int32_t index_offset;
int32_t data_offset;
int32_t zonetab_offset;
@@ -2269,14 +2267,9 @@
close(fd);
return -1;
}
- if (ntohl(header.file_format_version) != 1) {
- fprintf(stderr, "%s: bad file format version: %d\n", __FUNCTION__, header.file_format_version);
- close(fd);
- return -1;
- }
#if 0
- fprintf(stderr, "version: %s (%d)\n", header.tzdata_version, ntohl(header.file_format_version));
+ fprintf(stderr, "version: %s\n", header.tzdata_version);
fprintf(stderr, "index_offset = %d\n", ntohl(header.index_offset));
fprintf(stderr, "data_offset = %d\n", ntohl(header.data_offset));
fprintf(stderr, "zonetab_offset = %d\n", ntohl(header.zonetab_offset));