---
src/ntf/Makefile.am | 76 ++++-----
src/ntf/apitest/{sa_error.c => sa_error.cc} | 13 --
...erification.c => test_ntfFilterVerification.cc} | 15 +-
.../apitest/{test_ntf_imcn.c => test_ntf_imcn.cc} | 182 +++++++++++----------
src/ntf/apitest/test_ntf_imcn.h | 9 +-
...on.c => tet_NotificationContentVerification.cc} | 0
.../apitest/{tet_coldsync.c => tet_coldsync.cc} | 0
...fication.c => tet_longDnObject_notification.cc} | 10 +-
src/ntf/apitest/tet_ntf.h | 9 +-
...et_ntf_api_wrapper.c => tet_ntf_api_wrapper.cc} | 0
src/ntf/apitest/{tet_ntf_clm.c => tet_ntf_clm.cc} | 56 +++----
.../{tet_ntf_common.c => tet_ntf_common.cc} | 22 ++-
src/ntf/apitest/tet_ntf_common.h | 16 +-
.../apitest/{tet_ntf_main.c => tet_ntf_main.cc} | 0
...ate.c => tet_saNtfAlarmNotificationAllocate.cc} | 0
...=> tet_saNtfAlarmNotificationFilterAllocate.cc} | 0
...yValAllocate.c => tet_saNtfArrayValAllocate.cc} | 0
..._saNtfArrayValGet.c => tet_saNtfArrayValGet.cc} | 0
...et_saNtfAttributeChangeNotificationAllocate.cc} | 0
...tfAttributeChangeNotificationFilterAllocate.cc} | 0
.../{tet_saNtfDispatch.c => tet_saNtfDispatch.cc} | 2 +-
.../{tet_saNtfFinalize.c => tet_saNtfFinalize.cc} | 2 +-
...et_saNtfInitialize.c => tet_saNtfInitialize.cc} | 0
... tet_saNtfMiscellaneousNotificationAllocate.cc} | 0
...llbackT.c => tet_saNtfNotificationCallbackT.cc} | 8 +-
... => tet_saNtfNotificationDiscardedCallbackT.cc} | 4 +-
...lize.c => tet_saNtfNotificationReadFinalize.cc} | 0
...ze.c => tet_saNtfNotificationReadInitialize.cc} | 8 +-
...ReadNext.c => tet_saNtfNotificationReadNext.cc} | 2 +-
...ficationSend.c => tet_saNtfNotificationSend.cc} | 7 +-
...bscribe.c => tet_saNtfNotificationSubscribe.cc} | 0
...cribe.c => tet_saNtfNotificationUnsubscribe.cc} | 0
...saNtfObjectCreateDeleteNotificationAllocate.cc} | 0
...bjectCreateDeleteNotificationFilterAllocate.cc} | 0
...PtrValAllocate.c => tet_saNtfPtrValAllocate.cc} | 0
...{tet_saNtfPtrValGet.c => tet_saNtfPtrValGet.cc} | 0
... tet_saNtfSecurityAlarmNotificationAllocate.cc} | 0
...aNtfSecurityAlarmNotificationFilterAllocate.cc} | 0
...nObjectGet.c => tet_saNtfSelectionObjectGet.cc} | 0
...=> tet_saNtfStateChangeNotificationAllocate.cc} | 0
..._saNtfStateChangeNotificationFilterAllocate.cc} | 0
...Handle.c => tet_scOutage_reinitializeHandle.cc} | 4 +-
42 files changed, 236 insertions(+), 209 deletions(-)
rename src/ntf/apitest/{sa_error.c => sa_error.cc} (97%)
rename src/ntf/apitest/{test_ntfFilterVerification.c =>
test_ntfFilterVerification.cc} (99%)
rename src/ntf/apitest/{test_ntf_imcn.c => test_ntf_imcn.cc} (97%)
rename src/ntf/apitest/{tet_NotificationContentVerification.c =>
tet_NotificationContentVerification.cc} (100%)
rename src/ntf/apitest/{tet_coldsync.c => tet_coldsync.cc} (100%)
rename src/ntf/apitest/{tet_longDnObject_notification.c =>
tet_longDnObject_notification.cc} (99%)
rename src/ntf/apitest/{tet_ntf_api_wrapper.c => tet_ntf_api_wrapper.cc} (100%)
rename src/ntf/apitest/{tet_ntf_clm.c => tet_ntf_clm.cc} (95%)
rename src/ntf/apitest/{tet_ntf_common.c => tet_ntf_common.cc} (99%)
rename src/ntf/apitest/{tet_ntf_main.c => tet_ntf_main.cc} (100%)
rename src/ntf/apitest/{tet_saNtfAlarmNotificationAllocate.c =>
tet_saNtfAlarmNotificationAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfAlarmNotificationFilterAllocate.c =>
tet_saNtfAlarmNotificationFilterAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfArrayValAllocate.c =>
tet_saNtfArrayValAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfArrayValGet.c => tet_saNtfArrayValGet.cc}
(100%)
rename src/ntf/apitest/{tet_saNtfAttributeChangeNotificationAllocate.c =>
tet_saNtfAttributeChangeNotificationAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfAttributeChangeNotificationFilterAllocate.c
=> tet_saNtfAttributeChangeNotificationFilterAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfDispatch.c => tet_saNtfDispatch.cc} (96%)
rename src/ntf/apitest/{tet_saNtfFinalize.c => tet_saNtfFinalize.cc} (99%)
rename src/ntf/apitest/{tet_saNtfInitialize.c => tet_saNtfInitialize.cc} (100%)
rename src/ntf/apitest/{tet_saNtfMiscellaneousNotificationAllocate.c =>
tet_saNtfMiscellaneousNotificationAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfNotificationCallbackT.c =>
tet_saNtfNotificationCallbackT.cc} (99%)
rename src/ntf/apitest/{tet_saNtfNotificationDiscardedCallbackT.c =>
tet_saNtfNotificationDiscardedCallbackT.cc} (98%)
rename src/ntf/apitest/{tet_saNtfNotificationReadFinalize.c =>
tet_saNtfNotificationReadFinalize.cc} (100%)
rename src/ntf/apitest/{tet_saNtfNotificationReadInitialize.c =>
tet_saNtfNotificationReadInitialize.cc} (97%)
rename src/ntf/apitest/{tet_saNtfNotificationReadNext.c =>
tet_saNtfNotificationReadNext.cc} (100%)
rename src/ntf/apitest/{tet_saNtfNotificationSend.c =>
tet_saNtfNotificationSend.cc} (99%)
rename src/ntf/apitest/{tet_saNtfNotificationSubscribe.c =>
tet_saNtfNotificationSubscribe.cc} (100%)
rename src/ntf/apitest/{tet_saNtfNotificationUnsubscribe.c =>
tet_saNtfNotificationUnsubscribe.cc} (100%)
rename src/ntf/apitest/{tet_saNtfObjectCreateDeleteNotificationAllocate.c =>
tet_saNtfObjectCreateDeleteNotificationAllocate.cc} (100%)
rename
src/ntf/apitest/{tet_saNtfObjectCreateDeleteNotificationFilterAllocate.c =>
tet_saNtfObjectCreateDeleteNotificationFilterAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfPtrValAllocate.c =>
tet_saNtfPtrValAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfPtrValGet.c => tet_saNtfPtrValGet.cc} (100%)
rename src/ntf/apitest/{tet_saNtfSecurityAlarmNotificationAllocate.c =>
tet_saNtfSecurityAlarmNotificationAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfSecurityAlarmNotificationFilterAllocate.c =>
tet_saNtfSecurityAlarmNotificationFilterAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfSelectionObjectGet.c =>
tet_saNtfSelectionObjectGet.cc} (100%)
rename src/ntf/apitest/{tet_saNtfStateChangeNotificationAllocate.c =>
tet_saNtfStateChangeNotificationAllocate.cc} (100%)
rename src/ntf/apitest/{tet_saNtfStateChangeNotificationFilterAllocate.c =>
tet_saNtfStateChangeNotificationFilterAllocate.cc} (100%)
rename src/ntf/apitest/{tet_scOutage_reinitializeHandle.c =>
tet_scOutage_reinitializeHandle.cc} (99%)
diff --git a/src/ntf/Makefile.am b/src/ntf/Makefile.am
index 28e3c84fc..91d40ea21 100644
--- a/src/ntf/Makefile.am
+++ b/src/ntf/Makefile.am
@@ -236,50 +236,50 @@ bin_ntftest_CPPFLAGS = \
$(AM_CPPFLAGS)
bin_ntftest_SOURCES = \
- src/ntf/apitest/tet_ntf_main.c \
- src/ntf/apitest/sa_error.c \
- src/ntf/apitest/tet_ntf_common.c \
- src/ntf/apitest/tet_ntf_api_wrapper.c \
- src/ntf/apitest/tet_saNtfInitialize.c \
- src/ntf/apitest/tet_saNtfSelectionObjectGet.c \
- src/ntf/apitest/tet_saNtfDispatch.c \
- src/ntf/apitest/tet_saNtfFinalize.c \
- src/ntf/apitest/tet_saNtfNotificationCallbackT.c \
- src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.c \
- src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfNotificationSend.c \
- src/ntf/apitest/tet_saNtfNotificationSubscribe.c \
- src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.c \
- src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.c \
- src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.c
\
- src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.c \
- src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.c \
- src/ntf/apitest/tet_saNtfNotificationUnsubscribe.c \
- src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.c \
- src/ntf/apitest/tet_saNtfNotificationReadInitialize.c \
- src/ntf/apitest/tet_saNtfNotificationReadFinalize.c \
- src/ntf/apitest/tet_saNtfNotificationReadNext.c \
- src/ntf/apitest/tet_NotificationContentVerification.c \
- src/ntf/apitest/tet_saNtfArrayValAllocate.c \
- src/ntf/apitest/tet_saNtfPtrValAllocate.c \
- src/ntf/apitest/tet_saNtfArrayValGet.c \
- src/ntf/apitest/tet_saNtfPtrValGet.c \
- src/ntf/apitest/test_ntfFilterVerification.c \
- src/ntf/apitest/tet_longDnObject_notification.c \
- src/ntf/apitest/tet_scOutage_reinitializeHandle.c \
- src/ntf/apitest/tet_ntf_clm.c \
- src/ntf/apitest/tet_coldsync.c
+ src/ntf/apitest/tet_ntf_main.cc \
+ src/ntf/apitest/sa_error.cc \
+ src/ntf/apitest/tet_ntf_common.cc \
+ src/ntf/apitest/tet_ntf_api_wrapper.cc \
+ src/ntf/apitest/tet_saNtfInitialize.cc \
+ src/ntf/apitest/tet_saNtfSelectionObjectGet.cc \
+ src/ntf/apitest/tet_saNtfDispatch.cc \
+ src/ntf/apitest/tet_saNtfFinalize.cc \
+ src/ntf/apitest/tet_saNtfNotificationCallbackT.cc \
+ src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.cc \
+ src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfNotificationSend.cc \
+ src/ntf/apitest/tet_saNtfNotificationSubscribe.cc \
+ src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.cc \
+ src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.cc \
+
src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.cc \
+ src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.cc \
+ src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.cc \
+ src/ntf/apitest/tet_saNtfNotificationUnsubscribe.cc \
+ src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.cc \
+ src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc \
+ src/ntf/apitest/tet_saNtfNotificationReadFinalize.cc \
+ src/ntf/apitest/tet_saNtfNotificationReadNext.cc \
+ src/ntf/apitest/tet_NotificationContentVerification.cc \
+ src/ntf/apitest/tet_saNtfArrayValAllocate.cc \
+ src/ntf/apitest/tet_saNtfPtrValAllocate.cc \
+ src/ntf/apitest/tet_saNtfArrayValGet.cc \
+ src/ntf/apitest/tet_saNtfPtrValGet.cc \
+ src/ntf/apitest/test_ntfFilterVerification.cc \
+ src/ntf/apitest/tet_longDnObject_notification.cc \
+ src/ntf/apitest/tet_scOutage_reinitializeHandle.cc \
+ src/ntf/apitest/tet_ntf_clm.cc \
+ src/ntf/apitest/tet_coldsync.cc
bin_ntftest_LDADD = \
lib/libapitest.la
if ENABLE_NTFIMCN
-bin_ntftest_SOURCES += src/ntf/apitest/test_ntf_imcn.c
+bin_ntftest_SOURCES += src/ntf/apitest/test_ntf_imcn.cc
bin_ntftest_LDADD += lib/libosaf_common.la
endif
diff --git a/src/ntf/apitest/sa_error.c b/src/ntf/apitest/sa_error.cc
similarity index 97%
rename from src/ntf/apitest/sa_error.c
rename to src/ntf/apitest/sa_error.cc
index 7de8969ab..2e3f6d7bc 100644
--- a/src/ntf/apitest/sa_error.c
+++ b/src/ntf/apitest/sa_error.cc
@@ -191,19 +191,6 @@ char *get_sa_error_b(SaAisErrorT error)
return ((char *)sa_error_list[error]);
}
-char *get_test_output(SaAisErrorT result, SaAisErrorT expected)
-{
- static char test_result[256];
-
- if (result == expected) {
- return ("PASSED");
- } else {
- (void)sprintf(test_result, "FAILED expected %s got %s",
- get_sa_error_b(expected), get_sa_error_b(result));
- return (test_result);
- }
-}
-
void print_severity(SaNtfSeverityT input)
{
exitIfFalse(input >= SA_NTF_SEVERITY_CLEARED);
diff --git a/src/ntf/apitest/test_ntfFilterVerification.c
b/src/ntf/apitest/test_ntfFilterVerification.cc
similarity index 99%
rename from src/ntf/apitest/test_ntfFilterVerification.c
rename to src/ntf/apitest/test_ntfFilterVerification.cc
index 3c7651b4b..c75919519 100644
--- a/src/ntf/apitest/test_ntfFilterVerification.c
+++ b/src/ntf/apitest/test_ntfFilterVerification.cc
@@ -44,7 +44,7 @@
#define NOTIFYING_OBJECT_TEST "AVND"
#define NTF_REST_MAX_IDS 30
struct not_idsT {
- int length;
+ SaUint64T length;
SaNtfIdentifierT ids[NTF_REST_MAX_IDS];
};
@@ -73,7 +73,7 @@ static SaNtfAttributeChangeNotificationT
myAttrChangeNotification;
static SaNtfStateChangeNotificationT myStateChangeNotification;
static SaNtfSecurityAlarmNotificationT mySecAlarmNotification;
-static void saNameSet(SaNameT *sn, char *s)
+static void saNameSet(SaNameT *sn, const char *s)
{
sn->length = strlen(s);
(void)memcpy(sn->value, s, sn->length);
@@ -94,7 +94,7 @@ static void ntf_id_store(SaNtfIdentifierT n_id)
*/
static void printOkIds()
{
- int j;
+ SaUint64T j;
if (!id_verbose)
return;
for (j = 0; j < ok_ids.length; j++)
@@ -107,7 +107,7 @@ static void printOkIds()
*/
static SaAisErrorT check_errors()
{
- int i, j, found;
+ SaUint64T i, j, found;
SaAisErrorT rc = SA_AIS_OK;
for (i = 0; i < received_ids.length; i++) {
@@ -423,7 +423,7 @@ void headerTest2(void)
*myAlarmNotification.notificationHeader.notificationId;
fillHeader(head);
- *(head->eventType) = SA_NTF_TYPE_ALARM;
+ *(head->eventType) = static_cast<SaNtfEventTypeT>(SA_NTF_TYPE_ALARM);
head->notifyingObject->length = strlen(NOTIFYING_OBJECT_TEST);
(void)memcpy(head->notifyingObject->value, NOTIFYING_OBJECT_TEST,
head->notifyingObject->length);
@@ -1047,13 +1047,14 @@ void alarmNotificationFilterTest2(void)
safassert(saNtfNotificationSend(myAlarmNotification.notificationHandle),
SA_AIS_OK);
- *(myAlarmNotification.perceivedSeverity) = SA_NTF_ADAPTER_ERROR;
+ *(myAlarmNotification.perceivedSeverity) =
+ static_cast<SaNtfSeverityT>(SA_NTF_ADAPTER_ERROR);
*(myAlarmNotification.probableCause) = SA_NTF_PRESSURE_UNACCEPTABLE;
safassert(saNtfNotificationSend(myAlarmNotification.notificationHandle),
SA_AIS_OK);
*(myAlarmNotification.perceivedSeverity) =
- SA_NTF_APPLICATION_SUBSYSTEM_FAILURE;
+
static_cast<SaNtfSeverityT>(SA_NTF_APPLICATION_SUBSYSTEM_FAILURE);
*(myAlarmNotification.probableCause) = SA_NTF_PRESSURE_UNACCEPTABLE;
safassert(saNtfNotificationSend(myAlarmNotification.notificationHandle),
SA_AIS_OK);
diff --git a/src/ntf/apitest/test_ntf_imcn.c b/src/ntf/apitest/test_ntf_imcn.cc
similarity index 97%
rename from src/ntf/apitest/test_ntf_imcn.c
rename to src/ntf/apitest/test_ntf_imcn.cc
index f42f462c0..ba996ce2b 100644
--- a/src/ntf/apitest/test_ntf_imcn.c
+++ b/src/ntf/apitest/test_ntf_imcn.cc
@@ -32,6 +32,7 @@
#include "osaf/apitest/utest.h"
#include <saNtf.h>
#include "test_ntf_imcn.h"
+#include "tet_ntf_common.h"
/*
* Global variables.
@@ -43,9 +44,6 @@ static SaImmOiHandleT immOiHnd = 0;
static char extended_name_string_01[DEFAULT_EXT_NAME_LENGTH];
static char extended_name_string_02[DEFAULT_EXT_NAME_LENGTH];
-extern void saAisNameLend(SaConstStringT value, SaNameT *name);
-extern SaConstStringT saAisNameBorrow(const SaNameT *name);
-
/**
* Callback routine, called when subscribed notification arrives.
*/
@@ -1117,7 +1115,8 @@ static SaAisErrorT set_ntf(NotifData *n_exp,
SaNtfEventTypeT ntfEventType,
const char *dn, SaUint16T numAddi, SaUint16T numAttr)
{
SaAisErrorT error = SA_AIS_ERR_FAILED_OPERATION;
- SaBoolT configObj = !strncmp(dn, "stringRdnCfg", 12);
+ SaBoolT configObj = static_cast<SaBoolT>(
+ !strncmp(dn, "stringRdnCfg", 12));
n_exp->evType = ntfEventType;
n_exp->ccbInfoId = 0;
@@ -1128,7 +1127,8 @@ static SaAisErrorT set_ntf(NotifData *n_exp,
SaNtfEventTypeT ntfEventType,
n_exp->evType == SA_NTF_OBJECT_DELETION) {
n_exp->a_c_notif_ptr = NULL;
n_exp->c_d_notif_ptr =
- malloc(sizeof(SaNtfObjectCreateDeleteNotificationT));
+ static_cast<SaNtfObjectCreateDeleteNotificationT*>
+ (malloc(sizeof(SaNtfObjectCreateDeleteNotificationT)));
if ((error = saNtfObjectCreateDeleteNotificationAllocate(
ntfHandle, n_exp->c_d_notif_ptr, 0, 0, numAddi,
@@ -1143,7 +1143,8 @@ static SaAisErrorT set_ntf(NotifData *n_exp,
SaNtfEventTypeT ntfEventType,
} else if (n_exp->evType == SA_NTF_ATTRIBUTE_CHANGED) {
n_exp->c_d_notif_ptr = NULL;
n_exp->a_c_notif_ptr =
- malloc(sizeof(SaNtfAttributeChangeNotificationT));
+ static_cast<SaNtfAttributeChangeNotificationT*>(
+ malloc(sizeof(SaNtfAttributeChangeNotificationT)));
if ((error = saNtfAttributeChangeNotificationAllocate(
ntfHandle, n_exp->a_c_notif_ptr, 0, 0, numAddi,
@@ -1305,7 +1306,7 @@ static SaAisErrorT set_attr_extended_name(NotifData
*n_exp, SaUint16T idx,
SaNtfValueTypeT valType,
void *attrValue)
{
- safassert(valType == SA_NTF_VALUE_LDAP_NAME, true);
+ assert(valType == SA_NTF_VALUE_LDAP_NAME);
SaAisErrorT error = SA_AIS_OK;
SaUint16T numAlloc = strlen(saAisNameBorrow((SaNameT *)attrValue));
SaUint8T *temp = NULL;
@@ -1406,7 +1407,7 @@ static SaAisErrorT
set_attr_change_extended_name(NotifData *n_exp,
SaNtfValueTypeT valType,
const void *newValue)
{
- safassert(valType == SA_NTF_VALUE_LDAP_NAME, true);
+ assert(valType == SA_NTF_VALUE_LDAP_NAME);
SaAisErrorT error = SA_AIS_OK;
SaUint16T numAlloc = strlen(saAisNameBorrow((SaNameT *)newValue));
SaUint8T *temp = NULL;
@@ -1483,74 +1484,75 @@ static void create_rt_test_object(const SaImmClassNameT
cname, const char *dn,
SaFloatT floatVar, SaDoubleT doubleVar,
SaStringT *stringVar, SaAnyT *anyVar)
{
- char *rdn = strchr(dn, '=') + 1;
+ char *rdn = const_cast<char*>(strchr(dn, '=')) + 1;
void *attr1[] = {&rdn};
const SaImmAttrValuesT_2 attr_rdnVar = {
- .attrName = (strcmp(cname, "OsafNtfCmTestRT") == 0) ? "stringRdn"
- : "stringRdn1",
+ .attrName = (strcmp(cname, "OsafNtfCmTestRT") == 0) ?
+ const_cast<SaImmAttrNameT>("stringRdn") :
+ const_cast<SaImmAttrNameT>("stringRdn1"),
.attrValueType = SA_IMM_ATTR_SASTRINGT,
.attrValuesNumber = 1,
.attrValues = attr1};
void *attr2[] = {&int32Var};
- const SaImmAttrValuesT_2 attr_int32Var = {.attrName = "testInt32",
- .attrValueType =
- SA_IMM_ATTR_SAINT32T,
- .attrValuesNumber = 1,
- .attrValues = attr2};
+ const SaImmAttrValuesT_2 attr_int32Var = {
+ .attrName = const_cast<SaImmAttrNameT>("testInt32"),
+ .attrValueType = SA_IMM_ATTR_SAINT32T,
+ .attrValuesNumber = 1,
+ .attrValues = attr2};
void *attr3[] = {&uint32Var};
- const SaImmAttrValuesT_2 attr_uint32Var = {.attrName = "testUint32",
- .attrValueType =
- SA_IMM_ATTR_SAUINT32T,
- .attrValuesNumber = 1,
- .attrValues = attr3};
+ const SaImmAttrValuesT_2 attr_uint32Var = {
+ .attrName = const_cast<SaImmAttrNameT>("testUint32"),
+ .attrValueType = SA_IMM_ATTR_SAUINT32T,
+ .attrValuesNumber = 1,
+ .attrValues = attr3};
void *attr4[] = {&int64Var};
- const SaImmAttrValuesT_2 attr_int64Var = {.attrName = "testInt64",
- .attrValueType =
- SA_IMM_ATTR_SAINT64T,
- .attrValuesNumber = 1,
- .attrValues = attr4};
+ const SaImmAttrValuesT_2 attr_int64Var = {
+ .attrName = const_cast<SaImmAttrNameT>("testInt64"),
+ .attrValueType = SA_IMM_ATTR_SAINT64T,
+ .attrValuesNumber = 1,
+ .attrValues = attr4};
void *attr5[] = {&uint64Var};
- const SaImmAttrValuesT_2 attr_uint64Var = {.attrName = "testUint64",
- .attrValueType =
- SA_IMM_ATTR_SAUINT64T,
- .attrValuesNumber = 1,
- .attrValues = attr5};
+ const SaImmAttrValuesT_2 attr_uint64Var = {
+ .attrName = const_cast<SaImmAttrNameT>("testUint64"),
+ .attrValueType = SA_IMM_ATTR_SAUINT64T,
+ .attrValuesNumber = 1,
+ .attrValues = attr5};
void *attr6[] = {timeVar};
- const SaImmAttrValuesT_2 attr_timeVar = {.attrName = "testTime",
- .attrValueType =
- SA_IMM_ATTR_SATIMET,
- .attrValuesNumber = 1,
- .attrValues = attr6};
+ const SaImmAttrValuesT_2 attr_timeVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testTime"),
+ .attrValueType = SA_IMM_ATTR_SATIMET,
+ .attrValuesNumber = 1,
+ .attrValues = attr6};
void *attr7[] = {nameVar};
- const SaImmAttrValuesT_2 attr_nameVar = {.attrName = "testName",
- .attrValueType =
- SA_IMM_ATTR_SANAMET,
- .attrValuesNumber = 1,
- .attrValues = attr7};
+ const SaImmAttrValuesT_2 attr_nameVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testName"),
+ .attrValueType = SA_IMM_ATTR_SANAMET,
+ .attrValuesNumber = 1,
+ .attrValues = attr7};
void *attr8[] = {&floatVar};
- const SaImmAttrValuesT_2 attr_floatVar = {.attrName = "testFloat",
- .attrValueType =
- SA_IMM_ATTR_SAFLOATT,
- .attrValuesNumber = 1,
- .attrValues = attr8};
+ const SaImmAttrValuesT_2 attr_floatVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testFloat"),
+ .attrValueType = SA_IMM_ATTR_SAFLOATT,
+ .attrValuesNumber = 1,
+ .attrValues = attr8};
void *attr9[] = {&doubleVar};
- const SaImmAttrValuesT_2 attr_doubleVar = {.attrName = "testDouble",
- .attrValueType =
- SA_IMM_ATTR_SADOUBLET,
- .attrValuesNumber = 1,
- .attrValues = attr9};
+ const SaImmAttrValuesT_2 attr_doubleVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testDouble"),
+ .attrValueType = SA_IMM_ATTR_SADOUBLET,
+ .attrValuesNumber = 1,
+ .attrValues = attr9};
void *attr10[] = {stringVar};
- const SaImmAttrValuesT_2 attr_stringVar = {.attrName = "testString",
- .attrValueType =
- SA_IMM_ATTR_SASTRINGT,
- .attrValuesNumber = 1,
- .attrValues = attr10};
+ const SaImmAttrValuesT_2 attr_stringVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testString"),
+ .attrValueType = SA_IMM_ATTR_SASTRINGT,
+ .attrValuesNumber = 1,
+ .attrValues = attr10};
void *attr11[] = {anyVar};
- const SaImmAttrValuesT_2 attr_anyVar = {.attrName = "testAny",
- .attrValueType =
- SA_IMM_ATTR_SAANYT,
- .attrValuesNumber = 1,
- .attrValues = attr11};
+ const SaImmAttrValuesT_2 attr_anyVar = {
+ .attrName = const_cast<SaImmAttrNameT>("testAny"),
+ .attrValueType = SA_IMM_ATTR_SAANYT,
+ .attrValuesNumber = 1,
+ .attrValues = attr11};
const SaImmAttrValuesT_2 *attrVal[] = {
&attr_rdnVar, &attr_int32Var, &attr_uint32Var, &attr_int64Var,
&attr_uint64Var, &attr_timeVar, &attr_nameVar, &attr_floatVar,
@@ -1572,7 +1574,7 @@ static void create_rt_test_object(const SaImmClassNameT
cname, const char *dn,
static void modify_rt_test_object(const char *dn, SaInt32T modType,
TestAttributeValue *attr[])
{
- char *rdn = strchr(dn, '=') + 1;
+ char *rdn = const_cast<char*>(strchr(dn, '=')) + 1;
SaNameT objName;
strcpy((char *)objName.value, rdn);
objName.length = strlen(rdn) + 1;
@@ -1580,8 +1582,10 @@ static void modify_rt_test_object(const char *dn,
SaInt32T modType,
SaImmAttrModificationT_2 *attrMod[20];
int i = 0;
while (attr[i] != NULL) {
- attrMod[i] = malloc(sizeof(SaImmAttrModificationT_2));
- attrMod[i]->modType = modType;
+ attrMod[i] = static_cast<SaImmAttrModificationT_2*>(
+ malloc(sizeof(SaImmAttrModificationT_2)));
+ attrMod[i]->modType = static_cast<SaImmAttrModificationTypeT>(
+ modType);
attrMod[i]->modAttr.attrName = (char *)attr[i]->attrName;
attrMod[i]->modAttr.attrValueType = attr[i]->attrType;
attrMod[i]->modAttr.attrValuesNumber = 1;
@@ -1610,7 +1614,7 @@ static void modify_rt_test_object(const char *dn,
SaInt32T modType,
*/
static void delete_rt_test_object(const char *dn)
{
- char *rdn = strchr(dn, '=') + 1;
+ char *rdn = const_cast<char*>(strchr(dn, '=')) + 1;
SaNameT objName;
strcpy((char *)objName.value, rdn);
objName.length = strlen(rdn);
@@ -1630,7 +1634,8 @@ static int isLongDnsAllowed()
SaImmHandleT immHandle;
SaImmAccessorHandleT accessorHandle;
SaVersionT immVersion = {'A', 2, 15};
- SaImmAttrNameT attrName = "longDnsAllowed";
+ SaImmAttrNameT attrName = const_cast<SaImmAttrNameT>(
+ "longDnsAllowed");
SaImmAttrNameT attrNames[2] = {attrName, NULL};
SaImmAttrValuesT_2 **attributes = NULL;
SaConstStringT immObjectName =
"opensafImm=opensafImm,safApp=safImmService";
@@ -1681,11 +1686,12 @@ void objectCreateTest_01(void)
SaStringT stringVar = STRINGVAR1;
SaAnyT anyVar = {.bufferSize = sizeof(BUF1),
.bufferAddr = (SaUint8T *)BUF1};
-
+ const SaImmClassNameT class_name =
+ const_cast<SaImmClassNameT>("OsafNtfCmTestRT");
/*
* Create the object in IMM.
*/
- create_rt_test_object("OsafNtfCmTestRT", DNTESTRT, int32Var, uint32Var,
+ create_rt_test_object(class_name, DNTESTRT, int32Var, uint32Var,
int64Var, uint64Var, &timeVar, &nameVar, floatVar,
doubleVar, &stringVar, &anyVar);
@@ -4819,28 +4825,28 @@ void objectMultiCcbTest_38(void)
void *val1[] = {&var1};
SaImmAttrModificationT_2 am1 = {.modType = SA_IMM_ATTR_VALUES_REPLACE};
- am1.modAttr.attrName = "testUint32Cfg";
+ am1.modAttr.attrName = const_cast<SaImmAttrNameT>("testUint32Cfg");
am1.modAttr.attrValueType = SA_IMM_ATTR_SAUINT32T;
am1.modAttr.attrValuesNumber = 1;
am1.modAttr.attrValues = val1;
void *val2[] = {&var2};
SaImmAttrModificationT_2 am2 = {.modType = SA_IMM_ATTR_VALUES_REPLACE};
- am2.modAttr.attrName = "testInt32Cfg";
+ am2.modAttr.attrName = const_cast<SaImmAttrNameT>("testInt32Cfg");
am2.modAttr.attrValueType = SA_IMM_ATTR_SAINT32T;
am2.modAttr.attrValuesNumber = 1;
am2.modAttr.attrValues = val2;
void *val3[] = {&var3};
SaImmAttrModificationT_2 am3 = {.modType = SA_IMM_ATTR_VALUES_REPLACE};
- am3.modAttr.attrName = "testUint64Cfg";
+ am3.modAttr.attrName = const_cast<SaImmAttrNameT>("testUint64Cfg");
am3.modAttr.attrValueType = SA_IMM_ATTR_SAUINT64T;
am3.modAttr.attrValuesNumber = 1;
am3.modAttr.attrValues = val3;
void *val4[] = {&var4};
SaImmAttrModificationT_2 am4 = {.modType = SA_IMM_ATTR_VALUES_REPLACE};
- am4.modAttr.attrName = "testInt64Cfg";
+ am4.modAttr.attrName = const_cast<SaImmAttrNameT>("testInt64Cfg");
am4.modAttr.attrValueType = SA_IMM_ATTR_SAINT64T;
am4.modAttr.attrValuesNumber = 1;
am4.modAttr.attrValues = val4;
@@ -4849,8 +4855,10 @@ void objectMultiCcbTest_38(void)
SaImmAttrModificationT_2 *attrMod2[] = {&am3, &am4, NULL};
safassert(immutil_saImmOmInitialize(&omHandle, NULL, &immVersion),
SA_AIS_OK);
- safassert(immutil_saImmOmAdminOwnerInitialize(omHandle, "multiCcbOwner",
- SA_TRUE, &ownerHandle),
+ safassert(immutil_saImmOmAdminOwnerInitialize(
+ omHandle,
+ const_cast<SaImmAdminOwnerNameT>("multiCcbOwner"),
+ SA_TRUE, &ownerHandle),
SA_AIS_OK);
const SaNameT *objName[] = {&objectName, NULL};
safassert(
@@ -5018,42 +5026,42 @@ void objectMultiCcbTest_39(void)
void *val1[] = {&var1};
SaImmAttrModificationT_2 am1 = {.modType = SA_IMM_ATTR_VALUES_ADD};
- am1.modAttr.attrName = "testUint32Cfg";
+ am1.modAttr.attrName = const_cast<SaImmAttrNameT>("testUint32Cfg");
am1.modAttr.attrValueType = SA_IMM_ATTR_SAUINT32T;
am1.modAttr.attrValuesNumber = 1;
am1.modAttr.attrValues = val1;
void *val2[] = {&var2};
SaImmAttrModificationT_2 am2 = {.modType = SA_IMM_ATTR_VALUES_REPLACE};
- am2.modAttr.attrName = "testInt32Cfg";
+ am2.modAttr.attrName = const_cast<SaImmAttrNameT>("testInt32Cfg");
am2.modAttr.attrValueType = SA_IMM_ATTR_SAINT32T;
am2.modAttr.attrValuesNumber = 1;
am2.modAttr.attrValues = val2;
void *val3[] = {&var3};
SaImmAttrModificationT_2 am3 = {.modType = SA_IMM_ATTR_VALUES_DELETE};
- am3.modAttr.attrName = "testUint64Cfg";
+ am3.modAttr.attrName = const_cast<SaImmAttrNameT>("testUint64Cfg");
am3.modAttr.attrValueType = SA_IMM_ATTR_SAUINT64T;
am3.modAttr.attrValuesNumber = 1;
am3.modAttr.attrValues = val3;
void *val4[] = {&var4};
SaImmAttrModificationT_2 am4 = {.modType = SA_IMM_ATTR_VALUES_DELETE};
- am4.modAttr.attrName = "testInt64Cfg";
+ am4.modAttr.attrName = const_cast<SaImmAttrNameT>("testInt64Cfg");
am4.modAttr.attrValueType = SA_IMM_ATTR_SAINT64T;
am4.modAttr.attrValuesNumber = 1;
am4.modAttr.attrValues = val4;
void *val5[] = {&var5};
SaImmAttrModificationT_2 am5 = {.modType = SA_IMM_ATTR_VALUES_DELETE};
- am5.modAttr.attrName = "testDoubleCfg";
+ am5.modAttr.attrName = const_cast<SaImmAttrNameT>("testDoubleCfg");
am5.modAttr.attrValueType = SA_IMM_ATTR_SADOUBLET;
am5.modAttr.attrValuesNumber = 1;
am5.modAttr.attrValues = val5;
void *val6[] = {&var6};
SaImmAttrModificationT_2 am6 = {.modType = SA_IMM_ATTR_VALUES_DELETE};
- am6.modAttr.attrName = "testFloatCfg";
+ am6.modAttr.attrName = const_cast<SaImmAttrNameT>("testFloatCfg");
am6.modAttr.attrValueType = SA_IMM_ATTR_SAFLOATT;
am6.modAttr.attrValuesNumber = 1;
am6.modAttr.attrValues = val6;
@@ -5064,8 +5072,10 @@ void objectMultiCcbTest_39(void)
safassert(immutil_saImmOmInitialize(&omHandle, NULL, &immVersion),
SA_AIS_OK);
- safassert(immutil_saImmOmAdminOwnerInitialize(omHandle, "multiCcbOwner",
- SA_TRUE, &ownerHandle),
+ safassert(immutil_saImmOmAdminOwnerInitialize(
+ omHandle,
+ const_cast<SaImmAdminOwnerNameT>("multiCcbOwner"),
+ SA_TRUE, &ownerHandle),
SA_AIS_OK);
const SaNameT *objName[] = {&objectName, NULL};
safassert(
@@ -5353,11 +5363,13 @@ void objectCreateTest_3401(void)
SaStringT stringVar = STRINGVAR1;
SaAnyT anyVar = {.bufferSize = sizeof(BUF1),
.bufferAddr = (SaUint8T *)BUF1};
+ const SaImmClassNameT class_name = const_cast<SaImmClassNameT>(
+ "OsafNtfCmTestRT1");
/*
* Create the object in IMM.
*/
- create_rt_test_object("OsafNtfCmTestRT1", DNTESTRT1, int32Var,
+ create_rt_test_object(class_name, DNTESTRT1, int32Var,
uint32Var, int64Var, uint64Var, &timeVar,
&nameVar, floatVar, doubleVar, &stringVar,
&anyVar);
@@ -5660,11 +5672,13 @@ void objectCreateTest_3501(void)
SaStringT stringVar = STRINGVAR1;
SaAnyT anyVar = {.bufferSize = sizeof(BUF1),
.bufferAddr = (SaUint8T *)BUF1};
+ const SaImmClassNameT class_name = const_cast<SaImmClassNameT>(
+ "OsafNtfCmTestRT");
/*
* Create the object in IMM.
*/
- create_rt_test_object("OsafNtfCmTestRT", DNTESTRT, int32Var, uint32Var,
+ create_rt_test_object(class_name, DNTESTRT, int32Var, uint32Var,
int64Var, uint64Var, &timeVar, &nameVar, floatVar,
doubleVar, &stringVar, &anyVar);
diff --git a/src/ntf/apitest/test_ntf_imcn.h b/src/ntf/apitest/test_ntf_imcn.h
index 6e2c145cd..683135e6d 100644
--- a/src/ntf/apitest/test_ntf_imcn.h
+++ b/src/ntf/apitest/test_ntf_imcn.h
@@ -70,7 +70,7 @@ const SaUint64T UINT64VAR1 = 64;
const SaTimeT TIMEVAR1 = 12345;
const SaFloatT FLOATVAR1 = 3.140000;
const SaDoubleT DOUBLEVAR1 = 2.712200;
-const SaStringT STRINGVAR1 = "firstString";
+const SaStringT STRINGVAR1 = const_cast<SaStringT>("firstString");
const SaInt32T INT32VAR2 = -232;
const SaUint32T UINT32VAR2 = 232;
@@ -79,7 +79,7 @@ const SaUint64T UINT64VAR2 = 264;
const SaTimeT TIMEVAR2 = 67890;
const SaFloatT FLOATVAR2 = 23.14359;
const SaDoubleT DOUBLEVAR2 = 22.712223;
-const SaStringT STRINGVAR2 = "secondStringMultivalue";
+const SaStringT STRINGVAR2 = const_cast<SaStringT>("secondStringMultivalue");
const SaInt32T INT32VAR3 = -332;
const SaUint32T UINT32VAR3 = 332;
@@ -88,11 +88,12 @@ const SaUint64T UINT64VAR3 = 364;
const SaTimeT TIMEVAR3 = 54545454;
const SaFloatT FLOATVAR3 = 2333.14359;
const SaDoubleT DOUBLEVAR3 = 2244.712223;
-const SaStringT STRINGVAR3 = "thirdStringMultivalue";
+const SaStringT STRINGVAR3 = const_cast<SaStringT>("thirdStringMultivalue");
const int POLLWAIT = 100;
-static const SaImmOiImplementerNameT IMPLEMENTERNAME_RT =
"Runtime_implementer";
+static const SaImmOiImplementerNameT IMPLEMENTERNAME_RT =
+ const_cast<SaImmOiImplementerNameT>("Runtime_implementer");
static SaVersionT immVersion = {'A', 0x02, 0x0c};
static const char* const DNTESTRT = "stringRdn=TestObject";
diff --git a/src/ntf/apitest/tet_NotificationContentVerification.c
b/src/ntf/apitest/tet_NotificationContentVerification.cc
similarity index 100%
rename from src/ntf/apitest/tet_NotificationContentVerification.c
rename to src/ntf/apitest/tet_NotificationContentVerification.cc
diff --git a/src/ntf/apitest/tet_coldsync.c b/src/ntf/apitest/tet_coldsync.cc
similarity index 100%
rename from src/ntf/apitest/tet_coldsync.c
rename to src/ntf/apitest/tet_coldsync.cc
diff --git a/src/ntf/apitest/tet_longDnObject_notification.c
b/src/ntf/apitest/tet_longDnObject_notification.cc
similarity index 99%
rename from src/ntf/apitest/tet_longDnObject_notification.c
rename to src/ntf/apitest/tet_longDnObject_notification.cc
index 55603a47e..fca2bc33b 100644
--- a/src/ntf/apitest/tet_longDnObject_notification.c
+++ b/src/ntf/apitest/tet_longDnObject_notification.cc
@@ -15,7 +15,6 @@
* Author(s): Ericsson AB
*
*/
-
#include <stdio.h>
#include "osaf/apitest/utest.h"
#include "osaf/apitest/util.h"
@@ -31,7 +30,7 @@
#define DEFAULT_EXT_NAME_LENGTH 300
#define DEFAULT_UNEXT_NAME_STRING "This is unextended SaNameT string (<256)"
struct not_idsT {
- int length;
+ SaUint64T length;
SaNtfIdentifierT ids[NTF_REST_MAX_IDS];
};
@@ -61,9 +60,6 @@ static SaNtfAttributeChangeNotificationT
myAttrChangeNotification;
static SaNtfStateChangeNotificationT myStateChangeNotification;
static SaNtfSecurityAlarmNotificationT mySecAlarmNotification;
-extern void saAisNameLend(SaConstStringT value, SaNameT *name);
-extern SaConstStringT saAisNameBorrow(const SaNameT *name);
-
//>
// For backup, change, and restore IMM attribute values.
//<
@@ -256,7 +252,7 @@ static void setupEnv(void)
*/
static void init_ext_object()
{
- safassert(setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1), 0);
+ rc_assert(setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1), 0);
memset(&default_ext_notification_object, 'A',
DEFAULT_EXT_NAME_LENGTH - 1);
@@ -290,7 +286,7 @@ static void ntf_id_store(SaNtfIdentifierT n_id)
*/
static SaAisErrorT check_errors()
{
- int i, j, found;
+ SaUint64T i, j, found;
SaAisErrorT rc = SA_AIS_OK;
for (i = 0; i < received_ids.length; i++) {
diff --git a/src/ntf/apitest/tet_ntf.h b/src/ntf/apitest/tet_ntf.h
index fef667391..02c28660e 100644
--- a/src/ntf/apitest/tet_ntf.h
+++ b/src/ntf/apitest/tet_ntf.h
@@ -39,14 +39,15 @@ extern void tet_result(int result);
extern const SaVersionT refVersion;
extern SaVersionT ntfVersion;
+extern const SaVersionT lowestVersion;
extern SaAisErrorT rc;
extern SaNtfHandleT ntfHandle;
extern SaNtfCallbacksT ntfCallbacks;
extern SaSelectionObjectT selectionObject;
-int verbose;
-int gl_tag_mode;
-int gl_prompt_mode;
-bool gl_suspending;
+extern int verbose;
+extern int gl_tag_mode;
+extern int gl_prompt_mode;
+extern bool gl_suspending;
#define DEFAULT_ADDITIONAL_TEXT "this is additional text info"
diff --git a/src/ntf/apitest/tet_ntf_api_wrapper.c
b/src/ntf/apitest/tet_ntf_api_wrapper.cc
similarity index 100%
rename from src/ntf/apitest/tet_ntf_api_wrapper.c
rename to src/ntf/apitest/tet_ntf_api_wrapper.cc
diff --git a/src/ntf/apitest/tet_ntf_clm.c b/src/ntf/apitest/tet_ntf_clm.cc
similarity index 95%
rename from src/ntf/apitest/tet_ntf_clm.c
rename to src/ntf/apitest/tet_ntf_clm.cc
index 0f2c7d06e..09227655d 100644
--- a/src/ntf/apitest/tet_ntf_clm.c
+++ b/src/ntf/apitest/tet_ntf_clm.cc
@@ -113,44 +113,44 @@ void ntf_clm_A0101_05()
void ntf_clm_01()
{
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
}
void ntf_clm_02()
{
safassert(saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfSelectionObjectGet(ntf_Handle, &selectionObject);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
}
void ntf_clm_03()
{
safassert(saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfDispatch(ntf_Handle, SA_DISPATCH_ALL);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
}
void ntf_clm_04()
{
safassert(saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfFinalize(ntf_Handle);
test_validate(rc, SA_AIS_OK);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
}
void ntf_clm_not_allocate_APIs(SaNtfNotificationTypeT notificationtype)
{
safassert(saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
switch (notificationtype) {
case SA_NTF_TYPE_STATE_CHANGE:
rc = saNtfStateChangeNotificationAllocate(ntf_Handle, &st_not,
@@ -176,7 +176,7 @@ void ntf_clm_not_allocate_APIs(SaNtfNotificationTypeT
notificationtype)
default:
break;
}
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -201,9 +201,9 @@ void ntf_clm_10()
safassert(rc, SA_AIS_OK);
fill_head(&st_not.notificationHeader);
*(st_not.notificationHeader.eventType) = SA_NTF_OBJECT_STATE_CHANGE;
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationSend(st_not.notificationHandle);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -217,9 +217,9 @@ void ntf_clm_11()
safassert(rc, SA_AIS_OK);
fill_head(&st_not.notificationHeader);
*(st_not.notificationHeader.eventType) = SA_NTF_OBJECT_STATE_CHANGE;
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationFree(st_not.notificationHandle);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -228,7 +228,7 @@ void ntf_clm_filter_allocate_APIs(SaNtfNotificationTypeT
notificationtype)
{
safassert(saNtfInitialize(&ntf_Handle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
switch (notificationtype) {
case SA_NTF_TYPE_OBJECT_CREATE_DELETE:
rc = saNtfObjectCreateDeleteNotificationFilterAllocate(
@@ -253,7 +253,7 @@ void ntf_clm_filter_allocate_APIs(SaNtfNotificationTypeT
notificationtype)
default:
break;
}
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -275,9 +275,9 @@ void ntf_clm_17()
rc = saNtfStateChangeNotificationFilterAllocate(ntf_Handle, &sc_Filter,
0, 0, 0, 0, 0, 0);
safassert(rc, SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationFilterFree(sc_Filter.notificationFilterHandle);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -295,9 +295,9 @@ void ntf_clm_18()
all_NotificationFilterHandles.alarmFilterHandle = 0;
all_NotificationFilterHandles.securityAlarmFilterHandle = 0;
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationSubscribe(&all_NotificationFilterHandles, 1);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -318,9 +318,9 @@ void ntf_clm_19()
safassert(saNtfNotificationSubscribe(&all_NotificationFilterHandles, 1),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationUnsubscribe(1);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -339,10 +339,10 @@ void ntf_clm_20()
alarm_Filter.notificationFilterHandle;
all_NotificationFilterHandles.securityAlarmFilterHandle = 0;
search_criteria.searchMode = SA_NTF_SEARCH_ONLY_FILTER;
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationReadInitialize(
search_criteria, &all_NotificationFilterHandles, &readHandle);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -364,10 +364,10 @@ void ntf_clm_21()
saNtfNotificationReadInitialize(
search_criteria, &all_NotificationFilterHandles, &readHandle),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationReadNext(readHandle, SA_NTF_SEARCH_YOUNGER,
¬ification);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
@@ -389,9 +389,9 @@ void ntf_clm_22()
saNtfNotificationReadInitialize(
search_criteria, &all_NotificationFilterHandles, &readHandle),
SA_AIS_OK);
- safassert(lock_clm_node(), 0);
+ rc_assert(lock_clm_node(), 0);
rc = saNtfNotificationReadFinalize(readHandle);
- safassert(unlock_clm_node(), 0);
+ rc_assert(unlock_clm_node(), 0);
safassert(saNtfFinalize(ntf_Handle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_UNAVAILABLE);
}
diff --git a/src/ntf/apitest/tet_ntf_common.c
b/src/ntf/apitest/tet_ntf_common.cc
similarity index 99%
rename from src/ntf/apitest/tet_ntf_common.c
rename to src/ntf/apitest/tet_ntf_common.cc
index 2e1441d83..433eb369c 100644
--- a/src/ntf/apitest/tet_ntf_common.c
+++ b/src/ntf/apitest/tet_ntf_common.cc
@@ -34,10 +34,10 @@
#define TST_TAG_STB_REBOOT "\nTAG_STB_REBOOT\n" /* Tag for reboot the STANDBY
SC */
#define TST_TAG_SWITCHOVER "\nTAG_SWITCHOVER\n" /* Tag for switch over */
SaNtfIdentifierT last_not_id = SA_NTF_IDENTIFIER_UNUSED;
-extern int verbose;
-extern int gl_tag_mode;
-extern int gl_prompt_mode;
-extern bool gl_suspending;
+int verbose;
+int gl_tag_mode;
+int gl_prompt_mode;
+bool gl_suspending;
void assertvalue_impl(__const char *__assertion, __const char *__file,
unsigned int __line, __const char *__function)
@@ -46,6 +46,16 @@ void assertvalue_impl(__const char *__assertion, __const
char *__file,
__function, __assertion);
}
+void rc_assert_impl(const char *file, unsigned int line, int rc, int expected)
+{
+ if (rc != expected) {
+ fprintf(stderr,
+ "error: in %s at %u: %d, expected %d - exiting\n", file,
+ line, rc, expected);
+ exit(1);
+ }
+}
+
static void sigusr2_handler(int sig)
{
if (gl_suspending)
@@ -59,7 +69,7 @@ void install_sigusr2() {
/*
* Loop of reading key press, stop if 'n+Enter'. Sleep 1 between reading key
*/
-static void *nonblk_io_getchar()
+static void *nonblk_io_getchar(void *arg)
{
while (gl_suspending) {
int c = getchar();
@@ -68,7 +78,7 @@ static void *nonblk_io_getchar()
else
sleep(1);
}
- return NULL;
+ pthread_exit(nullptr);
}
/*
diff --git a/src/ntf/apitest/tet_ntf_common.h b/src/ntf/apitest/tet_ntf_common.h
index 6ed9f850b..7b5edba3b 100644
--- a/src/ntf/apitest/tet_ntf_common.h
+++ b/src/ntf/apitest/tet_ntf_common.h
@@ -363,17 +363,31 @@ void install_sigusr2();
extern void assertvalue_impl(__const char *__assertion, __const char *__file,
unsigned int __line, __const char *__function);
+void rc_assert_impl(const char *file, unsigned int line, int rc, int expected);
extern void saNtfNotificationSend_01(void);
extern void saNtfNotificationSend_02(void);
extern void saNtfNotificationSend_03(void);
extern void saNtfNotificationSend_04(void);
extern void saNtfNotificationSend_05(void);
-extern const SaVersionT lowestVersion;
#define assertvalue(expr)
\
(((expr)
\
? 0
\
: (assertvalue_impl(__STRING(expr), __FILE__, __LINE__, __FUNCTION__),
\
1)))
+#define rc_assert(actual, expected) \
+ rc_assert_impl(__FILE__, __LINE__, actual, expected)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void saAisNameLend(SaConstStringT value, SaNameT *name);
+extern SaConstStringT saAisNameBorrow(const SaNameT *name);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif // NTF_APITEST_TET_NTF_COMMON_H_
diff --git a/src/ntf/apitest/tet_ntf_main.c b/src/ntf/apitest/tet_ntf_main.cc
similarity index 100%
rename from src/ntf/apitest/tet_ntf_main.c
rename to src/ntf/apitest/tet_ntf_main.cc
diff --git a/src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfAlarmNotificationAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.c
b/src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.c
rename to src/ntf/apitest/tet_saNtfAlarmNotificationFilterAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfArrayValAllocate.c
b/src/ntf/apitest/tet_saNtfArrayValAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfArrayValAllocate.c
rename to src/ntf/apitest/tet_saNtfArrayValAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfArrayValGet.c
b/src/ntf/apitest/tet_saNtfArrayValGet.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfArrayValGet.c
rename to src/ntf/apitest/tet_saNtfArrayValGet.cc
diff --git a/src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfAttributeChangeNotificationAllocate.cc
diff --git
a/src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.c
b/src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.c
rename to src/ntf/apitest/tet_saNtfAttributeChangeNotificationFilterAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfDispatch.c
b/src/ntf/apitest/tet_saNtfDispatch.cc
similarity index 96%
rename from src/ntf/apitest/tet_saNtfDispatch.c
rename to src/ntf/apitest/tet_saNtfDispatch.cc
index 401b76201..32b7259fa 100644
--- a/src/ntf/apitest/tet_saNtfDispatch.c
+++ b/src/ntf/apitest/tet_saNtfDispatch.cc
@@ -37,7 +37,7 @@ void saNtfDispatch_03(void)
{
safassert(saNtfInitialize(&ntfHandle, &ntfCallbacks, &ntfVersion),
SA_AIS_OK);
- rc = saNtfDispatch(ntfHandle, 0);
+ rc = saNtfDispatch(ntfHandle, static_cast<SaDispatchFlagsT>(0));
safassert(saNtfFinalize(ntfHandle), SA_AIS_OK);
test_validate(rc, SA_AIS_ERR_INVALID_PARAM);
}
diff --git a/src/ntf/apitest/tet_saNtfFinalize.c
b/src/ntf/apitest/tet_saNtfFinalize.cc
similarity index 99%
rename from src/ntf/apitest/tet_saNtfFinalize.c
rename to src/ntf/apitest/tet_saNtfFinalize.cc
index 7fa7409af..866e50227 100644
--- a/src/ntf/apitest/tet_saNtfFinalize.c
+++ b/src/ntf/apitest/tet_saNtfFinalize.cc
@@ -94,7 +94,7 @@ void saNtfFinalize_04()
void *allocate(void *arg)
{
SaAisErrorT *ret = (SaAisErrorT *)arg;
- SaStringT myAdditionalText = "My additional text";
+ const char* myAdditionalText = "My additional text";
SaNameT object = {9, "smallerdn"};
*ret = saNtfStateChangeNotificationAllocate(
diff --git a/src/ntf/apitest/tet_saNtfInitialize.c
b/src/ntf/apitest/tet_saNtfInitialize.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfInitialize.c
rename to src/ntf/apitest/tet_saNtfInitialize.cc
diff --git a/src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfMiscellaneousNotificationAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfNotificationCallbackT.c
b/src/ntf/apitest/tet_saNtfNotificationCallbackT.cc
similarity index 99%
rename from src/ntf/apitest/tet_saNtfNotificationCallbackT.c
rename to src/ntf/apitest/tet_saNtfNotificationCallbackT.cc
index ce902810c..1d422f982 100644
--- a/src/ntf/apitest/tet_saNtfNotificationCallbackT.c
+++ b/src/ntf/apitest/tet_saNtfNotificationCallbackT.cc
@@ -103,7 +103,7 @@ static void *dispatchTread(void *arg)
/* TODO: stop this thread */
safassert(saNtfDispatch(ntfHandle, SA_DISPATCH_BLOCKING), SA_AIS_OK);
exit(0);
- return 0;
+ return nullptr;
}
static SaNtfAlarmNotificationT myAlarmNotification;
@@ -466,8 +466,10 @@ void saNtfNotificationCallbackT_03(void)
SA_AIS_OK);
myNotId[2] = *myAlarmNotification.notificationHeader.notificationId;
- safassert(pthread_create(&tid, NULL, dispatchTread, NULL), 0);
- safassert(pthread_detach(tid), 0);
+ int error = pthread_create(&tid, NULL, dispatchTread, NULL);
+ assert(error == 0);
+ error = pthread_detach(tid);
+ assert(error == 0);
/* TODO: fix sync */
for (; cb2_index < 3;) {
usleep(100000);
diff --git a/src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.c
b/src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.cc
similarity index 98%
rename from src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.c
rename to src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.cc
index d557103d5..67c7f797d 100644
--- a/src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.c
+++ b/src/ntf/apitest/tet_saNtfNotificationDiscardedCallbackT.cc
@@ -52,7 +52,7 @@ static void saNtfNotificationCallbackT(SaNtfSubscriptionIdT
subscriptionId,
/* "notificationId %llu", */
/* subscriptionId, notId); */
/* } */
- safassert(my_subid, subscriptionId);
+ assert(my_subid == subscriptionId);
cb_notId[cb_index++] = notId;
@@ -209,7 +209,7 @@ void saNtfNotificationDiscardedCallbackT_01(void)
if (numDiscarded == 0) {
rc = SA_AIS_OK;
- } else if (numDiscarded != (NUM_NOTIF - i)) {
+ } else if (numDiscarded != static_cast<SaUint32T>(NUM_NOTIF - i)) {
if (verbose) {
printf("failed num of discarded: %d\n", numDiscarded);
}
diff --git a/src/ntf/apitest/tet_saNtfNotificationReadFinalize.c
b/src/ntf/apitest/tet_saNtfNotificationReadFinalize.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfNotificationReadFinalize.c
rename to src/ntf/apitest/tet_saNtfNotificationReadFinalize.cc
diff --git a/src/ntf/apitest/tet_saNtfNotificationReadInitialize.c
b/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
similarity index 97%
rename from src/ntf/apitest/tet_saNtfNotificationReadInitialize.c
rename to src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
index 4fcc8b746..79f84eec9 100644
--- a/src/ntf/apitest/tet_saNtfNotificationReadInitialize.c
+++ b/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
@@ -123,13 +123,15 @@ void saNtfNotificationReadInitialize_01_7(void)
void saNtfNotificationReadInitialize_01_8(void)
{
- saNtfNotificationReadInitialize_01(SA_NTF_SEARCH_ONLY_FILTER + 10,
- SA_AIS_ERR_INVALID_PARAM);
+ saNtfNotificationReadInitialize_01(
+ static_cast<SaNtfSearchModeT>(SA_NTF_SEARCH_ONLY_FILTER + 10),
+ SA_AIS_ERR_INVALID_PARAM);
}
void saNtfNotificationReadInitialize_01_9(void)
{
- saNtfNotificationReadInitialize_01(-1, SA_AIS_ERR_INVALID_PARAM);
+ saNtfNotificationReadInitialize_01(static_cast<SaNtfSearchModeT>(-1),
+ SA_AIS_ERR_INVALID_PARAM);
}
/**
diff --git a/src/ntf/apitest/tet_saNtfNotificationReadNext.c
b/src/ntf/apitest/tet_saNtfNotificationReadNext.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfNotificationReadNext.c
rename to src/ntf/apitest/tet_saNtfNotificationReadNext.cc
index b649e5878..6f699ab00 100644
--- a/src/ntf/apitest/tet_saNtfNotificationReadNext.c
+++ b/src/ntf/apitest/tet_saNtfNotificationReadNext.cc
@@ -229,6 +229,7 @@ void saNtfNotificationReadNext_02(void)
searchCriteria.searchMode = SA_NTF_SEARCH_AFTER_TIME;
SaAisErrorT errorCode;
SaUint32T readCounter = 0;
+ SaNtfIdentifierT last_id = 0;
fillInDefaultValues(&myNotificationAllocationParams,
&myNotificationFilterAllocationParams,
@@ -328,7 +329,6 @@ void saNtfNotificationReadNext_02(void)
}
readCounter = 0;
- SaNtfIdentifierT last_id = 0;
for (i = 0; (errorCode = saNtfNotificationReadNext(
readHandle, SA_NTF_SEARCH_OLDER,
&returnedNotification)) == SA_AIS_OK;) {
diff --git a/src/ntf/apitest/tet_saNtfNotificationSend.c
b/src/ntf/apitest/tet_saNtfNotificationSend.cc
similarity index 99%
rename from src/ntf/apitest/tet_saNtfNotificationSend.c
rename to src/ntf/apitest/tet_saNtfNotificationSend.cc
index cc830642f..ea758c299 100644
--- a/src/ntf/apitest/tet_saNtfNotificationSend.c
+++ b/src/ntf/apitest/tet_saNtfNotificationSend.cc
@@ -324,7 +324,7 @@ void attr_ch_send(int wrongAttrType, SaAisErrorT
expectedStatus)
myNotificationParams.changedAttributes[0].attributeType;
if (wrongAttrType)
myNotification.changedAttributes[0].attributeType =
- SA_NTF_VALUE_ARRAY + 1;
+ static_cast<SaNtfValueTypeT>(SA_NTF_VALUE_ARRAY + 1);
myNotification.changedAttributes[0].newAttributeValue.int64Val =
myNotificationParams.changedAttributes[0]
@@ -473,7 +473,8 @@ void saNtfNotificationSend_09(void)
fillInDefaultValues(&myNotificationAllocationParams,
&myNotificationFilterAllocationParams,
&myNotificationParams);
- myNotificationParams.changedStates[0].oldStatePresent = 0xff00;
+ myNotificationParams.changedStates[0].oldStatePresent =
+ static_cast<SaBoolT>(0xff00);
myNotificationParams.changedStates[0].oldState = 0xff;
rc = send_st_ch(&myNotificationAllocationParams,
@@ -566,7 +567,7 @@ void sec_al_send(int wrongValueType, SaAisErrorT
expectedStatus)
myNotificationParams.securityAlarmDetector.value.int32Val;
if (wrongValueType)
myNotification.securityAlarmDetector->valueType =
- SA_NTF_VALUE_ARRAY + 1;
+ static_cast<SaNtfValueTypeT>(SA_NTF_VALUE_ARRAY + 1);
/* set additional text and additional info */
(void)strncpy(myNotification.notificationHeader.additionalText,
myNotificationParams.additionalText,
diff --git a/src/ntf/apitest/tet_saNtfNotificationSubscribe.c
b/src/ntf/apitest/tet_saNtfNotificationSubscribe.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfNotificationSubscribe.c
rename to src/ntf/apitest/tet_saNtfNotificationSubscribe.cc
diff --git a/src/ntf/apitest/tet_saNtfNotificationUnsubscribe.c
b/src/ntf/apitest/tet_saNtfNotificationUnsubscribe.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfNotificationUnsubscribe.c
rename to src/ntf/apitest/tet_saNtfNotificationUnsubscribe.cc
diff --git a/src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationAllocate.cc
diff --git
a/src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.c
b/src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.cc
similarity index 100%
rename from
src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.c
rename to
src/ntf/apitest/tet_saNtfObjectCreateDeleteNotificationFilterAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfPtrValAllocate.c
b/src/ntf/apitest/tet_saNtfPtrValAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfPtrValAllocate.c
rename to src/ntf/apitest/tet_saNtfPtrValAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfPtrValGet.c
b/src/ntf/apitest/tet_saNtfPtrValGet.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfPtrValGet.c
rename to src/ntf/apitest/tet_saNtfPtrValGet.cc
diff --git a/src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfSecurityAlarmNotificationAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.c
b/src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.c
rename to src/ntf/apitest/tet_saNtfSecurityAlarmNotificationFilterAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfSelectionObjectGet.c
b/src/ntf/apitest/tet_saNtfSelectionObjectGet.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfSelectionObjectGet.c
rename to src/ntf/apitest/tet_saNtfSelectionObjectGet.cc
diff --git a/src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.c
b/src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.c
rename to src/ntf/apitest/tet_saNtfStateChangeNotificationAllocate.cc
diff --git a/src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.c
b/src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.cc
similarity index 100%
rename from src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.c
rename to src/ntf/apitest/tet_saNtfStateChangeNotificationFilterAllocate.cc
diff --git a/src/ntf/apitest/tet_scOutage_reinitializeHandle.c
b/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
similarity index 99%
rename from src/ntf/apitest/tet_scOutage_reinitializeHandle.c
rename to src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
index 378d9215c..9a5fbbeb9 100644
--- a/src/ntf/apitest/tet_scOutage_reinitializeHandle.c
+++ b/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
@@ -83,8 +83,6 @@ static struct not_idsT sent_ok_ids = {
0,
};
-static SaNtfNotificationTypeFilterHandlesT myNotificationFilterHandles;
-
/* Used to keep track of which ntf we got */
static SaNtfNotificationTypeFilterHandlesT ntfRecieved;
@@ -919,7 +917,7 @@ void subscriber_life_cycle(int test_api)
fds[0].events = POLLIN;
ret = poll(fds, 1, 10000);
if (ret <= 0) {
- saferror(true, false);
+ rc_assert(true, false);
}
if (test_api == SANTF_DISPATCH)
wait_controllers(2);
--
2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
