jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-23 11:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take onboard comment about loss of precision.

Browse Source 
Using size_t would have overflowed at (approx) 2^28. But with a uint64_t
the limit is going to be up in the Exbi range (2^60).
This commit is contained in:
FreeBear 2024-05-22 11:20:14 +01:00
parent aa09f4bfd4
commit 33f3c36915
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hasp/hasp_parser.cpp
View File

@ -199,22 +199,24 @@ bool Parser::is_only_digits(const char* s)
int Parser::format_bytes(uint64_t filesize, char* buf, size_t len)
{
filesize *= 100; // Warning - If filesize up in the Zi range (2^60), we will overflow.
uint32_t tmp = (uint32_t) filesize; // cast to unsigned int here to saye ugly casts in next line
if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%u " D_FILE_SIZE_BYTES), tmp);
filesize = filesize / (D_FILE_SIZE_DIVIDER/100); // multiply by 100 for 2 decimal place
filesize /= D_FILE_SIZE_DIVIDER;
tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_KILOBYTES), tmp / 100,
tmp % 100);
filesize = filesize / D_FILE_SIZE_DIVIDER;
filesize /= D_FILE_SIZE_DIVIDER;
tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100)
if(filesize < D_FILE_SIZE_DIVIDER * D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_MEGABYTES), tmp / 100,
tmp % 100);
tmp = (uint32_t) (filesize / D_FILE_SIZE_DIVIDER);
filesize /= D_FILE_SIZE_DIVIDER;
tmp = (uint32_t) filesize;
return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_GIGABYTES), tmp / 100,
tmp % 100);
}