[openib-general] [PATCH] Replace cl_memory.h by string.h [was: [PATCH] OpenSM: Use memory routines directly and eliminate cl_mem* routines]
Sasha Khapyorsky
sashak at voltaire.com
Wed May 17 15:02:49 PDT 2006
On 12:14 Wed 17 May , Hal Rosenstock wrote:
> OpenSM: Use memory routines directly and eliminate cl_mem* routines
> as these routines are part of ISO C
>
> Signed-off-by: Hal Rosenstock <halr at voltaire.com>
Following Hal's cleanup this includes string.h header file for proper
mem*() functions prototype definitions where necessary, removes/includes
cl_memory.h as needed. Also couple of unistd.h additions for close(),
sleep() and unlink() calls.
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
osm/complib/cl_event_wheel.c | 1 +
osm/complib/cl_map.c | 2 +-
osm/complib/cl_memory.c | 1 +
osm/complib/cl_perf.c | 2 ++
osm/complib/cl_pool.c | 1 +
osm/complib/cl_ptr_vector.c | 1 +
osm/complib/cl_threadpool.c | 1 +
osm/complib/cl_timer.c | 1 +
osm/complib/cl_vector.c | 1 +
osm/complib/libosmcomp.map | 3 ---
osm/include/complib/cl_byteswap.h | 3 +--
osm/include/complib/cl_memory.h | 1 -
osm/include/iba/ib_types.h | 2 +-
osm/include/opensm/osm_lin_fwd_tbl.h | 1 +
osm/include/opensm/osm_madw.h | 1 +
osm/include/opensm/osm_mcm_info.h | 1 +
osm/include/opensm/osm_mtree.h | 1 +
osm/include/opensm/osm_path.h | 1 +
osm/include/opensm/osm_port.h | 1 +
osm/include/opensm/osm_port_profile.h | 1 +
osm/include/opensm/osm_rand_fwd_tbl.h | 1 +
osm/include/vendor/osm_vendor_mlx_svc.h | 2 ++
osm/include/vendor/osm_vendor_mtl.h | 2 --
.../vendor/osm_vendor_mtl_transaction_mgr.h | 1 -
osm/include/vendor/osm_vendor_ts.h | 1 -
osm/libvendor/osm_pkt_randomizer.c | 2 ++
osm/libvendor/osm_vendor_al.c | 1 +
osm/libvendor/osm_vendor_ibumad.c | 10 ++++++----
osm/libvendor/osm_vendor_ibumad_sa.c | 3 +++
osm/libvendor/osm_vendor_mlx.c | 2 ++
osm/libvendor/osm_vendor_mlx_anafa.c | 1 +
osm/libvendor/osm_vendor_mlx_dispatcher.c | 1 +
osm/libvendor/osm_vendor_mlx_hca.c | 1 +
osm/libvendor/osm_vendor_mlx_hca_anafa.c | 1 +
osm/libvendor/osm_vendor_mlx_ibmgt.c | 2 ++
osm/libvendor/osm_vendor_mlx_rmpp_ctx.c | 1 +
osm/libvendor/osm_vendor_mlx_sa.c | 2 ++
osm/libvendor/osm_vendor_mlx_sar.c | 4 +++-
osm/libvendor/osm_vendor_mlx_sender.c | 1 +
osm/libvendor/osm_vendor_mlx_sim.c | 2 ++
osm/libvendor/osm_vendor_mlx_ts.c | 2 ++
osm/libvendor/osm_vendor_mlx_ts_anafa.c | 2 ++
osm/libvendor/osm_vendor_mtl.c | 2 ++
osm/libvendor/osm_vendor_mtl_transaction_mgr.c | 1 +
osm/libvendor/osm_vendor_test.c | 1 +
osm/libvendor/osm_vendor_ts.c | 2 ++
osm/libvendor/osm_vendor_umadt.c | 1 +
osm/opensm/osm_db_files.c | 6 ++++--
osm/opensm/osm_db_pack.c | 1 +
osm/opensm/osm_drop_mgr.c | 2 ++
osm/opensm/osm_fwd_tbl.c | 1 -
osm/opensm/osm_helper.c | 2 +-
osm/opensm/osm_inform.c | 1 +
osm/opensm/osm_lid_mgr.c | 1 +
osm/opensm/osm_lin_fwd_rcv.c | 2 +-
osm/opensm/osm_lin_fwd_rcv_ctrl.c | 2 +-
osm/opensm/osm_lin_fwd_tbl.c | 1 +
osm/opensm/osm_link_mgr.c | 2 +-
osm/opensm/osm_mad_pool.c | 1 +
osm/opensm/osm_matrix.c | 1 +
osm/opensm/osm_mcast_fwd_rcv.c | 2 +-
osm/opensm/osm_mcast_fwd_rcv_ctrl.c | 2 +-
osm/opensm/osm_mcast_mgr.c | 2 ++
osm/opensm/osm_mcast_tbl.c | 1 +
osm/opensm/osm_mcm_info.c | 1 +
osm/opensm/osm_mcm_port.c | 2 ++
osm/opensm/osm_mtree.c | 1 +
osm/opensm/osm_multicast.c | 1 +
osm/opensm/osm_node_desc_rcv.c | 2 +-
osm/opensm/osm_node_desc_rcv_ctrl.c | 2 +-
osm/opensm/osm_node_info_rcv.c | 2 +-
osm/opensm/osm_node_info_rcv_ctrl.c | 2 +-
osm/opensm/osm_opensm.c | 4 +---
osm/opensm/osm_pkey.c | 1 +
osm/opensm/osm_pkey_mgr.c | 1 +
osm/opensm/osm_pkey_rcv.c | 2 +-
osm/opensm/osm_pkey_rcv_ctrl.c | 2 +-
osm/opensm/osm_port.c | 1 +
osm/opensm/osm_port_info_rcv.c | 2 +-
osm/opensm/osm_port_info_rcv_ctrl.c | 2 +-
osm/opensm/osm_prtn.c | 1 +
osm/opensm/osm_qos.c | 1 +
osm/opensm/osm_remote_sm.c | 2 +-
osm/opensm/osm_req.c | 2 +-
osm/opensm/osm_req_ctrl.c | 2 +-
osm/opensm/osm_resp.c | 2 +-
osm/opensm/osm_sa.c | 2 +-
osm/opensm/osm_sa_class_port_info.c | 2 +-
osm/opensm/osm_sa_class_port_info_ctrl.c | 2 +-
osm/opensm/osm_sa_guidinfo_record.c | 2 +-
osm/opensm/osm_sa_guidinfo_record_ctrl.c | 2 +-
osm/opensm/osm_sa_informinfo.c | 2 +-
osm/opensm/osm_sa_informinfo_ctrl.c | 2 +-
osm/opensm/osm_sa_lft_record.c | 1 +
osm/opensm/osm_sa_lft_record_ctrl.c | 2 +-
osm/opensm/osm_sa_link_record.c | 2 +-
osm/opensm/osm_sa_link_record_ctrl.c | 2 +-
osm/opensm/osm_sa_mad_ctrl.c | 2 +-
osm/opensm/osm_sa_mcmember_record.c | 1 +
osm/opensm/osm_sa_mcmember_record_ctrl.c | 2 +-
osm/opensm/osm_sa_multipath_record.c | 2 +-
osm/opensm/osm_sa_multipath_record_ctrl.c | 2 +-
osm/opensm/osm_sa_node_record.c | 1 +
osm/opensm/osm_sa_node_record_ctrl.c | 2 +-
osm/opensm/osm_sa_path_record.c | 2 +-
osm/opensm/osm_sa_path_record_ctrl.c | 2 +-
osm/opensm/osm_sa_pkey_record.c | 2 +-
osm/opensm/osm_sa_pkey_record_ctrl.c | 2 +-
osm/opensm/osm_sa_portinfo_record.c | 2 +-
osm/opensm/osm_sa_portinfo_record_ctrl.c | 2 +-
osm/opensm/osm_sa_response.c | 2 +-
osm/opensm/osm_sa_service_record.c | 2 +-
osm/opensm/osm_sa_service_record_ctrl.c | 2 +-
osm/opensm/osm_sa_slvl_record.c | 2 +-
osm/opensm/osm_sa_slvl_record_ctrl.c | 2 +-
osm/opensm/osm_sa_sminfo_record.c | 2 +-
osm/opensm/osm_sa_sminfo_record_ctrl.c | 2 +-
osm/opensm/osm_sa_vlarb_record.c | 2 +-
osm/opensm/osm_sa_vlarb_record_ctrl.c | 2 +-
osm/opensm/osm_service.c | 1 +
osm/opensm/osm_slvl_map_rcv.c | 2 +-
osm/opensm/osm_slvl_map_rcv_ctrl.c | 2 +-
osm/opensm/osm_sm.c | 1 +
osm/opensm/osm_sm_mad_ctrl.c | 2 +-
osm/opensm/osm_sm_state_mgr.c | 2 +-
osm/opensm/osm_sminfo_rcv.c | 1 +
osm/opensm/osm_sminfo_rcv_ctrl.c | 2 +-
osm/opensm/osm_state_mgr.c | 2 ++
osm/opensm/osm_state_mgr_ctrl.c | 2 +-
osm/opensm/osm_subnet.c | 2 ++
osm/opensm/osm_sw_info_rcv.c | 2 +-
osm/opensm/osm_sw_info_rcv_ctrl.c | 2 +-
osm/opensm/osm_sweep_fail_ctrl.c | 2 +-
osm/opensm/osm_switch.c | 1 +
osm/opensm/osm_trap_rcv.c | 2 +-
osm/opensm/osm_trap_rcv_ctrl.c | 2 +-
osm/opensm/osm_ucast_mgr.c | 2 ++
osm/opensm/osm_ucast_updn.c | 1 +
osm/opensm/osm_vl15intf.c | 2 +-
osm/opensm/osm_vl_arb_rcv.c | 2 +-
osm/opensm/osm_vl_arb_rcv_ctrl.c | 2 +-
osm/osmtest/include/osmtest_subnet.h | 1 +
osm/osmtest/osmt_inform.c | 1 -
osm/osmtest/osmt_slvl_vl_arb.c | 1 -
osm/osmtest/osmtest.c | 2 +-
145 files changed, 166 insertions(+), 88 deletions(-)
e117de15a67314817a58b6300b432ec9ffa6a0a5
diff --git a/osm/complib/cl_event_wheel.c b/osm/complib/cl_event_wheel.c
index cf04df7..aaaa53d 100644
--- a/osm/complib/cl_event_wheel.c
+++ b/osm/complib/cl_event_wheel.c
@@ -40,6 +40,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <math.h>
+#include <complib/cl_memory.h>
#include <complib/cl_event_wheel.h>
#include <complib/cl_debug.h>
diff --git a/osm/complib/cl_map.c b/osm/complib/cl_map.c
index 974b0d3..8962e9a 100644
--- a/osm/complib/cl_map.c
+++ b/osm/complib/cl_map.c
@@ -70,10 +70,10 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_qmap.h>
#include <complib/cl_map.h>
#include <complib/cl_fleximap.h>
-#include <complib/cl_memory.h>
/******************************************************************************
diff --git a/osm/complib/cl_memory.c b/osm/complib/cl_memory.c
index 49ff45d..a9ae948 100644
--- a/osm/complib/cl_memory.c
+++ b/osm/complib/cl_memory.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memtrack.h>
#define _MEM_DEBUG_MODE_ 0
#ifdef _MEM_DEBUG_MODE_
diff --git a/osm/complib/cl_perf.c b/osm/complib/cl_perf.c
index 753eba3..0c8ead2 100644
--- a/osm/complib/cl_perf.c
+++ b/osm/complib/cl_perf.c
@@ -51,6 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
+
/*
* Always turn on performance tracking when building this file to allow the
* performance counter functions to be built into the component library.
diff --git a/osm/complib/cl_pool.c b/osm/complib/cl_pool.c
index cfd2774..3fe07a8 100644
--- a/osm/complib/cl_pool.c
+++ b/osm/complib/cl_pool.c
@@ -52,6 +52,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_qcomppool.h>
#include <complib/cl_comppool.h>
#include <complib/cl_qpool.h>
diff --git a/osm/complib/cl_ptr_vector.c b/osm/complib/cl_ptr_vector.c
index bddce00..5ab74c3 100644
--- a/osm/complib/cl_ptr_vector.c
+++ b/osm/complib/cl_ptr_vector.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_ptr_vector.h>
#include <complib/cl_memory.h>
diff --git a/osm/complib/cl_threadpool.c b/osm/complib/cl_threadpool.c
index a2f620d..a2a4848 100644
--- a/osm/complib/cl_threadpool.c
+++ b/osm/complib/cl_threadpool.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_threadpool.h>
#include <complib/cl_atomic.h>
#include <complib/cl_memory.h>
diff --git a/osm/complib/cl_timer.c b/osm/complib/cl_timer.c
index 847545f..b3cc3e9 100644
--- a/osm/complib/cl_timer.c
+++ b/osm/complib/cl_timer.c
@@ -48,6 +48,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_timer.h>
#include <complib/cl_memory.h>
#include <sys/time.h>
diff --git a/osm/complib/cl_vector.c b/osm/complib/cl_vector.c
index 3e1a757..bcda8e0 100644
--- a/osm/complib/cl_vector.c
+++ b/osm/complib/cl_vector.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_vector.h>
#include <complib/cl_memory.h>
diff --git a/osm/complib/libosmcomp.map b/osm/complib/libosmcomp.map
index 7a7ee1d..73fb242 100644
--- a/osm/complib/libosmcomp.map
+++ b/osm/complib/libosmcomp.map
@@ -87,9 +87,6 @@ OSMCOMP_1.0 {
__cl_find_mem;
__cl_free_trk;
__cl_free_ntrk;
- cl_memset;
- cl_memcpy;
- cl_memcmp;
__cl_perf_run_calibration;
__cl_perf_construct;
__cl_perf_init;
diff --git a/osm/include/complib/cl_byteswap.h b/osm/include/complib/cl_byteswap.h
index 932d564..d144ea3 100644
--- a/osm/include/complib/cl_byteswap.h
+++ b/osm/include/complib/cl_byteswap.h
@@ -51,8 +51,7 @@
#ifndef _CL_BYTESWAP_H_
#define _CL_BYTESWAP_H_
-
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_byteswap_osd.h>
#ifdef __cplusplus
diff --git a/osm/include/complib/cl_memory.h b/osm/include/complib/cl_memory.h
index 9f558ac..4bbf7a2 100644
--- a/osm/include/complib/cl_memory.h
+++ b/osm/include/complib/cl_memory.h
@@ -52,7 +52,6 @@ #define _CL_MEMORY_H_
#include <complib/cl_types.h>
-#include <complib/cl_memory_osd.h>
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
diff --git a/osm/include/iba/ib_types.h b/osm/include/iba/ib_types.h
index 811d836..b72e810 100644
--- a/osm/include/iba/ib_types.h
+++ b/osm/include/iba/ib_types.h
@@ -38,9 +38,9 @@
#if !defined(__IB_TYPES_H__)
#define __IB_TYPES_H__
+#include <string.h>
#include <complib/cl_types.h>
#include <complib/cl_byteswap.h>
-#include <complib/cl_memory.h>
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
diff --git a/osm/include/opensm/osm_lin_fwd_tbl.h b/osm/include/opensm/osm_lin_fwd_tbl.h
index dee01a9..ca378a8 100644
--- a/osm/include/opensm/osm_lin_fwd_tbl.h
+++ b/osm/include/opensm/osm_lin_fwd_tbl.h
@@ -50,6 +50,7 @@
#ifndef _OSM_LIN_FWD_TBL_H_
#define _OSM_LIN_FWD_TBL_H_
+#include <string.h>
#include <iba/ib_types.h>
#include <opensm/osm_base.h>
diff --git a/osm/include/opensm/osm_madw.h b/osm/include/opensm/osm_madw.h
index 2173957..4fde04c 100644
--- a/osm/include/opensm/osm_madw.h
+++ b/osm/include/opensm/osm_madw.h
@@ -51,6 +51,7 @@
#ifndef _OSM_MADW_H_
#define _OSM_MADW_H_
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qlist.h>
#include <complib/cl_dispatcher.h>
diff --git a/osm/include/opensm/osm_mcm_info.h b/osm/include/opensm/osm_mcm_info.h
index c4d5443..1f325b1 100644
--- a/osm/include/opensm/osm_mcm_info.h
+++ b/osm/include/opensm/osm_mcm_info.h
@@ -50,6 +50,7 @@
#ifndef _OSM_MCM_INFO_H_
#define _OSM_MCM_INFO_H_
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qlist.h>
#include <opensm/osm_base.h>
diff --git a/osm/include/opensm/osm_mtree.h b/osm/include/opensm/osm_mtree.h
index 57c894b..013112d 100644
--- a/osm/include/opensm/osm_mtree.h
+++ b/osm/include/opensm/osm_mtree.h
@@ -51,6 +51,7 @@
#ifndef _OSM_MTREE_H_
#define _OSM_MTREE_H_
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qmap.h>
#include <opensm/osm_base.h>
diff --git a/osm/include/opensm/osm_path.h b/osm/include/opensm/osm_path.h
index bf1cc67..cb3bb8e 100644
--- a/osm/include/opensm/osm_path.h
+++ b/osm/include/opensm/osm_path.h
@@ -38,6 +38,7 @@
#ifndef _OSM_PATH_H_
#define _OSM_PATH_H_
+#include <string.h>
#include <opensm/osm_base.h>
#include <vendor/osm_vendor.h>
diff --git a/osm/include/opensm/osm_port.h b/osm/include/opensm/osm_port.h
index 46a0064..cf3f6f2 100644
--- a/osm/include/opensm/osm_port.h
+++ b/osm/include/opensm/osm_port.h
@@ -50,6 +50,7 @@
#ifndef _OSM_PORT_H_
#define _OSM_PORT_H_
+#include <string.h>
#include <complib/cl_qmap.h>
#include <complib/cl_memory.h>
#include <iba/ib_types.h>
diff --git a/osm/include/opensm/osm_port_profile.h b/osm/include/opensm/osm_port_profile.h
index 9a58115..9c0f7f7 100644
--- a/osm/include/opensm/osm_port_profile.h
+++ b/osm/include/opensm/osm_port_profile.h
@@ -50,6 +50,7 @@
#ifndef _OSM_PORT_PROFILE_H_
#define _OSM_PORT_PROFILE_H_
+#include <string.h>
#include <iba/ib_types.h>
#include <opensm/osm_base.h>
#include <opensm/osm_madw.h>
diff --git a/osm/include/opensm/osm_rand_fwd_tbl.h b/osm/include/opensm/osm_rand_fwd_tbl.h
index 1d293e5..fac9ffd 100644
--- a/osm/include/opensm/osm_rand_fwd_tbl.h
+++ b/osm/include/opensm/osm_rand_fwd_tbl.h
@@ -51,6 +51,7 @@ #ifndef _OSM_RAND_FWD_TBL_H_
#define _OSM_RAND_FWD_TBL_H_
#include <iba/ib_types.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_base.h>
#ifdef __cplusplus
diff --git a/osm/include/vendor/osm_vendor_mlx_svc.h b/osm/include/vendor/osm_vendor_mlx_svc.h
index 69d379c..e4897d4 100644
--- a/osm/include/vendor/osm_vendor_mlx_svc.h
+++ b/osm/include/vendor/osm_vendor_mlx_svc.h
@@ -38,7 +38,9 @@ #ifndef _OSMV_SVC_H_
#define _OSMV_SVC_H_
#include <stdlib.h>
+#include <string.h>
#include <iba/ib_types.h>
+#include <complib/cl_memory.h>
#include <vendor/osm_vendor_mlx_defs.h>
#ifdef __cplusplus
diff --git a/osm/include/vendor/osm_vendor_mtl.h b/osm/include/vendor/osm_vendor_mtl.h
index 5837867..218bdf7 100644
--- a/osm/include/vendor/osm_vendor_mtl.h
+++ b/osm/include/vendor/osm_vendor_mtl.h
@@ -60,10 +60,8 @@ #define OUT
#include "iba/ib_types.h"
#include "iba/ib_al.h"
#include <iba/complib/cl_thread.h>
-#include <iba/complib/cl_memory.h>
#include <iba/complib/cl_types_osd.h>
#include <opensm/osm_base.h>
-#include <opensm/osm_log.h>
#ifdef __cplusplus
# define BEGIN_C_DECLS extern "C" {
diff --git a/osm/include/vendor/osm_vendor_mtl_transaction_mgr.h b/osm/include/vendor/osm_vendor_mtl_transaction_mgr.h
index 7bf938d..82d2cc2 100644
--- a/osm/include/vendor/osm_vendor_mtl_transaction_mgr.h
+++ b/osm/include/vendor/osm_vendor_mtl_transaction_mgr.h
@@ -61,7 +61,6 @@ #include <iba/complib/cl_qlist.h>
#include <iba/complib/cl_qmap.h>
#include <iba/complib/cl_timer.h>
#include <iba/complib/cl_thread.h>
-#include <iba/complib/cl_memory.h>
#include <iba/complib/cl_types_osd.h>
#include <iba/complib/cl_spinlock.h>
#include <opensm/osm_base.h>
diff --git a/osm/include/vendor/osm_vendor_ts.h b/osm/include/vendor/osm_vendor_ts.h
index b4c2f21..4414cba 100644
--- a/osm/include/vendor/osm_vendor_ts.h
+++ b/osm/include/vendor/osm_vendor_ts.h
@@ -59,7 +59,6 @@ #define OUT
#include "iba/ib_types.h"
#include "iba/ib_al.h"
#include <iba/complib/cl_thread.h>
-#include <iba/complib/cl_memory.h>
#include <iba/complib/cl_types_osd.h>
#include <opensm/osm_base.h>
#include <opensm/osm_log.h>
diff --git a/osm/libvendor/osm_pkt_randomizer.c b/osm/libvendor/osm_pkt_randomizer.c
index 2fa7621..29df135 100644
--- a/osm/libvendor/osm_pkt_randomizer.c
+++ b/osm/libvendor/osm_pkt_randomizer.c
@@ -51,12 +51,14 @@ #endif /* HAVE_CONFIG_H */
#include <vendor/osm_pkt_randomizer.h>
#include <stdlib.h>
+#include <string.h>
#ifndef WIN32
#include <sys/time.h>
#include <unistd.h>
#endif
+#include <complib/cl_memory.h>
/**********************************************************************
* Return TRUE if the path is in a fault path, and FALSE otherwise.
diff --git a/osm/libvendor/osm_vendor_al.c b/osm/libvendor/osm_vendor_al.c
index d26d6d8..3240625 100644
--- a/osm/libvendor/osm_vendor_al.c
+++ b/osm/libvendor/osm_vendor_al.c
@@ -59,6 +59,7 @@ #include <vendor/osm_vendor_select.h>
#ifdef OSM_VENDOR_INTF_AL
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_qlist.h>
#include <complib/cl_thread.h>
diff --git a/osm/libvendor/osm_vendor_ibumad.c b/osm/libvendor/osm_vendor_ibumad.c
index 0a7fbe3..a3041d0 100644
--- a/osm/libvendor/osm_vendor_ibumad.c
+++ b/osm/libvendor/osm_vendor_ibumad.c
@@ -57,20 +57,22 @@ #include <vendor/osm_vendor_select.h>
#ifdef OSM_VENDOR_INTF_OPENIB
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_qlist.h>
#include <complib/cl_thread.h>
#include <complib/cl_math.h>
#include <complib/cl_debug.h>
-#include <iba/ib_types.h>
#include <opensm/osm_madw.h>
#include <opensm/osm_log.h>
#include <opensm/osm_mad_pool.h>
#include <vendor/osm_vendor_api.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
/****s* OpenSM: Vendor AL/osm_umad_bind_info_t
* NAME
diff --git a/osm/libvendor/osm_vendor_ibumad_sa.c b/osm/libvendor/osm_vendor_ibumad_sa.c
index 6eae887..568d39c 100644
--- a/osm/libvendor/osm_vendor_ibumad_sa.c
+++ b/osm/libvendor/osm_vendor_ibumad_sa.c
@@ -38,10 +38,13 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <vendor/osm_vendor_api.h>
#include <vendor/osm_vendor_sa_api.h>
#include <sys/time.h>
+#include <complib/cl_memory.h>
+
#define MAX_PORTS 64
/*****************************************************************************
diff --git a/osm/libvendor/osm_vendor_mlx.c b/osm/libvendor/osm_vendor_mlx.c
index 4c75d41..4a4be06 100644
--- a/osm/libvendor/osm_vendor_mlx.c
+++ b/osm/libvendor/osm_vendor_mlx.c
@@ -38,12 +38,14 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <vendor/osm_vendor_mlx.h>
#include <vendor/osm_vendor_mlx_transport.h>
#include <vendor/osm_vendor_mlx_svc.h>
#include <vendor/osm_vendor_mlx_sender.h>
#include <vendor/osm_vendor_mlx_hca.h>
#include <vendor/osm_pkt_randomizer.h>
+#include <complib/cl_memory.h>
/**
* FORWARD REFERENCES
diff --git a/osm/libvendor/osm_vendor_mlx_anafa.c b/osm/libvendor/osm_vendor_mlx_anafa.c
index 32af9bb..3cd917f 100644
--- a/osm/libvendor/osm_vendor_mlx_anafa.c
+++ b/osm/libvendor/osm_vendor_mlx_anafa.c
@@ -55,6 +55,7 @@ #include <vendor/osm_vendor_mlx_svc.h>
#include <vendor/osm_vendor_mlx_sender.h>
#include <vendor/osm_pkt_randomizer.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_ts_useraccess.h>
/**
diff --git a/osm/libvendor/osm_vendor_mlx_dispatcher.c b/osm/libvendor/osm_vendor_mlx_dispatcher.c
index 341e784..afa1473 100644
--- a/osm/libvendor/osm_vendor_mlx_dispatcher.c
+++ b/osm/libvendor/osm_vendor_mlx_dispatcher.c
@@ -38,6 +38,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <vendor/osm_vendor_mlx.h>
#include <vendor/osm_vendor_mlx_defs.h>
#include <vendor/osm_vendor_mlx_svc.h>
diff --git a/osm/libvendor/osm_vendor_mlx_hca.c b/osm/libvendor/osm_vendor_mlx_hca.c
index bb120ac..c0dca86 100644
--- a/osm/libvendor/osm_vendor_mlx_hca.c
+++ b/osm/libvendor/osm_vendor_mlx_hca.c
@@ -39,6 +39,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#if defined(OSM_VENDOR_INTF_MTL) | defined(OSM_VENDOR_INTF_TS)
#undef IN
#undef OUT
diff --git a/osm/libvendor/osm_vendor_mlx_hca_anafa.c b/osm/libvendor/osm_vendor_mlx_hca_anafa.c
index 5045563..8f87225 100644
--- a/osm/libvendor/osm_vendor_mlx_hca_anafa.c
+++ b/osm/libvendor/osm_vendor_mlx_hca_anafa.c
@@ -44,6 +44,7 @@ #undef IN
#undef OUT
#include <stddef.h>
+#include <string.h>
#include <vendor/osm_vendor_api.h>
#include <complib/cl_memory.h>
diff --git a/osm/libvendor/osm_vendor_mlx_ibmgt.c b/osm/libvendor/osm_vendor_mlx_ibmgt.c
index 117ad12..ace790b 100644
--- a/osm/libvendor/osm_vendor_mlx_ibmgt.c
+++ b/osm/libvendor/osm_vendor_mlx_ibmgt.c
@@ -46,7 +46,9 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <ib_mgt.h>
+#include <complib/cl_memory.h>
#include <complib/cl_event.h>
#include <vendor/osm_vendor_mlx_transport.h>
#include <vendor/osm_vendor_mlx_dispatcher.h>
diff --git a/osm/libvendor/osm_vendor_mlx_rmpp_ctx.c b/osm/libvendor/osm_vendor_mlx_rmpp_ctx.c
index 69708c9..df250e2 100644
--- a/osm/libvendor/osm_vendor_mlx_rmpp_ctx.c
+++ b/osm/libvendor/osm_vendor_mlx_rmpp_ctx.c
@@ -38,6 +38,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qlist.h>
#include <complib/cl_memory.h>
diff --git a/osm/libvendor/osm_vendor_mlx_sa.c b/osm/libvendor/osm_vendor_mlx_sa.c
index 85fd810..212344a 100644
--- a/osm/libvendor/osm_vendor_mlx_sa.c
+++ b/osm/libvendor/osm_vendor_mlx_sa.c
@@ -40,6 +40,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <complib/cl_timer.h>
#include <vendor/osm_vendor_api.h>
diff --git a/osm/libvendor/osm_vendor_mlx_sar.c b/osm/libvendor/osm_vendor_mlx_sar.c
index 5b0bd70..f6b6405 100644
--- a/osm/libvendor/osm_vendor_mlx_sar.c
+++ b/osm/libvendor/osm_vendor_mlx_sar.c
@@ -38,8 +38,10 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_mlx_sar.h>
+#include <string.h>
#include <stdio.h>
+#include <vendor/osm_vendor_mlx_sar.h>
+#include <complib/cl_memory.h>
ib_api_status_t
osmv_rmpp_sar_init(osmv_rmpp_sar_t* p_sar, void* p_arbt_mad,
diff --git a/osm/libvendor/osm_vendor_mlx_sender.c b/osm/libvendor/osm_vendor_mlx_sender.c
index 3317702..e1ed0a0 100644
--- a/osm/libvendor/osm_vendor_mlx_sender.c
+++ b/osm/libvendor/osm_vendor_mlx_sender.c
@@ -38,6 +38,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <vendor/osm_vendor_mlx_sender.h>
#include <vendor/osm_vendor_mlx_transport.h>
#include <vendor/osm_vendor_mlx_svc.h>
diff --git a/osm/libvendor/osm_vendor_mlx_sim.c b/osm/libvendor/osm_vendor_mlx_sim.c
index b927f2f..ba81e03 100644
--- a/osm/libvendor/osm_vendor_mlx_sim.c
+++ b/osm/libvendor/osm_vendor_mlx_sim.c
@@ -51,12 +51,14 @@ #include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
+#include <string.h>
#include <vendor/osm_vendor_api.h>
#include <vendor/osm_vendor_mlx_transport.h>
#include <vendor/osm_vendor_mlx_dispatcher.h>
#include <vendor/osm_vendor_mlx_svc.h>
+#include <complib/cl_memory.h>
/* the simulator messages definition */
#include <ibmgtsim/ibms_client_api.h>
diff --git a/osm/libvendor/osm_vendor_mlx_ts.c b/osm/libvendor/osm_vendor_mlx_ts.c
index 483b69b..a32173e 100644
--- a/osm/libvendor/osm_vendor_mlx_ts.c
+++ b/osm/libvendor/osm_vendor_mlx_ts.c
@@ -51,12 +51,14 @@ #include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
+#include <string.h>
#include <vendor/osm_vendor_api.h>
#include <vendor/osm_vendor_mlx_transport.h>
#include <vendor/osm_vendor_mlx_dispatcher.h>
#include <vendor/osm_vendor_mlx_svc.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_ts_useraccess.h>
typedef struct _osmv_TOPSPIN_transport_mgr_ {
diff --git a/osm/libvendor/osm_vendor_mlx_ts_anafa.c b/osm/libvendor/osm_vendor_mlx_ts_anafa.c
index dd3c462..a9395df 100644
--- a/osm/libvendor/osm_vendor_mlx_ts_anafa.c
+++ b/osm/libvendor/osm_vendor_mlx_ts_anafa.c
@@ -52,6 +52,7 @@ #include <sys/ioctl.h>
#include <fcntl.h>
#include <stddef.h>
#include <errno.h>
+#include <string.h>
#include <vendor/osm_vendor_api.h>
#include <vendor/osm_vendor_mlx_transport.h>
@@ -59,6 +60,7 @@ #include <vendor/osm_vendor_mlx_transpor
#include <vendor/osm_vendor_mlx_dispatcher.h>
#include <vendor/osm_vendor_mlx_svc.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_ts_useraccess.h>
static void
diff --git a/osm/libvendor/osm_vendor_mtl.c b/osm/libvendor/osm_vendor_mtl.c
index f9b2284..82a68de 100644
--- a/osm/libvendor/osm_vendor_mtl.c
+++ b/osm/libvendor/osm_vendor_mtl.c
@@ -43,6 +43,8 @@ #include <vendor/osm_vendor_select.h>
#ifdef OSM_VENDOR_INTF_MTL
+#include <string.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_helper.h>
#include <opensm/osm_log.h>
/* HACK - I do not know how to prevent complib from loading kernel H files */
diff --git a/osm/libvendor/osm_vendor_mtl_transaction_mgr.c b/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
index 997eb37..2b1c960 100644
--- a/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
+++ b/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
@@ -40,6 +40,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <math.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_helper.h>
#include <opensm/osm_log.h>
#include <vendor/osm_vendor.h>
diff --git a/osm/libvendor/osm_vendor_test.c b/osm/libvendor/osm_vendor_test.c
index ecacc67..013262e 100644
--- a/osm/libvendor/osm_vendor_test.c
+++ b/osm/libvendor/osm_vendor_test.c
@@ -56,6 +56,7 @@ #include <vendor/osm_vendor_select.h>
#ifdef OSM_VENDOR_INTF_TEST
+#include <string.h>
#include <complib/cl_memory.h>
#include <opensm/osm_log.h>
#include <vendor/osm_vendor_test.h>
diff --git a/osm/libvendor/osm_vendor_ts.c b/osm/libvendor/osm_vendor_ts.c
index 16d52e2..fa51382 100644
--- a/osm/libvendor/osm_vendor_ts.c
+++ b/osm/libvendor/osm_vendor_ts.c
@@ -40,8 +40,10 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <vendor/osm_vendor_ts.h>
#include <vendor/osm_vendor_api.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_subnet.h>
#include <opensm/osm_opensm.h>
diff --git a/osm/libvendor/osm_vendor_umadt.c b/osm/libvendor/osm_vendor_umadt.c
index 01d9b10..e27801a 100644
--- a/osm/libvendor/osm_vendor_umadt.c
+++ b/osm/libvendor/osm_vendor_umadt.c
@@ -61,6 +61,7 @@ #ifdef OSM_VENDOR_INTF_UMADT
#include <stdio.h>
#include <dlfcn.h>
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_qlist.h>
diff --git a/osm/opensm/osm_db_files.c b/osm/opensm/osm_db_files.c
index a8e82a7..930aaef 100644
--- a/osm/opensm/osm_db_files.c
+++ b/osm/opensm/osm_db_files.c
@@ -46,11 +46,13 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <opensm/st.h>
-#include <opensm/osm_db.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <stdlib.h>
+#include <string.h>
+#include <complib/cl_memory.h>
+#include <opensm/st.h>
+#include <opensm/osm_db.h>
/****d* Database/OSM_DB_MAX_LINE_LEN
* NAME
diff --git a/osm/opensm/osm_db_pack.c b/osm/opensm/osm_db_pack.c
index 3f90397..b93ac84 100644
--- a/osm/opensm/osm_db_pack.c
+++ b/osm/opensm/osm_db_pack.c
@@ -40,6 +40,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_db_pack.h>
static inline void
diff --git a/osm/opensm/osm_drop_mgr.c b/osm/opensm/osm_drop_mgr.c
index 470e5df..929088a 100644
--- a/osm/opensm/osm_drop_mgr.c
+++ b/osm/opensm/osm_drop_mgr.c
@@ -51,7 +51,9 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
+#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_fwd_tbl.c b/osm/opensm/osm_fwd_tbl.c
index 852e048..ee32194 100644
--- a/osm/opensm/osm_fwd_tbl.c
+++ b/osm/opensm/osm_fwd_tbl.c
@@ -51,7 +51,6 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
#include <complib/cl_math.h>
#include <iba/ib_types.h>
#include <opensm/osm_fwd_tbl.h>
diff --git a/osm/opensm/osm_helper.c b/osm/opensm/osm_helper.c
index e54644b..3886609 100644
--- a/osm/opensm/osm_helper.c
+++ b/osm/opensm/osm_helper.c
@@ -51,7 +51,7 @@ #endif /* HAVE_CONFIG_H */
#include <stdlib.h>
#include <stdio.h>
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_debug.h>
#include <iba/ib_types.h>
#include <opensm/osm_helper.h>
diff --git a/osm/opensm/osm_inform.c b/osm/opensm/osm_inform.c
index f20b068..172190c 100644
--- a/osm/opensm/osm_inform.c
+++ b/osm/opensm/osm_inform.c
@@ -49,6 +49,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_debug.h>
#include <complib/cl_memory.h>
#include <complib/cl_timer.h>
diff --git a/osm/opensm/osm_lid_mgr.c b/osm/opensm/osm_lid_mgr.c
index 31d0be4..a33a420 100644
--- a/osm/opensm/osm_lid_mgr.c
+++ b/osm/opensm/osm_lid_mgr.c
@@ -90,6 +90,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
diff --git a/osm/opensm/osm_lin_fwd_rcv.c b/osm/opensm/osm_lin_fwd_rcv.c
index 8ae7da8..339fe11 100644
--- a/osm/opensm/osm_lin_fwd_rcv.c
+++ b/osm/opensm/osm_lin_fwd_rcv.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_debug.h>
#include <opensm/osm_lin_fwd_rcv.h>
#include <opensm/osm_switch.h>
diff --git a/osm/opensm/osm_lin_fwd_rcv_ctrl.c b/osm/opensm/osm_lin_fwd_rcv_ctrl.c
index 4e915e7..987440d 100644
--- a/osm/opensm/osm_lin_fwd_rcv_ctrl.c
+++ b/osm/opensm/osm_lin_fwd_rcv_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_lin_fwd_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_lin_fwd_tbl.c b/osm/opensm/osm_lin_fwd_tbl.c
index f8a6b87..3b4895f 100644
--- a/osm/opensm/osm_lin_fwd_tbl.c
+++ b/osm/opensm/osm_lin_fwd_tbl.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_math.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_link_mgr.c b/osm/opensm/osm_link_mgr.c
index c8307d3..87e9e46 100644
--- a/osm/opensm/osm_link_mgr.c
+++ b/osm/opensm/osm_link_mgr.c
@@ -50,8 +50,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_link_mgr.h>
#include <opensm/osm_node.h>
diff --git a/osm/opensm/osm_mad_pool.c b/osm/opensm/osm_mad_pool.c
index 72f9db8..12ecabf 100644
--- a/osm/opensm/osm_mad_pool.c
+++ b/osm/opensm/osm_mad_pool.c
@@ -52,6 +52,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
+#include <string.h>
#include <opensm/osm_mad_pool.h>
#include <opensm/osm_madw.h>
#include <opensm/osm_log.h>
diff --git a/osm/opensm/osm_matrix.c b/osm/opensm/osm_matrix.c
index 3efb0bd..073d9b8 100644
--- a/osm/opensm/osm_matrix.c
+++ b/osm/opensm/osm_matrix.c
@@ -50,6 +50,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <opensm/osm_matrix.h>
diff --git a/osm/opensm/osm_mcast_fwd_rcv.c b/osm/opensm/osm_mcast_fwd_rcv.c
index 73763f5..d0ffa59 100644
--- a/osm/opensm/osm_mcast_fwd_rcv.c
+++ b/osm/opensm/osm_mcast_fwd_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_mcast_fwd_rcv_ctrl.c b/osm/opensm/osm_mcast_fwd_rcv_ctrl.c
index a6f46fd..9201ecf 100644
--- a/osm/opensm/osm_mcast_fwd_rcv_ctrl.c
+++ b/osm/opensm/osm_mcast_fwd_rcv_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_mcast_fwd_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_mcast_mgr.c b/osm/opensm/osm_mcast_mgr.c
index f729c61..96d3b0f 100644
--- a/osm/opensm/osm_mcast_mgr.c
+++ b/osm/opensm/osm_mcast_mgr.c
@@ -50,6 +50,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <unistd.h>
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_mcast_tbl.c b/osm/opensm/osm_mcast_tbl.c
index 401d97c..b8fa325 100644
--- a/osm/opensm/osm_mcast_tbl.c
+++ b/osm/opensm/osm_mcast_tbl.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_math.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_mcm_info.c b/osm/opensm/osm_mcm_info.c
index 08c0d12..a5ac7f3 100644
--- a/osm/opensm/osm_mcm_info.c
+++ b/osm/opensm/osm_mcm_info.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <complib/cl_memory.h>
#include <opensm/osm_mcm_info.h>
/**********************************************************************
diff --git a/osm/opensm/osm_mcm_port.c b/osm/opensm/osm_mcm_port.c
index e92ad76..16ed84e 100644
--- a/osm/opensm/osm_mcm_port.c
+++ b/osm/opensm/osm_mcm_port.c
@@ -51,6 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_mcm_port.h>
/**********************************************************************
diff --git a/osm/opensm/osm_mtree.c b/osm/opensm/osm_mtree.c
index f9d82d6..421e39e 100644
--- a/osm/opensm/osm_mtree.c
+++ b/osm/opensm/osm_mtree.c
@@ -50,6 +50,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_mtree.h>
diff --git a/osm/opensm/osm_multicast.c b/osm/opensm/osm_multicast.c
index 2256741..690f7df 100644
--- a/osm/opensm/osm_multicast.c
+++ b/osm/opensm/osm_multicast.c
@@ -49,6 +49,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memory.h>
#include <opensm/osm_multicast.h>
#include <opensm/osm_mcm_port.h>
diff --git a/osm/opensm/osm_node_desc_rcv.c b/osm/opensm/osm_node_desc_rcv.c
index 62fe034..f9fa22d 100644
--- a/osm/opensm/osm_node_desc_rcv.c
+++ b/osm/opensm/osm_node_desc_rcv.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_node_desc_rcv_ctrl.c b/osm/opensm/osm_node_desc_rcv_ctrl.c
index 9f689e2..3f26b83 100644
--- a/osm/opensm/osm_node_desc_rcv_ctrl.c
+++ b/osm/opensm/osm_node_desc_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_node_desc_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_node_info_rcv.c b/osm/opensm/osm_node_info_rcv.c
index c35e2b7..59257a0 100644
--- a/osm/opensm/osm_node_info_rcv.c
+++ b/osm/opensm/osm_node_info_rcv.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_node_info_rcv_ctrl.c b/osm/opensm/osm_node_info_rcv_ctrl.c
index 478f9c4..cbff6ce 100644
--- a/osm/opensm/osm_node_info_rcv_ctrl.c
+++ b/osm/opensm/osm_node_info_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_node_info_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_opensm.c b/osm/opensm/osm_opensm.c
index 2a8e0f8..8c422b5 100644
--- a/osm/opensm/osm_opensm.c
+++ b/osm/opensm/osm_opensm.c
@@ -53,7 +53,7 @@ #endif /* HAVE_CONFIG_H */
#include <stdio.h>
#include <stdlib.h>
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_dispatcher.h>
#include <complib/cl_passivelock.h>
#include <vendor/osm_vendor_api.h>
@@ -130,8 +130,6 @@ osm_opensm_destroy(
cl_plock_destroy( &p_osm->lock );
- cl_mem_display( );
-
osm_log_destroy( &p_osm->log );
}
diff --git a/osm/opensm/osm_pkey.c b/osm/opensm/osm_pkey.c
index b0cb869..5ecfdd9 100644
--- a/osm/opensm/osm_pkey.c
+++ b/osm/opensm/osm_pkey.c
@@ -51,6 +51,7 @@ #endif /* HAVE_CONFIG_H */
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_pkey_mgr.c b/osm/opensm/osm_pkey_mgr.c
index f98d13b..e08b7cc 100644
--- a/osm/opensm/osm_pkey_mgr.c
+++ b/osm/opensm/osm_pkey_mgr.c
@@ -50,6 +50,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qmap.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_pkey_rcv.c b/osm/opensm/osm_pkey_rcv.c
index 8696dc4..5262a6b 100644
--- a/osm/opensm/osm_pkey_rcv.c
+++ b/osm/opensm/osm_pkey_rcv.c
@@ -39,8 +39,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_pkey_rcv_ctrl.c b/osm/opensm/osm_pkey_rcv_ctrl.c
index 77ebab2..cd4367a 100644
--- a/osm/opensm/osm_pkey_rcv_ctrl.c
+++ b/osm/opensm/osm_pkey_rcv_ctrl.c
@@ -43,7 +43,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_pkey_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_port.c b/osm/opensm/osm_port.c
index f8c51e8..53ab006 100644
--- a/osm/opensm/osm_port.c
+++ b/osm/opensm/osm_port.c
@@ -52,6 +52,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_port_info_rcv.c b/osm/opensm/osm_port_info_rcv.c
index 119bcbd..a08c57c 100644
--- a/osm/opensm/osm_port_info_rcv.c
+++ b/osm/opensm/osm_port_info_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_port_info_rcv_ctrl.c b/osm/opensm/osm_port_info_rcv_ctrl.c
index 9f6001f..303bedb 100644
--- a/osm/opensm/osm_port_info_rcv_ctrl.c
+++ b/osm/opensm/osm_port_info_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_port_info_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_prtn.c b/osm/opensm/osm_prtn.c
index 26790b4..8b748c4 100644
--- a/osm/opensm/osm_prtn.c
+++ b/osm/opensm/osm_prtn.c
@@ -54,6 +54,7 @@ #include <stdio.h>
#include <sys/stat.h>
#include <iba/ib_types.h>
+#include <complib/cl_memory.h>
#include <opensm/osm_opensm.h>
#include <opensm/osm_partition.h>
#include <opensm/osm_node.h>
diff --git a/osm/opensm/osm_qos.c b/osm/opensm/osm_qos.c
index cd5c26a..c23ef87 100644
--- a/osm/opensm/osm_qos.c
+++ b/osm/opensm/osm_qos.c
@@ -46,6 +46,7 @@ # include <config.h>
#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_qmap.h>
diff --git a/osm/opensm/osm_remote_sm.c b/osm/opensm/osm_remote_sm.c
index eb65d22..b91264e 100644
--- a/osm/opensm/osm_remote_sm.c
+++ b/osm/opensm/osm_remote_sm.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <opensm/osm_remote_sm.h>
-#include <complib/cl_memory.h>
/**********************************************************************
**********************************************************************/
diff --git a/osm/opensm/osm_req.c b/osm/opensm/osm_req.c
index 9ddc9e9..534694b 100644
--- a/osm/opensm/osm_req.c
+++ b/osm/opensm/osm_req.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_req.h>
#include <opensm/osm_madw.h>
diff --git a/osm/opensm/osm_req_ctrl.c b/osm/opensm/osm_req_ctrl.c
index 708e7c9..2d0e7e0 100644
--- a/osm/opensm/osm_req_ctrl.c
+++ b/osm/opensm/osm_req_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <iba/ib_types.h>
#include <opensm/osm_req_ctrl.h>
#include <opensm/osm_req.h>
diff --git a/osm/opensm/osm_resp.c b/osm/opensm/osm_resp.c
index 9b5079a..aa60bf2 100644
--- a/osm/opensm/osm_resp.c
+++ b/osm/opensm/osm_resp.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_resp.h>
#include <opensm/osm_madw.h>
diff --git a/osm/opensm/osm_sa.c b/osm/opensm/osm_sa.c
index b33431c..fa7dad8 100644
--- a/osm/opensm/osm_sa.c
+++ b/osm/opensm/osm_sa.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_class_port_info.c b/osm/opensm/osm_sa_class_port_info.c
index 389bc9c..cfad739 100644
--- a/osm/opensm/osm_sa_class_port_info.c
+++ b/osm/opensm/osm_sa_class_port_info.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_class_port_info_ctrl.c b/osm/opensm/osm_sa_class_port_info_ctrl.c
index 219a837..c71af4c 100644
--- a/osm/opensm/osm_sa_class_port_info_ctrl.c
+++ b/osm/opensm/osm_sa_class_port_info_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_class_port_info_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_guidinfo_record.c b/osm/opensm/osm_sa_guidinfo_record.c
index 7d1eebf..601c809 100644
--- a/osm/opensm/osm_sa_guidinfo_record.c
+++ b/osm/opensm/osm_sa_guidinfo_record.c
@@ -54,8 +54,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_guidinfo_record_ctrl.c b/osm/opensm/osm_sa_guidinfo_record_ctrl.c
index b252b20..f2211b1 100644
--- a/osm/opensm/osm_sa_guidinfo_record_ctrl.c
+++ b/osm/opensm/osm_sa_guidinfo_record_ctrl.c
@@ -54,7 +54,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_guidinfo_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_informinfo.c b/osm/opensm/osm_sa_informinfo.c
index 149e609..a820dea 100644
--- a/osm/opensm/osm_sa_informinfo.c
+++ b/osm/opensm/osm_sa_informinfo.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_informinfo_ctrl.c b/osm/opensm/osm_sa_informinfo_ctrl.c
index 75edabc..31644af 100644
--- a/osm/opensm/osm_sa_informinfo_ctrl.c
+++ b/osm/opensm/osm_sa_informinfo_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_informinfo_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_lft_record.c b/osm/opensm/osm_sa_lft_record.c
index b9b903e..2d17dbe 100644
--- a/osm/opensm/osm_sa_lft_record.c
+++ b/osm/opensm/osm_sa_lft_record.c
@@ -55,6 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_debug.h>
#include <complib/cl_qlist.h>
diff --git a/osm/opensm/osm_sa_lft_record_ctrl.c b/osm/opensm/osm_sa_lft_record_ctrl.c
index 0682438..1cc2544 100644
--- a/osm/opensm/osm_sa_lft_record_ctrl.c
+++ b/osm/opensm/osm_sa_lft_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_lft_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_link_record.c b/osm/opensm/osm_sa_link_record.c
index 1a407e1..a525002 100644
--- a/osm/opensm/osm_sa_link_record.c
+++ b/osm/opensm/osm_sa_link_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_debug.h>
#include <opensm/osm_sa_link_record.h>
diff --git a/osm/opensm/osm_sa_link_record_ctrl.c b/osm/opensm/osm_sa_link_record_ctrl.c
index 707c184..01db21d 100644
--- a/osm/opensm/osm_sa_link_record_ctrl.c
+++ b/osm/opensm/osm_sa_link_record_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_link_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_mad_ctrl.c b/osm/opensm/osm_sa_mad_ctrl.c
index 1f87ea2..81584ce 100644
--- a/osm/opensm/osm_sa_mad_ctrl.c
+++ b/osm/opensm/osm_sa_mad_ctrl.c
@@ -50,7 +50,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_debug.h>
#include <iba/ib_types.h>
#include <opensm/osm_sa_mad_ctrl.h>
diff --git a/osm/opensm/osm_sa_mcmember_record.c b/osm/opensm/osm_sa_mcmember_record.c
index 291fbf5..5129231 100644
--- a/osm/opensm/osm_sa_mcmember_record.c
+++ b/osm/opensm/osm_sa_mcmember_record.c
@@ -55,6 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
diff --git a/osm/opensm/osm_sa_mcmember_record_ctrl.c b/osm/opensm/osm_sa_mcmember_record_ctrl.c
index 99a779a..a583979 100644
--- a/osm/opensm/osm_sa_mcmember_record_ctrl.c
+++ b/osm/opensm/osm_sa_mcmember_record_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_sa_multipath_record.c b/osm/opensm/osm_sa_multipath_record.c
index bdf53a3..c8efdb4 100644
--- a/osm/opensm/osm_sa_multipath_record.c
+++ b/osm/opensm/osm_sa_multipath_record.c
@@ -52,8 +52,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_multipath_record_ctrl.c b/osm/opensm/osm_sa_multipath_record_ctrl.c
index 7c0337c..e330bb8 100644
--- a/osm/opensm/osm_sa_multipath_record_ctrl.c
+++ b/osm/opensm/osm_sa_multipath_record_ctrl.c
@@ -56,7 +56,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_multipath_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_node_record.c b/osm/opensm/osm_sa_node_record.c
index ecaa048..ac9be22 100644
--- a/osm/opensm/osm_sa_node_record.c
+++ b/osm/opensm/osm_sa_node_record.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_debug.h>
#include <complib/cl_qlist.h>
diff --git a/osm/opensm/osm_sa_node_record_ctrl.c b/osm/opensm/osm_sa_node_record_ctrl.c
index dcf5944..61b363a 100644
--- a/osm/opensm/osm_sa_node_record_ctrl.c
+++ b/osm/opensm/osm_sa_node_record_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_node_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_path_record.c b/osm/opensm/osm_sa_path_record.c
index 1e4a137..7da6d70 100644
--- a/osm/opensm/osm_sa_path_record.c
+++ b/osm/opensm/osm_sa_path_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_path_record_ctrl.c b/osm/opensm/osm_sa_path_record_ctrl.c
index eab7171..9495785 100644
--- a/osm/opensm/osm_sa_path_record_ctrl.c
+++ b/osm/opensm/osm_sa_path_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_path_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_pkey_record.c b/osm/opensm/osm_sa_pkey_record.c
index e60466b..0eeb0c0 100644
--- a/osm/opensm/osm_sa_pkey_record.c
+++ b/osm/opensm/osm_sa_pkey_record.c
@@ -43,8 +43,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_pkey_record_ctrl.c b/osm/opensm/osm_sa_pkey_record_ctrl.c
index 01cdc0f..a9d8a8d 100644
--- a/osm/opensm/osm_sa_pkey_record_ctrl.c
+++ b/osm/opensm/osm_sa_pkey_record_ctrl.c
@@ -43,7 +43,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_pkey_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_portinfo_record.c b/osm/opensm/osm_sa_portinfo_record.c
index 3acb8c9..e1ca873 100644
--- a/osm/opensm/osm_sa_portinfo_record.c
+++ b/osm/opensm/osm_sa_portinfo_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_portinfo_record_ctrl.c b/osm/opensm/osm_sa_portinfo_record_ctrl.c
index 831843b..4f53f04 100644
--- a/osm/opensm/osm_sa_portinfo_record_ctrl.c
+++ b/osm/opensm/osm_sa_portinfo_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_portinfo_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_response.c b/osm/opensm/osm_sa_response.c
index 30f561f..03c94f7 100644
--- a/osm/opensm/osm_sa_response.c
+++ b/osm/opensm/osm_sa_response.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_sa_response.h>
#include <opensm/osm_helper.h>
diff --git a/osm/opensm/osm_sa_service_record.c b/osm/opensm/osm_sa_service_record.c
index 38ee80b..a65e41d 100644
--- a/osm/opensm/osm_sa_service_record.c
+++ b/osm/opensm/osm_sa_service_record.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_service_record_ctrl.c b/osm/opensm/osm_sa_service_record_ctrl.c
index 5f8c936..8af9cd7 100644
--- a/osm/opensm/osm_sa_service_record_ctrl.c
+++ b/osm/opensm/osm_sa_service_record_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_service_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_slvl_record.c b/osm/opensm/osm_sa_slvl_record.c
index 237b99c..5d1928e 100644
--- a/osm/opensm/osm_sa_slvl_record.c
+++ b/osm/opensm/osm_sa_slvl_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_slvl_record_ctrl.c b/osm/opensm/osm_sa_slvl_record_ctrl.c
index d156bf1..7801508 100644
--- a/osm/opensm/osm_sa_slvl_record_ctrl.c
+++ b/osm/opensm/osm_sa_slvl_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_slvl_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_sminfo_record.c b/osm/opensm/osm_sa_sminfo_record.c
index 9c3f436..b9dee38 100644
--- a/osm/opensm/osm_sa_sminfo_record.c
+++ b/osm/opensm/osm_sa_sminfo_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_sminfo_record_ctrl.c b/osm/opensm/osm_sa_sminfo_record_ctrl.c
index 72c2fad..3b07920 100644
--- a/osm/opensm/osm_sa_sminfo_record_ctrl.c
+++ b/osm/opensm/osm_sa_sminfo_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_sminfo_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sa_vlarb_record.c b/osm/opensm/osm_sa_vlarb_record.c
index ddbef9c..059e5a9 100644
--- a/osm/opensm/osm_sa_vlarb_record.c
+++ b/osm/opensm/osm_sa_vlarb_record.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sa_vlarb_record_ctrl.c b/osm/opensm/osm_sa_vlarb_record_ctrl.c
index f7ad3ed..a243e08 100644
--- a/osm/opensm/osm_sa_vlarb_record_ctrl.c
+++ b/osm/opensm/osm_sa_vlarb_record_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sa_vlarb_record_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_service.c b/osm/opensm/osm_service.c
index 723e117..a1309d3 100644
--- a/osm/opensm/osm_service.c
+++ b/osm/opensm/osm_service.c
@@ -49,6 +49,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <complib/cl_memory.h>
#include <complib/cl_timer.h>
diff --git a/osm/opensm/osm_slvl_map_rcv.c b/osm/opensm/osm_slvl_map_rcv.c
index 9a6acf5..33c3d45 100644
--- a/osm/opensm/osm_slvl_map_rcv.c
+++ b/osm/opensm/osm_slvl_map_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_slvl_map_rcv_ctrl.c b/osm/opensm/osm_slvl_map_rcv_ctrl.c
index ee357da..4da0eff 100644
--- a/osm/opensm/osm_slvl_map_rcv_ctrl.c
+++ b/osm/opensm/osm_slvl_map_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_slvl_map_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sm.c b/osm/opensm/osm_sm.c
index f6e33c5..0e09f26 100644
--- a/osm/opensm/osm_sm.c
+++ b/osm/opensm/osm_sm.c
@@ -55,6 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
diff --git a/osm/opensm/osm_sm_mad_ctrl.c b/osm/opensm/osm_sm_mad_ctrl.c
index 1b90335..9dceef2 100644
--- a/osm/opensm/osm_sm_mad_ctrl.c
+++ b/osm/opensm/osm_sm_mad_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <complib/cl_debug.h>
#include <iba/ib_types.h>
#include <opensm/osm_sm_mad_ctrl.h>
diff --git a/osm/opensm/osm_sm_state_mgr.c b/osm/opensm/osm_sm_state_mgr.c
index a881f7f..8ae9889 100644
--- a/osm/opensm/osm_sm_state_mgr.c
+++ b/osm/opensm/osm_sm_state_mgr.c
@@ -50,8 +50,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
#include <time.h>
diff --git a/osm/opensm/osm_sminfo_rcv.c b/osm/opensm/osm_sminfo_rcv.c
index e5c4bbb..5914984 100644
--- a/osm/opensm/osm_sminfo_rcv.c
+++ b/osm/opensm/osm_sminfo_rcv.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
diff --git a/osm/opensm/osm_sminfo_rcv_ctrl.c b/osm/opensm/osm_sminfo_rcv_ctrl.c
index 76ae65c..327d7eb 100644
--- a/osm/opensm/osm_sminfo_rcv_ctrl.c
+++ b/osm/opensm/osm_sminfo_rcv_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sminfo_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_state_mgr.c b/osm/opensm/osm_state_mgr.c
index c97875c..97b017d 100644
--- a/osm/opensm/osm_state_mgr.c
+++ b/osm/opensm/osm_state_mgr.c
@@ -50,7 +50,9 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_passivelock.h>
diff --git a/osm/opensm/osm_state_mgr_ctrl.c b/osm/opensm/osm_state_mgr_ctrl.c
index a7afc46..0bde333 100644
--- a/osm/opensm/osm_state_mgr_ctrl.c
+++ b/osm/opensm/osm_state_mgr_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_state_mgr_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_subnet.c b/osm/opensm/osm_subnet.c
index 9b4bcfe..c251411 100644
--- a/osm/opensm/osm_subnet.c
+++ b/osm/opensm/osm_subnet.c
@@ -51,6 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <opensm/osm_subnet.h>
#include <opensm/osm_opensm.h>
diff --git a/osm/opensm/osm_sw_info_rcv.c b/osm/opensm/osm_sw_info_rcv.c
index 7a1f72f..6bbd73a 100644
--- a/osm/opensm/osm_sw_info_rcv.c
+++ b/osm/opensm/osm_sw_info_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_sw_info_rcv_ctrl.c b/osm/opensm/osm_sw_info_rcv_ctrl.c
index a97a7dc..fb8fe50 100644
--- a/osm/opensm/osm_sw_info_rcv_ctrl.c
+++ b/osm/opensm/osm_sw_info_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sw_info_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_sweep_fail_ctrl.c b/osm/opensm/osm_sweep_fail_ctrl.c
index 022988a..e27a540 100644
--- a/osm/opensm/osm_sweep_fail_ctrl.c
+++ b/osm/opensm/osm_sweep_fail_ctrl.c
@@ -49,7 +49,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_sweep_fail_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_switch.c b/osm/opensm/osm_switch.c
index fa726c6..7e89475 100644
--- a/osm/opensm/osm_switch.c
+++ b/osm/opensm/osm_switch.c
@@ -51,6 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <complib/cl_memory.h>
#include <complib/cl_math.h>
#include <iba/ib_types.h>
diff --git a/osm/opensm/osm_trap_rcv.c b/osm/opensm/osm_trap_rcv.c
index 7e39832..9865f53 100644
--- a/osm/opensm/osm_trap_rcv.c
+++ b/osm/opensm/osm_trap_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_debug.h>
#include <opensm/osm_trap_rcv.h>
diff --git a/osm/opensm/osm_trap_rcv_ctrl.c b/osm/opensm/osm_trap_rcv_ctrl.c
index 1e6bf45..ee5a1a4 100644
--- a/osm/opensm/osm_trap_rcv_ctrl.c
+++ b/osm/opensm/osm_trap_rcv_ctrl.c
@@ -51,7 +51,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_trap_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/opensm/osm_ucast_mgr.c b/osm/opensm/osm_ucast_mgr.c
index 4492c1a..95f4d04 100644
--- a/osm/opensm/osm_ucast_mgr.c
+++ b/osm/opensm/osm_ucast_mgr.c
@@ -54,6 +54,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <unistd.h>
+#include <string.h>
#include <iba/ib_types.h>
#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
diff --git a/osm/opensm/osm_ucast_updn.c b/osm/opensm/osm_ucast_updn.c
index b70cf21..44e1993 100644
--- a/osm/opensm/osm_ucast_updn.c
+++ b/osm/opensm/osm_ucast_updn.c
@@ -50,6 +50,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <complib/cl_memory.h>
#include <complib/cl_debug.h>
#include <complib/cl_qmap.h>
#include <opensm/osm_switch.h>
diff --git a/osm/opensm/osm_vl15intf.c b/osm/opensm/osm_vl15intf.c
index f72620b..68f17c5 100644
--- a/osm/opensm/osm_vl15intf.c
+++ b/osm/opensm/osm_vl15intf.c
@@ -55,8 +55,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <opensm/osm_vl15intf.h>
#include <opensm/osm_madw.h>
#include <vendor/osm_vendor_api.h>
diff --git a/osm/opensm/osm_vl_arb_rcv.c b/osm/opensm/osm_vl_arb_rcv.c
index 70fd5ed..e33a2f9 100644
--- a/osm/opensm/osm_vl_arb_rcv.c
+++ b/osm/opensm/osm_vl_arb_rcv.c
@@ -51,8 +51,8 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <string.h>
#include <iba/ib_types.h>
-#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <complib/cl_passivelock.h>
#include <complib/cl_debug.h>
diff --git a/osm/opensm/osm_vl_arb_rcv_ctrl.c b/osm/opensm/osm_vl_arb_rcv_ctrl.c
index 9113985..f1f22c7 100644
--- a/osm/opensm/osm_vl_arb_rcv_ctrl.c
+++ b/osm/opensm/osm_vl_arb_rcv_ctrl.c
@@ -55,7 +55,7 @@ #if HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <complib/cl_memory.h>
+#include <string.h>
#include <opensm/osm_vl_arb_rcv_ctrl.h>
#include <opensm/osm_msgdef.h>
diff --git a/osm/osmtest/include/osmtest_subnet.h b/osm/osmtest/include/osmtest_subnet.h
index 0e7cf3e..277a2aa 100644
--- a/osm/osmtest/include/osmtest_subnet.h
+++ b/osm/osmtest/include/osmtest_subnet.h
@@ -47,6 +47,7 @@
#ifndef _OSMTEST_SUBNET_H_
#define _OSMTEST_SUBNET_H_
+#include <complib/cl_memory.h>
#include <complib/cl_qmap.h>
#include <opensm/osm_log.h>
#include <vendor/osm_vendor_api.h>
diff --git a/osm/osmtest/osmt_inform.c b/osm/osmtest/osmt_inform.c
index b24ae30..e1562db 100644
--- a/osm/osmtest/osmt_inform.c
+++ b/osm/osmtest/osmt_inform.c
@@ -56,7 +56,6 @@ #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <complib/cl_debug.h>
-#include <complib/cl_memory.h>
#include <vendor/osm_vendor_mlx_hca.h>
#include "osmtest.h"
diff --git a/osm/osmtest/osmt_slvl_vl_arb.c b/osm/osmtest/osmt_slvl_vl_arb.c
index 6cb8377..9fc84f6 100644
--- a/osm/osmtest/osmt_slvl_vl_arb.c
+++ b/osm/osmtest/osmt_slvl_vl_arb.c
@@ -54,7 +54,6 @@ #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <complib/cl_debug.h>
-#include <complib/cl_memory.h>
#include "osmtest.h"
/**********************************************************************
diff --git a/osm/osmtest/osmtest.c b/osm/osmtest/osmtest.c
index 78aff53..5eb5482 100644
--- a/osm/osmtest/osmtest.c
+++ b/osm/osmtest/osmtest.c
@@ -56,8 +56,8 @@ #endif
#include <stdio.h>
#include <stdlib.h>
-#ifdef __WIN__
#include <string.h>
+#ifdef __WIN__
#include <complib/cl_timer.h>
#else
#include <strings.h>
--
1.3.2
More information about the general
mailing list