From c355eaa2b0bc0652b125976632cf12f29b5eb298 Mon Sep 17 00:00:00 2001 From: Marco Paland Date: Wed, 22 Nov 2017 01:30:35 +0100 Subject: Fixed 64 bit pointer casting --- printf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'printf.c') diff --git a/printf.c b/printf.c index 49ef68f..a65f418 100644 --- a/printf.c +++ b/printf.c @@ -32,6 +32,7 @@ #include #include +#include #include "printf.h" @@ -270,7 +271,7 @@ static size_t _ftoa(double value, char* buffer, size_t maxlen, unsigned int prec // greater than 0.5, round up, e.g. 1.6 -> 2 ++whole; } - else if (diff == 0.5 && (whole & 1)) { + else if ((diff == 0.5) && (whole & 1)) { // exactly 0.5 and ODD, then round up // 1.5 -> 2, but 2.5 -> 2 ++whole; @@ -551,13 +552,13 @@ static size_t _vsnprintf(char* buffer, size_t buffer_len, const char* format, va case 'p' : { width = sizeof(void*) * 2U; flags |= FLAGS_ZEROPAD | FLAGS_UPPERCASE; - if (sizeof(void*) == sizeof(long long)) { + if (sizeof(uintptr_t) == sizeof(long long)) { #if defined(PRINTF_LONG_LONG_SUPPORT) - idx += _ntoa_long_long(&buffer[idx], (unsigned long long)va_arg(va, void*), false, 16U, buffer_len - idx, precision, width, flags); + idx += _ntoa_long_long(&buffer[idx], (uintptr_t)va_arg(va, void*), false, 16U, buffer_len - idx, precision, width, flags); #endif } else { - idx += _ntoa_long(&buffer[idx], (unsigned long)va_arg(va, void*), false, 16U, buffer_len - idx, precision, width, flags); + idx += _ntoa_long(&buffer[idx], (unsigned long)((uintptr_t)va_arg(va, void*)), false, 16U, buffer_len - idx, precision, width, flags); } format++; break; -- cgit v1.2.3