mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-11-16 01:05:15 +08:00
[klibc] Fix tiny vsnprintf long long formatting
This commit is contained in:
1 parent
08cad4ee9c
commit
dace1947dd
2 files changed
+20
-3
No files matched your search
@@ -109,7 +109,15 @@ static char *print_number(char *buf,
|
||||
num = (rt_uint16_t)-num;
|
||||
}
|
||||
break;
|
||||
#ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG
|
||||
case 'L':
|
||||
if (num > (~0ULL >> 1))
|
||||
{
|
||||
sign = '-';
|
||||
num = 0ULL - num;
|
||||
}
|
||||
break;
|
||||
#endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */
|
||||
case 'l':
|
||||
if ((long)num < 0)
|
||||
{
|
||||
@@ -595,7 +603,14 @@ int rt_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
||||
|
||||
if (qualifier == 'L')
|
||||
{
|
||||
num = va_arg(args, unsigned long long);
|
||||
if (flags & SIGN)
|
||||
{
|
||||
num = (unsigned long long)va_arg(args, long long);
|
||||
}
|
||||
else
|
||||
{
|
||||
num = va_arg(args, unsigned long long);
|
||||
}
|
||||
}
|
||||
else if (qualifier == 'l')
|
||||
{
|
||||
|
||||
@@ -913,10 +913,12 @@ SPRINTF_TEST_CASE(integer_types)
|
||||
SPRINTF_CHECK("2147483647", buffer, "%li", 2147483647L);
|
||||
#ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG
|
||||
SPRINTF_CHECK("30", buffer, "%lli", 30LL);
|
||||
#ifdef RT_KLIBC_USING_VSNPRINTF_STANDARD
|
||||
SPRINTF_CHECK("-9223372036854775807", buffer, "%lli", -9223372036854775807LL);
|
||||
SPRINTF_CHECK("9223372036854775807", buffer, "%lli", 9223372036854775807LL);
|
||||
#endif /* RT_KLIBC_USING_VSNPRINTF_STANDARD */
|
||||
SPRINTF_CHECK("-2147483648", buffer, "%lld", (long long)(rt_int64_t)-2147483648LL);
|
||||
SPRINTF_CHECK("4294967295", buffer, "%lld", (long long)(rt_int64_t)RT_UINT32_MAX);
|
||||
SPRINTF_CHECK("-9223372036854775808", buffer, "%lld", (long long)(-9223372036854775807LL - 1LL));
|
||||
SPRINTF_CHECK("9223372036854775807", buffer, "%lld", 9223372036854775807LL);
|
||||
#endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */
|
||||
SPRINTF_CHECK("100000", buffer, "%lu", 100000L);
|
||||
SPRINTF_CHECK("4294967295", buffer, "%lu", 0xFFFFFFFFL);
|
||||
|
||||
Reference in new issue
Block a user