osaf/libs/common/immsv/include/immutil.h | 8 ++++----
osaf/tools/safimm/src/immutil.c | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/osaf/libs/common/immsv/include/immutil.h
b/osaf/libs/common/immsv/include/immutil.h
--- a/osaf/libs/common/immsv/include/immutil.h
+++ b/osaf/libs/common/immsv/include/immutil.h
@@ -270,7 +270,7 @@ CcbUtilOperationData_t *ccbutil_getCcbOp
*
* @return SaAisErrorT
*/
-extern SaAisErrorT immutil_getAttrValuesNumber(const SaImmAttrNameT attrName,
+extern SaAisErrorT immutil_getAttrValuesNumber(const char *attrName,
const SaImmAttrValuesT_2 **attr, SaUint32T *attrValuesNumber);
/**
@@ -299,7 +299,7 @@ extern SaAisErrorT immutil_getAttrValues
*
* @return SaAisErrorT SA_AIS_OK when conversion was successful
*/
- extern SaAisErrorT immutil_getAttr(const SaImmAttrNameT attrName,
+extern SaAisErrorT immutil_getAttr(const char *attrName,
const SaImmAttrValuesT_2 **attr, SaUint32T index, void *param);
/**
@@ -411,10 +411,10 @@ extern SaAisErrorT immutil_getAttrValues
SaSelectionObjectT
*selectionObject);
extern SaAisErrorT immutil_saImmOiClassImplementerSet(SaImmOiHandleT
immOiHandle,
- const
SaImmClassNameT className);
+ const char
*className);
extern SaAisErrorT
immutil_saImmOiClassImplementerRelease(SaImmOiHandleT immOiHandle,
- const
SaImmClassNameT className);
+ const char
*className);
extern SaAisErrorT immutil_saImmOiImplementerSet(SaImmOiHandleT
immOiHandle,
const
SaImmOiImplementerNameT implementerName);
diff --git a/osaf/tools/safimm/src/immutil.c b/osaf/tools/safimm/src/immutil.c
--- a/osaf/tools/safimm/src/immutil.c
+++ b/osaf/tools/safimm/src/immutil.c
@@ -377,7 +377,7 @@ char const *immutil_getStringAttr(const
}
SaAisErrorT immutil_getAttrValuesNumber(
- const SaImmAttrNameT attrName, const SaImmAttrValuesT_2 **attr,
SaUint32T *attrValuesNumber)
+ const char *attrName, const SaImmAttrValuesT_2 **attr, SaUint32T
*attrValuesNumber)
{
SaAisErrorT error = SA_AIS_ERR_NAME_NOT_FOUND;
int i;
@@ -397,7 +397,7 @@ SaAisErrorT immutil_getAttrValuesNumber(
}
/* note: SA_IMM_ATTR_SASTRINGT is intentionally not supported */
-SaAisErrorT immutil_getAttr(const SaImmAttrNameT attrName,
+SaAisErrorT immutil_getAttr(const char *attrName,
const SaImmAttrValuesT_2 **attr, SaUint32T index, void *param)
{
SaAisErrorT error = SA_AIS_ERR_NAME_NOT_FOUND;
@@ -993,13 +993,15 @@ SaAisErrorT immutil_saImmOiSelectionObje
return rc;
}
-SaAisErrorT immutil_saImmOiClassImplementerSet(SaImmOiHandleT immOiHandle,
const SaImmClassNameT className)
+SaAisErrorT immutil_saImmOiClassImplementerSet(SaImmOiHandleT immOiHandle,
const char *className)
{
- SaAisErrorT rc = saImmOiClassImplementerSet(immOiHandle, className);
+ SaAisErrorT rc = saImmOiClassImplementerSet(immOiHandle,
+ (const SaImmClassNameT) className);
unsigned int nTries = 1;
while (rc == SA_AIS_ERR_TRY_AGAIN && nTries <
immutilWrapperProfile.nTries) {
usleep(immutilWrapperProfile.retryInterval * 1000);
- rc = saImmOiClassImplementerSet(immOiHandle, className);
+ rc = saImmOiClassImplementerSet(immOiHandle,
+ (const SaImmClassNameT) className);
nTries++;
}
if (rc != SA_AIS_OK && immutilWrapperProfile.errorsAreFatal)
@@ -1007,13 +1009,15 @@ SaAisErrorT immutil_saImmOiClassImplemen
return rc;
}
-SaAisErrorT immutil_saImmOiClassImplementerRelease(SaImmOiHandleT immOiHandle,
const SaImmClassNameT className)
+SaAisErrorT immutil_saImmOiClassImplementerRelease(SaImmOiHandleT immOiHandle,
const char *className)
{
- SaAisErrorT rc = saImmOiClassImplementerRelease(immOiHandle, className);
+ SaAisErrorT rc = saImmOiClassImplementerRelease(immOiHandle,
+ (const SaImmClassNameT) className);
unsigned int nTries = 1;
while (rc == SA_AIS_ERR_TRY_AGAIN && nTries <
immutilWrapperProfile.nTries) {
usleep(immutilWrapperProfile.retryInterval * 1000);
- rc = saImmOiClassImplementerRelease(immOiHandle, className);
+ rc = saImmOiClassImplementerRelease(immOiHandle,
+ (const SaImmClassNameT) className);
nTries++;
}
if (rc != SA_AIS_OK && immutilWrapperProfile.errorsAreFatal)
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
