From 9f1aa51c9801f076e6b670139777b2150de62dc5 Mon Sep 17 00:00:00 2001 From: Babneet Singh Date: Fri, 6 Sep 2024 11:46:01 -0400 Subject: [PATCH] Fix error: comparison of unsigned expression < 0 is always false Fixes: #7454 Signed-off-by: Babneet Singh --- thread/common/omrthreadattr.c | 3 +-- thread/common/omrthreadattr.h | 2 ++ thread/unix/omrthreadattr.c | 3 +-- thread/zos390/omrthreadattr.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/thread/common/omrthreadattr.c b/thread/common/omrthreadattr.c index b792a5c9fc8..d6aa24ce99f 100644 --- a/thread/common/omrthreadattr.c +++ b/thread/common/omrthreadattr.c @@ -33,7 +33,6 @@ #include "omrthreadattr.h" #define J9THREAD_ATTR_IS_VALID(attr) ((attr) && (*(attr)) && ((*(attr))->size == sizeof(omrthread_attr))) -#define J9THREAD_VALUE_OUT_OF_RANGE(val, lo, hi) (((val) < (lo)) || ((val) > (hi))) static intptr_t failedToSetAttr(intptr_t rc); @@ -220,7 +219,7 @@ omrthread_attr_set_priority(omrthread_attr_t *attr, omrthread_prio_t priority) return J9THREAD_ERR_INVALID_ATTR; } - if (J9THREAD_VALUE_OUT_OF_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { + if (!J9THREAD_VALUE_WITHIN_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { return J9THREAD_ERR_INVALID_VALUE; } diff --git a/thread/common/omrthreadattr.h b/thread/common/omrthreadattr.h index 082361d77b5..b06fb5db790 100644 --- a/thread/common/omrthreadattr.h +++ b/thread/common/omrthreadattr.h @@ -42,6 +42,8 @@ typedef struct omrthread_attr { const char *name; } omrthread_attr; ++#define J9THREAD_VALUE_WITHIN_RANGE(val, lo, hi) (((val) >= (lo)) && ((val) <= (hi))) + #ifdef __cplusplus } #endif diff --git a/thread/unix/omrthreadattr.c b/thread/unix/omrthreadattr.c index 8fd2b786ca5..132b99666bf 100644 --- a/thread/unix/omrthreadattr.c +++ b/thread/unix/omrthreadattr.c @@ -39,7 +39,6 @@ #include "unix/unixthreadattr.h" #define J9THREAD_ATTR_IS_VALID(attr) ((attr) && (*(attr)) && ((*(attr))->size == sizeof(unixthread_attr))) -#define J9THREAD_VALUE_OUT_OF_RANGE(val, lo, hi) (((val) < (lo)) || ((val) > (hi))) static intptr_t setStacksize(pthread_attr_t *pattr, uintptr_t stacksize); static intptr_t setPriority(pthread_attr_t *pattr, omrthread_prio_t priority); @@ -288,7 +287,7 @@ omrthread_attr_set_priority(omrthread_attr_t *attr, omrthread_prio_t priority) return J9THREAD_SUCCESS; } - if (J9THREAD_VALUE_OUT_OF_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { + if (!J9THREAD_VALUE_WITHIN_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { return J9THREAD_ERR_INVALID_VALUE; } diff --git a/thread/zos390/omrthreadattr.c b/thread/zos390/omrthreadattr.c index b60727387e4..93dbd90a281 100644 --- a/thread/zos390/omrthreadattr.c +++ b/thread/zos390/omrthreadattr.c @@ -32,7 +32,6 @@ #include "unix/unixthreadattr.h" #define J9THREAD_ATTR_IS_VALID(attr) ((attr) && (*(attr)) && ((*(attr))->size == sizeof(unixthread_attr))) -#define J9THREAD_VALUE_OUT_OF_RANGE(val, lo, hi) (((val) < (lo)) || ((val) > (hi))) static intptr_t failedToSetAttr(intptr_t rc); @@ -229,7 +228,7 @@ omrthread_attr_set_priority(omrthread_attr_t *attr, omrthread_prio_t priority) return J9THREAD_ERR_INVALID_ATTR; } - if (J9THREAD_VALUE_OUT_OF_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { + if (!J9THREAD_VALUE_WITHIN_RANGE(priority, J9THREAD_PRIORITY_MIN, J9THREAD_PRIORITY_MAX)) { return J9THREAD_ERR_INVALID_VALUE; }