jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using size_t limits max number to 2^32. When dealing with SD cards

Browse Source 
we could be asked to print a uint64 (for example, from SD.totalGytes()).
This commit is contained in:
FreeBear 2024-05-22 00:51:02 +01:00
parent eff576efb8
commit aa09f4bfd4
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hasp/hasp_parser.cpp
View File

@ -197,24 +197,26 @@ bool Parser::is_only_digits(const char* s)
return strlen(s) == digits; return strlen(s) == digits;
} }
int Parser::format_bytes(size_t filesize, char* buf, size_t len) int Parser::format_bytes(uint64_t filesize, char* buf, size_t len)
{ {
if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%d " D_FILE_SIZE_BYTES), filesize); uint32_t tmp = (uint32_t) filesize; // cast to unsigned int here to saye ugly casts in next line
filesize = filesize * 100; if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%u " D_FILE_SIZE_BYTES), tmp);
filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place filesize = filesize / (D_FILE_SIZE_DIVIDER/100); // multiply by 100 for 2 decimal place
tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100) if(filesize < D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_KILOBYTES), filesize / 100, return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_KILOBYTES), tmp / 100,
filesize % 100); tmp % 100);
filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place filesize = filesize / D_FILE_SIZE_DIVIDER;
tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100) if(filesize < D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_MEGABYTES), filesize / 100, return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_MEGABYTES), tmp / 100,
filesize % 100); tmp % 100);
filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place tmp = (uint32_t) (filesize / D_FILE_SIZE_DIVIDER);
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_GIGABYTES), filesize / 100, return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_GIGABYTES), tmp / 100,
filesize % 100); tmp % 100);
} }
uint8_t Parser::get_action_id(const char* action) uint8_t Parser::get_action_id(const char* action)

2
src/hasp/hasp_parser.h
View File

@ -19,7 +19,7 @@ class Parser {
static bool is_true(const char* s); static bool is_true(const char* s);
static bool is_true(JsonVariant json); static bool is_true(JsonVariant json);
static bool is_only_digits(const char* s); static bool is_only_digits(const char* s);
static int format_bytes(size_t filesize, char* buf, size_t len); static int format_bytes(uint64_t filesize, char* buf, size_t len);
}; };
#ifndef ARDUINO #ifndef ARDUINO