diff options
| author | Jason Evans <jasone@canonware.com> | 2016-03-03 06:41:32 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-03-03 06:45:37 (GMT) |
| commit | 022f6891faf1fffa435f2bc613c25e8482a32702 (patch) | |
| tree | e5e4e5f31abbeabb31ef843b14de15fed1c63a2b | |
| parent | 33184bf69813087bf1885b0993685f9d03320c69 (diff) | |
| download | jemalloc-022f6891faf1fffa435f2bc613c25e8482a32702.zip jemalloc-022f6891faf1fffa435f2bc613c25e8482a32702.tar.gz jemalloc-022f6891faf1fffa435f2bc613c25e8482a32702.tar.bz2 | |
Avoid a potential innocuous compiler warning.
Add a cast to avoid comparing a ssize_t value to a uint64_t value that
is always larger than a 32-bit ssize_t. This silences an innocuous
compiler warning from e.g. gcc 4.2.1 about the comparison always having
the same result.
| -rw-r--r-- | include/jemalloc/internal/nstime.h | 2 | ||||
| -rw-r--r-- | src/arena.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/jemalloc/internal/nstime.h b/include/jemalloc/internal/nstime.h index bd04f04..dcb4b47 100644 --- a/include/jemalloc/internal/nstime.h +++ b/include/jemalloc/internal/nstime.h @@ -7,7 +7,7 @@ typedef struct nstime_s nstime_t; /* Maximum supported number of seconds (~584 years). */ -#define NSTIME_SEC_MAX 18446744072 +#define NSTIME_SEC_MAX KQU(18446744072) #endif /* JEMALLOC_H_TYPES */ /******************************************************************************/ diff --git a/src/arena.c b/src/arena.c index 965c0fe..f436959 100644 --- a/src/arena.c +++ b/src/arena.c @@ -1352,7 +1352,11 @@ static bool arena_decay_time_valid(ssize_t decay_time) { - return (decay_time >= -1 && decay_time <= NSTIME_SEC_MAX); + if (decay_time < -1) + return (false); + if (decay_time == -1 || (uint64_t)decay_time <= NSTIME_SEC_MAX) + return (true); + return (false); } ssize_t |