osaf/services/saf/immsv/immnd/ImmModel.cc | 4 ----
osaf/services/saf/immsv/immnd/immnd_cb.h | 4 ++++
osaf/services/saf/immsv/immnd/immnd_evt.c | 4 ----
3 files changed, 4 insertions(+), 8 deletions(-)
Move IMM error string prefixes to immnd_cb.h header file.
diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -35,10 +35,6 @@
#define CCB_CRIT_THRESHOLD 8 /* See ImmModel::immNotPbeWritable */
#define SEARCH_TIMEOUT_SEC 600 /* Search timeout */
-// Same strings exists in immnd_evt.c
-#define IMM_VALIDATION_ABORT "IMM: Validation abort: "
-#define IMM_RESOURCE_ABORT "IMM: Resource abort: "
-
struct ContinuationInfo2
{
ContinuationInfo2():mCreateTime(kZeroSeconds), mConn(0), mTimeout(0),
mImplId(0){}
diff --git a/osaf/services/saf/immsv/immnd/immnd_cb.h
b/osaf/services/saf/immsv/immnd/immnd_cb.h
--- a/osaf/services/saf/immsv/immnd/immnd_cb.h
+++ b/osaf/services/saf/immsv/immnd/immnd_cb.h
@@ -230,4 +230,8 @@ void immnd_client_node_tree_destroy(IMMN
(IMMND_WRT_IMMD_SUBPART_VER_MAX - \
IMMND_WRT_IMMD_SUBPART_VER_MIN + 1 )
+/* IMMND - Prefix in IMM error strings for SA_AIS_ERR_NO_RESOURCE */
+#define IMM_VALIDATION_ABORT "IMM: Validation abort: "
+#define IMM_RESOURCE_ABORT "IMM: Resource abort: "
+
#endif
diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c
b/osaf/services/saf/immsv/immnd/immnd_evt.c
--- a/osaf/services/saf/immsv/immnd/immnd_evt.c
+++ b/osaf/services/saf/immsv/immnd/immnd_evt.c
@@ -38,10 +38,6 @@
#define IMMND_SEARCH_BUNDLE_SIZE ((MDS_DIRECT_BUF_MAXSIZE / 100) * 90)
#define IMMND_MAX_SEARCH_RESULT (IMMND_SEARCH_BUNDLE_SIZE / 300)
-// Same strings exists in ImmModel.cc
-#define IMM_VALIDATION_ABORT "IMM: Validation abort: "
-#define IMM_RESOURCE_ABORT "IMM: Resource abort: "
-
static SaAisErrorT immnd_fevs_local_checks(IMMND_CB *cb, IMMSV_FEVS *fevsReq,
const IMMSV_SEND_INFO *sinfo);
static uint32_t immnd_evt_proc_cb_dump(IMMND_CB *cb);
static uint32_t immnd_evt_proc_imm_init(IMMND_CB *cb, IMMND_EVT *evt,
IMMSV_SEND_INFO *sinfo, SaBoolT isOm);
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
