opensm/complib/cl_passivelock.h: some casting issues

Sasha,

There are couple of problematic castings in complib/cl_passivelock.h:

(cl_status_t) pthread_rwlock_*()

Turns out that compiler doesn't like casting directly from int to enum, probably because int can be negative:

cl_passivelock.h:199: warning: cast from function call of type 'int' to non-matching type 'enum _cl_status' cl_passivelock.h:241: warning: cast from function call of type 'int' to non-matching type 'enum _cl_status' cl_passivelock.h:274: warning: cast from function call of type 'int' to non-matching type 'enum _cl_status' cl_passivelock.h:306: warning: cast from function call of type 'int' to non-matching type 'enum _cl_status'

Se we can cast the return value in two stages - to unsigned and then to enum, but casting it once to unsigned solves the problem - the compiler can cast unsigned to enum w/o explicit casting.

Signed-off-by Yevgeny Kliteynik<[email protected]>

---

Changes from v1: cosmetics - there was '//' at the
end of each fixed line, removed now.

  opensm/include/complib/cl_passivelock.h |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

opensm/include/complib/cl_passivelock.h +3 -3

index bafd339..aba4e64 100644
@@ -196,7 +196,7 @@ static inline cl_status_t cl_plock_init(IN cl_plock_t * const p_lock)
  	cl_status_t status;
 
  	CL_ASSERT(p_lock);
-	status = (cl_status_t) pthread_rwlock_init(&p_lock->lock, NULL);
+	status = (unsigned) pthread_rwlock_init(&p_lock->lock, NULL);
  	if (status)
  		return CL_ERROR;
  	p_lock->state = CL_INITIALIZED;

@@ -238,7 +238,7 @@ static inline void cl_plock_acquire(IN cl_plock_t * const p_lock)
  	CL_ASSERT(p_lock);
  	CL_ASSERT(p_lock->state == CL_INITIALIZED);
 
-	status = (cl_status_t) pthread_rwlock_rdlock(&p_lock->lock);
+	status = (unsigned) pthread_rwlock_rdlock(&p_lock->lock);
  	CL_ASSERT(status == 0);
  }
 

@@ -271,7 +271,7 @@ static inline void cl_plock_excl_acquire(IN cl_plock_t * const p_lock)
  	CL_ASSERT(p_lock);
  	CL_ASSERT(p_lock->state == CL_INITIALIZED);
 
-	status = (cl_status_t) pthread_rwlock_wrlock(&p_lock->lock);
+	status = (unsigned) pthread_rwlock_wrlock(&p_lock->lock);
  	CL_ASSERT(status == 0);
  }