Merge pull request #1846 from thetic/signed-hex

basvodde · web-flow · commit 694d00d38e60 · 2025-03-20T08:37:43.000+01:00
Fix new ClangCL warnings
diff --git a/src/CppUTest/SimpleString.cpp b/src/CppUTest/SimpleString.cpp
@@ -710,12 +710,12 @@ SimpleString StringFrom(void (*value)())
 
 SimpleString HexStringFrom(long value)
 {
-    return StringFromFormat("%lx", value);
+    return HexStringFrom((unsigned long)value);
 }
 
 SimpleString HexStringFrom(int value)
 {
-    return StringFromFormat("%x", value);
+    return HexStringFrom((unsigned int)value);
 }
 
 SimpleString HexStringFrom(signed char value)
@@ -795,7 +795,7 @@ SimpleString StringFrom(cpputest_ulonglong value)
 
 SimpleString HexStringFrom(cpputest_longlong value)
 {
-    return StringFromFormat("%llx", value);
+    return HexStringFrom((cpputest_ulonglong)value);
 }
 
 SimpleString HexStringFrom(cpputest_ulonglong value)
diff --git a/src/CppUTestExt/MockExpectedCall.cpp b/src/CppUTestExt/MockExpectedCall.cpp
@@ -423,7 +423,7 @@ SimpleString MockCheckedExpectedCall::callToString()
             str += ", other parameters are ignored";
     }
 
-    str += StringFromFormat(" (expected %d call%s, called %d time%s)",
+    str += StringFromFormat(" (expected %u call%s, called %u time%s)",
                             expectedCalls_, (expectedCalls_ == 1) ? "" : "s", actualCalls_, (actualCalls_ == 1) ? "" : "s" );
 
     return str;

Original file line number	Diff line number	Diff line change
`@@ -710,12 +710,12 @@ SimpleString StringFrom(void (*value)())`
`710`	`710`
`711`	`711`	`SimpleString HexStringFrom(long value)`
`712`	`712`	`{`
`713`		`- return StringFromFormat("%lx", value);`
	`713`	`+ return HexStringFrom((unsigned long)value);`
`714`	`714`	`}`
`715`	`715`
`716`	`716`	`SimpleString HexStringFrom(int value)`
`717`	`717`	`{`
`718`		`- return StringFromFormat("%x", value);`
	`718`	`+ return HexStringFrom((unsigned int)value);`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`SimpleString HexStringFrom(signed char value)`
`@@ -795,7 +795,7 @@ SimpleString StringFrom(cpputest_ulonglong value)`
`795`	`795`
`796`	`796`	`SimpleString HexStringFrom(cpputest_longlong value)`
`797`	`797`	`{`
`798`		`- return StringFromFormat("%llx", value);`
	`798`	`+ return HexStringFrom((cpputest_ulonglong)value);`
`799`	`799`	`}`
`800`	`800`
`801`	`801`	`SimpleString HexStringFrom(cpputest_ulonglong value)`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ SimpleString MockCheckedExpectedCall::callToString()`
`423`	`423`	`str += ", other parameters are ignored";`
`424`	`424`	`}`
`425`	`425`
`426`		`- str += StringFromFormat(" (expected %d call%s, called %d time%s)",`
	`426`	`+ str += StringFromFormat(" (expected %u call%s, called %u time%s)",`
`427`	`427`	`expectedCalls_, (expectedCalls_ == 1) ? "" : "s", actualCalls_, (actualCalls_ == 1) ? "" : "s" );`
`428`	`428`
`429`	`429`	`return str;`