generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support zone.tab in bionic, and remove the file format version.

Browse Source 
Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
This commit is contained in:
Elliott Hughes
2012-10-22 14:47:58 -07:00
parent eb370aa31d
commit 2393535f0d
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libc/tzcode/localtime.c
View File

@@ -2247,13 +2247,11 @@ static int __bionic_open_tzdata_path(const char* path, const char* olson_id, int
}
// 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 @@ static int __bionic_open_tzdata_path(const char* path, const char* olson_id, int
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));