From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 16 Nov 2009 18:44:54 +0000 (+0000)
Subject: [TRUNK] Change the cl_pfn_fmap_cmp_t compare function to return an 'int' instead... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8edc07f448a22b35ff2ea66b8a9d75b4b33945cb;p=~shefty%2Frdma-win.git

[TRUNK] Change the cl_pfn_fmap_cmp_t compare function to return an 'int' instead of 'intn_t' as int is a better return value match for standard compare functions like memcmp(), cl_memcmp(), qsort() and the like.

Additionally the change removes some usage of the non-standard C type 'intn_t' in favor of the basic C data type 'int'.

Files impacted:

inc\complib\cl_fleximap.h line #185 cl_pfn_fmap_cmp_t function returns 'int' instead of 'intn_t'.
core\al\kernel\al_ioc_pnp.c
core\al\kernel\al_pnp.c
ulp\wsd\user\ibsp_ip.c
ulp\ipoib\kernel\ipoib_port.c
ulp\ipoib\kernel\ipoib_port.cpp
ulp\wsd\user\ibspproto.h

Tested by:
  building WinOF installers for wlh, win7, wnet & wxp
  installing newly built installers.
  Running DAPL tests, IPoIB tests & opensm tests.

Signed-off-by: stan smith <stan.smith@intel.com>

git-svn-id: svn://openib.tc.cornell.edu/gen1@2559 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/core/al/kernel/al_ioc_pnp.c b/trunk/core/al/kernel/al_ioc_pnp.c
index b283ea13..498a08bf 100644
--- a/trunk/core/al/kernel/al_ioc_pnp.c
+++ b/trunk/core/al/kernel/al_ioc_pnp.c
@@ -402,12 +402,12 @@ __put_ioc_map(
 	IN				ioc_pnp_mgr_t* const		p_ioc_mgr,
 	IN				cl_qmap_t* const			p_ioc_map );
 
-static intn_t
+static int
 __iou_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 );
 
-static intn_t
+static int
 __path_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 );
@@ -1121,7 +1121,7 @@ __put_ioc_map(
  * address of the ca_guid, which is adjacent to the node GUID of the IOU.
  * This allows for a single call to cl_memcmp.
  */
-static intn_t
+static int
 __iou_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
@@ -1133,7 +1133,7 @@ __iou_cmp(
 /*
  * Compares two paths for inserts/lookups in a flexi map.
  */
-static intn_t
+static int
 __path_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
diff --git a/trunk/core/al/kernel/al_pnp.c b/trunk/core/al/kernel/al_pnp.c
index ac51a37f..cca4fde6 100644
--- a/trunk/core/al/kernel/al_pnp.c
+++ b/trunk/core/al/kernel/al_pnp.c
@@ -89,7 +89,7 @@ __pnp_free(
  * address of the reg guid1, which is adjacent to the context guid2 (if exist).
  * This allows for a single call to cl_memcmp.
  */
-static intn_t
+static int
 __context_cmp128(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
@@ -102,7 +102,7 @@ __context_cmp128(
  * address of the reg guid1, which is adjacent to the context guid2 (if exist).
  * This allows for a single call to cl_memcmp.
  */
-static intn_t
+static int
 __context_cmp64(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
diff --git a/trunk/inc/complib/cl_fleximap.h b/trunk/inc/complib/cl_fleximap.h
index ffb5fcb7..30f72bf3 100644
--- a/trunk/inc/complib/cl_fleximap.h
+++ b/trunk/inc/complib/cl_fleximap.h
@@ -182,7 +182,7 @@ typedef struct _cl_fmap_item
 *
 * SYNOPSIS
 */
-typedef intn_t
+typedef int
 (CL_API *cl_pfn_fmap_cmp_t)(
 	IN	const void* const		p_key1,
 	IN	const void*	const		p_key2 );
diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.c b/trunk/ulp/ipoib/kernel/ipoib_port.c
index 4d1736f7..3773c7c7 100644
--- a/trunk/ulp/ipoib/kernel/ipoib_port.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_port.c
@@ -476,7 +476,7 @@ __leave_error_mcast_cb(
 	IN				void				*context );
 
 
-static intn_t
+static int
 __gid_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
index 273e86fa..c336a70d 100644
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
@@ -576,7 +576,7 @@ __leave_error_mcast_cb(
 	IN				void				*context );
 
 
-static intn_t
+static int
 __gid_cmp(
 	IN		const	void* const					p_key1,
 	IN		const	void* const					p_key2 )
diff --git a/trunk/ulp/wsd/user/ibsp_ip.c b/trunk/ulp/wsd/user/ibsp_ip.c
index a31fbbd9..a0afe894 100644
--- a/trunk/ulp/wsd/user/ibsp_ip.c
+++ b/trunk/ulp/wsd/user/ibsp_ip.c
@@ -58,7 +58,7 @@ struct ip_query_context
 };
 
 
-intn_t CL_API
+int CL_API
 ip_cmp(
 	IN	const void* const		p_key1,
 	IN	const void*	const		p_key2 )
diff --git a/trunk/ulp/wsd/user/ibspproto.h b/trunk/ulp/wsd/user/ibspproto.h
index 34657703..8e1c80e8 100644
--- a/trunk/ulp/wsd/user/ibspproto.h
+++ b/trunk/ulp/wsd/user/ibspproto.h
@@ -152,7 +152,7 @@ ibal_to_wsa_error(
 	IN				const ib_api_status_t		status );
 
 /* Protos from ibsp_ip.c */
-intn_t CL_API
+int CL_API
 ip_cmp(
 	IN	const void* const		p_key1,
 	IN	const void*	const		p_key2 );