From 022f6891faf1fffa435f2bc613c25e8482a32702 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Wed, 2 Mar 2016 22:41:32 -0800
Subject: 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.
---
include/jemalloc/internal/nstime.h | 2 +-
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
--
cgit v0.12