osaf/services/saf/immsv/immloadd/imm_loader.cc | 6 +++---
osaf/services/saf/immsv/immnd/ImmModel.cc | 16 ++++++++--------
osaf/tools/safimm/immcfg/imm_import.cc | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
Fix cppcheck stlSize warnings.
For standard containers, empty() is faster than size().
Use empty() instead of size() when checking for emptiness.
diff --git a/osaf/services/saf/immsv/immloadd/imm_loader.cc
b/osaf/services/saf/immsv/immloadd/imm_loader.cc
--- a/osaf/services/saf/immsv/immloadd/imm_loader.cc
+++ b/osaf/services/saf/immsv/immloadd/imm_loader.cc
@@ -1047,7 +1047,7 @@ static void endElementHandler(void* user
/* </value> */
if (strcmp((const char*)name, "value") == 0)
{
- if (state->attrValueBuffers.size() == 0)
+ if (state->attrValueBuffers.empty())
{
char* str = (char*)malloc(1);
@@ -1945,7 +1945,7 @@ void addObjectAttributeDefinition(SaImmC
assert(attrName);
/* The value array can not be empty */
- assert(attrValueBuffers->size() != 0);
+ assert(!attrValueBuffers->empty());
/* The object class must be set */
assert(objectClass);
@@ -2000,7 +2000,7 @@ void addObjectAttributeDefinition(SaImmC
}
attrValueBuffers->clear();
- assert(attrValueBuffers->size() == 0);
+ assert(attrValueBuffers->empty());
TRACE_LEAVE();
}
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
@@ -2791,7 +2791,7 @@ ImmModel::abortSync()
LOG_NO("Abort sync: Discarding synced objects");
// Remove all NO_DANGLING references
sReverseRefsNoDanglingMMap.clear();
- while(sObjectMap.size()) {
+ while(!sObjectMap.empty()) {
ObjectMap::iterator oi = sObjectMap.begin();
TRACE("sObjectmap.size:%u delete: %s",
(unsigned int) sObjectMap.size(), oi->first.c_str());
@@ -2799,7 +2799,7 @@ ImmModel::abortSync()
}
LOG_NO("Abort sync: Discarding synced classes");
- while(sClassMap.size()) {
+ while(!sClassMap.empty()) {
ClassMap::iterator ci = sClassMap.begin();
TRACE("Removing Class:%s", ci->first.c_str());
osafassert(ci->second->mExtent.empty());
@@ -3603,7 +3603,7 @@ ImmModel::classCreate(const ImmsvOmClass
err = SA_AIS_ERR_INVALID_PARAM;
}
- while(classInfo->mAttrMap.size()) {
+ while(!classInfo->mAttrMap.empty()) {
AttrMap::iterator ai = classInfo->mAttrMap.begin();
AttrInfo* ainfo = ai->second;
osafassert(ainfo);
@@ -3667,7 +3667,7 @@ ImmModel::classCreate(const ImmsvOmClass
}
/* Remove old attr defs. */
- while(prevClassInfo->mAttrMap.size()) {
+ while(!prevClassInfo->mAttrMap.empty()) {
ai = prevClassInfo->mAttrMap.begin();
TRACE_5("Removing old attribute %s:%s", className.c_str(),
ai->first.c_str());
ainfo = ai->second;
@@ -6415,7 +6415,7 @@ ImmModel::ccbTerminate(SaUint32T ccbId)
ccb->mMutations.clear();
ccb->removeAllObjReadLocks();
- if(ccb->mImplementers.size()) {
+ if(!ccb->mImplementers.empty()) {
LOG_WA("Ccb destroyed without notifying some implementers from
IMMND.");
CcbImplementerMap::iterator ix;
for(ix=ccb->mImplementers.begin();
@@ -8221,7 +8221,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im
if((err == SA_AIS_OK) && pbeNodeIdPtr) {
void* pbe = getPbeOi(pbeConnPtr, pbeNodeIdPtr);
if(!pbe) {
- if(ccb->mMutations.size()) {
+ if(!ccb->mMutations.empty()) {
/* ongoing ccb interrupted by PBE down */
err = SA_AIS_ERR_FAILED_OPERATION;
ccb->mVeto = err;
@@ -9232,7 +9232,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC
if((err == SA_AIS_OK) && pbeNodeIdPtr) {
void* pbe = getPbeOi(pbeConnPtr, pbeNodeIdPtr);
if(!pbe) {
- if(ccb->mMutations.size()) {
+ if(!ccb->mMutations.empty()) {
/* ongoing ccb interrupted by PBE down */
err = SA_AIS_ERR_FAILED_OPERATION;
ccb->mVeto = err;
@@ -9741,7 +9741,7 @@ ImmModel::ccbObjectDelete(const ImmsvOmC
if((err == SA_AIS_OK) && pbeNodeIdPtr) {
void* pbe = getPbeOi(pbeConnPtr, pbeNodeIdPtr);
if(!pbe) {
- if(ccb->mMutations.size()) {
+ if(!ccb->mMutations.empty()) {
/* ongoing ccb interrupted by PBE down */
err = SA_AIS_ERR_FAILED_OPERATION;
ccb->mVeto = err;
diff --git a/osaf/tools/safimm/immcfg/imm_import.cc
b/osaf/tools/safimm/immcfg/imm_import.cc
--- a/osaf/tools/safimm/immcfg/imm_import.cc
+++ b/osaf/tools/safimm/immcfg/imm_import.cc
@@ -1580,7 +1580,7 @@ static void endElementHandler(void* user
/* </value> */
if (strcmp((const char*)name, "value") == 0) {
- if (state->attrValueBuffers.size() == 0) {
+ if (state->attrValueBuffers.empty()) {
char* str = (char*)malloc(1);
str[0] = '\0';
@@ -2157,7 +2157,7 @@ static void addObjectAttributeDefinition
}
/* The value array can not be empty */
- if(!state->attrValueBuffers.size()) {
+ if(state->attrValueBuffers.empty()) {
LOG_ER("The value array can not be empty");
stopParser(state);
state->parsingStatus = 1;
@@ -2269,7 +2269,7 @@ static void addObjectAttributeDefinition
free(state->attrName);
state->attrName = NULL;
state->attrValueBuffers.clear();
- assert(state->attrValueBuffers.size() == 0);
+ assert(state->attrValueBuffers.empty());
}
/**
------------------------------------------------------------------------------
Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San
Francisco, CA to explore cutting-edge tech and listen to tech luminaries
present their vision of the future. This family event has something for
everyone, including kids. Get more information and register today.
http://sdm.link/attshape
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
