espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-26 03:17:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix printing of largest negative number, MIN 64-bits, -9223372036854775808

Browse Source 
'divisor' ranges from 1 to 1e18, representable by a long or unsigned long
 'number' becomes negative when cast as signed, so remove the cast and
  keep conversion warnings quiet by turning 'divisor' unsigned
This commit is contained in:
jsalling
2015-12-14 15:15:09 -06:00
parent e8662ae1cc
commit e966a079a4
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unity.c
View File

@ -167,30 +167,24 @@ void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T s
/// basically do an itoa using as little ram as possible
void UnityPrintNumber(const _U_SINT number_to_print)
{
_U_SINT divisor = 1;
_U_SINT next_divisor;
_U_UINT divisor = 1;
_U_UINT next_divisor;
_U_UINT number;
if (number_to_print == (1l << (UNITY_LONG_WIDTH-1)))
if (number_to_print < 0)
{
//The largest representable negative number
UNITY_OUTPUT_CHAR('-');
number = (1ul << (UNITY_LONG_WIDTH-1));
}
else if (number_to_print < 0)
{
//Some other negative number
//A negative number, including MIN negative
UNITY_OUTPUT_CHAR('-');
number = (_U_UINT)(-number_to_print);
}
else
{
//Positive number
//Non-negative number
number = (_U_UINT)number_to_print;
}
// figure out initial divisor
while ((_U_SINT)number / divisor > 9)
while (number / divisor > 9)
{
next_divisor = divisor * 10;
if (next_divisor > divisor)
@ -202,7 +196,7 @@ void UnityPrintNumber(const _U_SINT number_to_print)
// now mod and print, then divide divisor
do
{
UNITY_OUTPUT_CHAR((char)('0' + ((_U_SINT)number / divisor % 10)));
UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
divisor /= 10;
}
while (divisor > 0);