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

Merge "Fix most of the tzcode warnings."

Browse Source
This commit is contained in:
Elliott Hughes 2014-06-12 18:18:24 +00:00 committed by Gerrit Code Review
commit d242aff47d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/tzcode/localtime.c
View File

@ -281,7 +281,7 @@ settzname(void)
#endif /* defined ALTZONE */ #endif /* defined ALTZONE */
#ifdef ALL_STATE #ifdef ALL_STATE
if (sp == NULL) { if (sp == NULL) {
tzname[0] = tzname[1] = gmt; tzname[0] = tzname[1] = (char *) gmt;
return; return;
} }
#endif /* defined ALL_STATE */ #endif /* defined ALL_STATE */
@ -332,11 +332,11 @@ settzname(void)
} }
static int static int
differ_by_repeat(const time_t t1, const time_t t0) differ_by_repeat(const time_t t1 __unused, const time_t t0 __unused)
{ {
if (TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS) if (TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS)
return 0; return 0;
#if __LP64__ // 32-bit Android only has a signed 32-bit time_t; 64-bit Android is fixed. #if defined(__LP64__) // 32-bit Android only has a signed 32-bit time_t; 64-bit Android is fixed.
return t1 - t0 == SECSPERREPEAT; return t1 - t0 == SECSPERREPEAT;
#endif #endif
} }
@ -2108,10 +2108,6 @@ posix2time(time_t t)
#include <stdint.h> #include <stdint.h>
#include <arpa/inet.h> // For ntohl(3). #include <arpa/inet.h> // For ntohl(3).
static int to_int(unsigned char* s) {
return (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
}
static int __bionic_open_tzdata_path(const char* path_prefix_variable, const char* path_suffix, static int __bionic_open_tzdata_path(const char* path_prefix_variable, const char* path_suffix,
const char* olson_id, int* data_size) { const char* olson_id, int* data_size) {
const char* path_prefix = getenv(path_prefix_variable); const char* path_prefix = getenv(path_prefix_variable);