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

Merge pull request #694 from cmachida/master

Browse Source 
fix: TEST_PRINTF(): printing 64-bit hex numbers or pointers
This commit is contained in:
Mark VanderVoord
2023-09-15 10:39:16 -04:00
committed by GitHub
parent cb03c3afa7 f3b2de4da2
commit 2775e1b058
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unity.c
View File

@ -2031,15 +2031,29 @@ static void UnityPrintFVA(const char* format, va_list va)
UNITY_EXTRACT_ARG(UNITY_UINT, number, length_mod, va, unsigned int);
UNITY_OUTPUT_CHAR('0');
UNITY_OUTPUT_CHAR('x');
UnityPrintNumberHex(number, 8);
if (length_mod == UNITY_LENGTH_MODIFIER_LONG_LONG)
{
UnityPrintNumberHex(number, 16);
}
else
{
UnityPrintNumberHex(number, 8);
}
break;
}
case 'p':
{
const unsigned int number = va_arg(va, unsigned int);
UNITY_UINT number;
char nibbles_to_print = 8;
if (UNITY_POINTER_WIDTH == 64)
{
length_mod = UNITY_LENGTH_MODIFIER_LONG_LONG;
nibbles_to_print = 16;
}
UNITY_EXTRACT_ARG(UNITY_UINT, number, length_mod, va, unsigned int);
UNITY_OUTPUT_CHAR('0');
UNITY_OUTPUT_CHAR('x');
UnityPrintNumberHex((UNITY_UINT)number, 8);
UnityPrintNumberHex((UNITY_UINT)number, nibbles_to_print);
break;
}
case 'c':