Hi Hung, Reviewed the code. Ack from me.
Thanks, Zoran -----Original Message----- From: Hung Nguyen [mailto:[email protected]] Sent: den 14 december 2016 09:45 To: Zoran Milinkovic <[email protected]>; [email protected] Cc: [email protected] Subject: [PATCH 1 of 1] imm: Remove use of SaBoolT from IMM tools and tests [#2225] osaf/tools/safimm/immcfg/imm_cfg.c | 12 ++-- osaf/tools/safimm/src/immutil.c | 4 +- samples/immsv/immutils/immutil.c | 4 +- tests/immsv/implementer/test_SaImmOiAdminOperation.c | 30 ++++++------ tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c | 4 +- 5 files changed, 27 insertions(+), 27 deletions(-) imm: Remove use of SaBoolT from IMM tools and tests. diff --git a/osaf/tools/safimm/immcfg/imm_cfg.c b/osaf/tools/safimm/immcfg/imm_cfg.c --- a/osaf/tools/safimm/immcfg/imm_cfg.c +++ b/osaf/tools/safimm/immcfg/imm_cfg.c @@ -473,7 +473,7 @@ int object_create(const SaNameT **object SaImmClassCategoryT classCategory; SaImmAttrDefinitionT_2 **attrDefinitions = NULL; SaImmAttrFlagsT flags=0; - SaBoolT attrAdded = SA_FALSE; + bool attrAdded = false; if((error = saImmOmClassDescriptionGet_2(immHandle, className, &classCategory, &attrDefinitions)) != SA_AIS_OK) { fprintf(stderr, "error - saImmOmClassDescriptionGet_2. FAILED: %s\n", saf_error(error)); @@ -495,7 +495,7 @@ int object_create(const SaNameT **object (attrValues[j]->attrValuesNumber+1) * sizeof(SaImmAttrValueT *)); attrValues[j]->attrValues[attrValues[j]->attrValuesNumber] = attrValue->attrValues[0]; attrValues[j]->attrValuesNumber++; - attrAdded = SA_TRUE; + attrAdded = true; free(attrValue->attrName); free(attrValue->attrValues); @@ -512,7 +512,7 @@ int object_create(const SaNameT **object attrValues[attr_len] = NULL; attr_len++; } - attrAdded = SA_FALSE; + attrAdded = false; } attrValues = realloc(attrValues, (attr_len + 1) * sizeof(SaImmAttrValuesT_2 *)); @@ -646,7 +646,7 @@ int object_modify(const SaNameT **object SaImmAttrModificationT_2 **attrMods = NULL; const SaStringT* errStrings=NULL; SaImmAttrFlagsT flags=0; - SaBoolT attrAdded = SA_FALSE; + bool attrAdded = false; for (i = 0; i < optargs_len; i++) { @@ -674,7 +674,7 @@ int object_modify(const SaNameT **object attrMod->modAttr.attrValues[0]; attrMods[j]->modAttr.attrValuesNumber++; - attrAdded = SA_TRUE; + attrAdded = true; free(attrMod->modAttr.attrName); free(attrMod->modAttr.attrValues); @@ -698,7 +698,7 @@ int object_modify(const SaNameT **object attrMods[attr_len] = NULL; attr_len++; } - attrAdded = SA_FALSE; + attrAdded = false; } if ((error = immutil_saImmOmAdminOwnerSet(ownerHandle, (const SaNameT **)objectNames, SA_IMM_ONE)) != SA_AIS_OK) { 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 @@ -799,14 +799,14 @@ void *immutil_new_attrValue(SaImmValueTy } case SA_IMM_ATTR_SAANYT:{ char *endMark; - SaBoolT even = SA_TRUE; + bool even = true; char byte[5]; unsigned int i; len = strlen(str); if (len % 2) { len = len / 2 + 1; - even = SA_FALSE; + even = false; } else { len = len / 2; } diff --git a/samples/immsv/immutils/immutil.c b/samples/immsv/immutils/immutil.c --- a/samples/immsv/immutils/immutil.c +++ b/samples/immsv/immutils/immutil.c @@ -799,14 +799,14 @@ void *immutil_new_attrValue(SaImmValueTy } case SA_IMM_ATTR_SAANYT:{ char *endMark; - SaBoolT even = SA_TRUE; + bool even = true; char byte[5]; unsigned int i; len = strlen(str); if (len % 2) { len = len / 2 + 1; - even = SA_FALSE; + even = false; } else { len = len / 2; } diff --git a/tests/immsv/implementer/test_SaImmOiAdminOperation.c b/tests/immsv/implementer/test_SaImmOiAdminOperation.c --- a/tests/immsv/implementer/test_SaImmOiAdminOperation.c +++ b/tests/immsv/implementer/test_SaImmOiAdminOperation.c @@ -26,12 +26,12 @@ static SaNameT rdn = static SaAisErrorT saImmOiAdminOperationCallback_response = SA_AIS_OK; static SaImmAdminOperationIdT operationId = 0xdead; static SaUint64T value = 0xbad; -static SaBoolT objectImplementerIsSet; +static bool objectImplementerIsSet; static SaAisErrorT immReturnValue; static SaAisErrorT operationReturnValue; static SaInvocationT userInvocation = 0xdead; -static SaBoolT useImplementerNameAsTarget = SA_FALSE; +static bool useImplementerNameAsTarget = false; static SaImmOiImplementerNameT implementerName = NULL;; /* SaImmAdminOperationError */ @@ -193,7 +193,7 @@ static void *objectImplementerThreadMain TRACE("Setting implementer %s for object %s", implementerName, objectName->value); safassert(saImmOiObjectImplementerSet(handle, objectName, SA_IMM_ONE), SA_AIS_OK); safassert(saImmOiSelectionObjectGet(handle, &selObj), SA_AIS_OK); - objectImplementerIsSet = SA_TRUE; + objectImplementerIsSet = true; fds[0].fd = (int) selObj; fds[0].events = POLLIN; @@ -299,7 +299,7 @@ void SaImmOiAdminOperation_01(void) /* Set admin operation callback to use saImmOiAdminOperationResult */ callbacks = &oiCallbacks; - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); @@ -320,7 +320,7 @@ void SaImmOiAdminOperation_01(void) safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); safassert(saImmOmCcbFinalize(ccbHandle), SA_AIS_OK); safassert(saImmOmFinalize(immOmHandle), SA_AIS_OK); - useImplementerNameAsTarget = SA_FALSE; + useImplementerNameAsTarget = false; if(imm_rc != SA_AIS_OK) {rc = imm_rc;} test_validate(rc, SA_AIS_OK); @@ -407,7 +407,7 @@ void SaImmOiAdminOperation_03(void) if (imm_rc != SA_AIS_ERR_INVALID_PARAM) goto done; - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); @@ -466,7 +466,7 @@ void SaImmOiAdminOperation_04(void) safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); safassert(saImmOmAdminOwnerRelease(ownerHandle, nameValues, SA_IMM_ONE), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); @@ -515,7 +515,7 @@ void SaImmOiAdminOperation_05(void) safassert(saImmOmCcbObjectCreate_2(ccbHandle, "TestClassConfig", NULL, attrValues), SA_AIS_OK); safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); @@ -611,7 +611,7 @@ void SaImmOiAdminOperation_07(void) safassert(saImmOmCcbObjectCreate_2(ccbHandle, "TestClassConfig", NULL, attrValues), SA_AIS_OK); safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -689,7 +689,7 @@ void SaImmOiAdminOperation_08(void) safassert(saImmOmCcbObjectCreate_2(ccbHandle, "TestClassConfig", NULL, attrValues), SA_AIS_OK); safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -756,7 +756,7 @@ void SaImmOiAdminOperation_09(void) safassert(saImmOmCcbObjectCreate_2(ccbHandle, "TestClassConfig", NULL, attrValues), SA_AIS_OK); safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -841,7 +841,7 @@ void SaImmOiAdminOperation_10(void) safassert(saImmOmCcbObjectCreate_2(ccbHandle, "TestClassConfig", NULL, attrValues), SA_AIS_OK); safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK); - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -925,7 +925,7 @@ void SaImmOiAdminOperation_11(void) callbacks = &oiCallbacks_o2_copyParams; - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -1010,7 +1010,7 @@ void SaImmOiAdminOperation_12(void) callbacks = &oiCallbacks_o2_copyParams; - objectImplementerIsSet = SA_FALSE; + objectImplementerIsSet = false; ret = pthread_create(&thread, NULL, objectImplementerThreadMain, &rdn); assert(ret == 0); while (!objectImplementerIsSet) @@ -1051,7 +1051,7 @@ done: void SaImmOiAdminOperation_13(void) { - useImplementerNameAsTarget = SA_TRUE; + useImplementerNameAsTarget = true; SaImmOiAdminOperation_01(); } diff --git a/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c b/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c --- a/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c +++ b/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c @@ -48,7 +48,7 @@ static SaImmAttrValuesT_2** attributes; static SaImmHandleT localImmHandle; static SaImmAdminOwnerHandleT localOwnerHandle; static SaImmCcbHandleT localCcbHandle; -static SaBoolT classCreated=SA_FALSE; +static bool classCreated = false; static void setup(SaImmAdminOwnerNameT admoName) { @@ -82,7 +82,7 @@ static void setup(SaImmAdminOwnerNameT a err = saImmOmClassCreate_2(localImmHandle, className, SA_IMM_CLASS_CONFIG, attrDefs); if(err == SA_AIS_OK) { - classCreated = SA_TRUE; + classCreated = true; } else if(err == SA_AIS_ERR_EXIST) { err = SA_AIS_OK; ------------------------------------------------------------------------------ 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
