osaf/services/saf/immsv/immloadd/imm_pbe_load.cc | 4 ++--
osaf/services/saf/immsv/immnd/immnd_proc.c | 2 +-
osaf/services/saf/immsv/immpbed/immpbe_daemon.cc | 2 +-
osaf/tools/safimm/immcfg/imm_cfg.c | 12 ++++++------
osaf/tools/safimm/immcfg/imm_import.cc | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
Fix cppcheck invalidPrintfArgType_uint warnings.
diff --git a/osaf/services/saf/immsv/immloadd/imm_pbe_load.cc
b/osaf/services/saf/immsv/immloadd/imm_pbe_load.cc
--- a/osaf/services/saf/immsv/immloadd/imm_pbe_load.cc
+++ b/osaf/services/saf/immsv/immloadd/imm_pbe_load.cc
@@ -396,7 +396,7 @@ bool loadClassesFromPbe(void* pbeHandle,
ClassInfo* class_info =NULL;
char buf[32];
- snprintf(buf, 32, "Row(%u): <", r);
+ snprintf(buf, 32, "Row(%d): <", r);
std::string rowStr(buf);
for(c=0;c<ncols;++c) {
rowStr.append("'");
@@ -715,7 +715,7 @@ bool loadObjectsFromPbe(void* pbeHandle,
ClassInfo* class_info=NULL;
char buf[32];
- snprintf(buf, 32, "Row(%u): <", r);
+ snprintf(buf, 32, "Row(%d): <", r);
std::string rowStr(buf);
for(c=0;c<ncols;++c) {
rowStr.append("'");
diff --git a/osaf/services/saf/immsv/immnd/immnd_proc.c
b/osaf/services/saf/immsv/immnd/immnd_proc.c
--- a/osaf/services/saf/immsv/immnd/immnd_proc.c
+++ b/osaf/services/saf/immsv/immnd/immnd_proc.c
@@ -1505,7 +1505,7 @@ static int immnd_forkSync(IMMND_CB *cb)
if(!immModel_protocol41Allowed(cb)) {
maxSyncBatchSize = 1; /* Revert to old 4.0 behavior */
}
- snprintf(arg4, 16, "%u", maxSyncBatchSize);
+ snprintf(arg4, 16, "%d", maxSyncBatchSize);
} else {
arg4[0] = 0; /* Will result in default batch size, see
immsv_api.h */
}
diff --git a/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
b/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
--- a/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
+++ b/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
@@ -1445,7 +1445,7 @@ static SaAisErrorT saImmOiCcbCompletedCa
sLastCcbCommit = ccbId;
} else {
snprintf(buf, sBufsize,
- "PBE COMMIT of sqlite transaction %llu epoch%u FAILED
rc:%u", ccbId, sEpoch, rc);
+ "PBE COMMIT of sqlite transaction %llu epoch%u FAILED
rc:%d", ccbId, sEpoch, rc);
TRACE("%s", buf);
saImmOiCcbSetErrorString(immOiHandle, ccbId, buf);
}
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
@@ -588,7 +588,7 @@ int object_create(const SaNameT **object
"(see: immcfg -h under
'--unsafe')\n");
}
if(rc2 != SA_AIS_OK) {
- fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %u\n", rc2);
+ fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %d\n", rc2);
}
}
@@ -736,7 +736,7 @@ int object_modify(const SaNameT **object
"(see: immcfg -h under
'--unsafe')\n");
}
if(rc2 != SA_AIS_OK) {
- fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %u\n", rc2);
+ fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %d\n", rc2);
}
}
goto done;
@@ -808,7 +808,7 @@ int object_delete(const SaNameT **object
"(see: immcfg -h under
'--unsafe')\n");
}
if(rc2 != SA_AIS_OK) {
- fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %u\n", rc2);
+ fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %d\n", rc2);
}
}
@@ -1036,7 +1036,7 @@ static int ccb_apply() {
++ix;
}
} else if(rc2 != SA_AIS_OK) {
- fprintf(stderr, "saImmOmCcbGetErrorStrings
failed: %u\n", rc2);
+ fprintf(stderr, "saImmOmCcbGetErrorStrings
failed: %d\n", rc2);
}
rc = EXIT_FAILURE;
@@ -1089,7 +1089,7 @@ static int ccb_validate() {
++ix;
}
} else if(rc2 != SA_AIS_OK) {
- fprintf(stderr, "saImmOmCcbGetErrorStrings
failed: %u\n", rc2);
+ fprintf(stderr, "saImmOmCcbGetErrorStrings
failed: %d\n", rc2);
}
}
}
@@ -1665,7 +1665,7 @@ static int imm_operation(int argc, char
++ix;
}
} else if(rc2 != SA_AIS_OK) {
- fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %u\n", rc2);
+ fprintf(stderr,
"saImmOmCcbGetErrorStrings failed: %d\n", rc2);
}
rc = EXIT_FAILURE;
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
@@ -763,7 +763,7 @@ static void createImmObject(ParserState*
errorCode =
immutil_saImmOmAccessorInitialize(state->immHandle, &accessorHandle);
if (SA_AIS_OK != errorCode) {
- fprintf(stderr, "FAILED:
saImmOmAccessorInitialize failed: %u\n", errorCode);
+ fprintf(stderr, "FAILED:
saImmOmAccessorInitialize failed: %d\n", errorCode);
stopParser(state);
state->parsingStatus = 1;
goto done;
@@ -773,7 +773,7 @@ static void createImmObject(ParserState*
NULL, // get all attributes
&existing_attributes);
if (SA_AIS_OK != errorCode) {
- fprintf(stderr, "FAILED: saImmOmAccessorGet_2
failed: %u\n", errorCode);
+ fprintf(stderr, "FAILED: saImmOmAccessorGet_2
failed: %d\n", errorCode);
stopParser(state);
state->parsingStatus = 1;
goto done;
@@ -806,7 +806,7 @@ static void createImmObject(ParserState*
errorCode =
immutil_saImmOmAccessorFinalize(accessorHandle);
if (SA_AIS_OK != errorCode) {
- fprintf(stderr, "FAILED:
saImmOmAccessorFinalize failed: %u\n", errorCode);
+ fprintf(stderr, "FAILED:
saImmOmAccessorFinalize failed: %d\n", errorCode);
stopParser(state);
state->parsingStatus = 1;
}
@@ -942,7 +942,7 @@ static bool attrvalue_is_equal(SaImmValu
break;
}
default:
- fprintf(stderr, "FAILED: unknown valuetype %u\n", valueType);
+ fprintf(stderr, "FAILED: unknown valuetype %d\n", valueType);
return false; // keep compiler happy
break; // keep compiler happy
}
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
