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

Use a const char* array for format_bytes suffixes at the expense of a little

Browse Source 
more system memory.
This commit is contained in:
FreeBear 2024-05-22 12:44:36 +01:00
parent b65bd46b41
commit 452c619e97
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hasp/hasp_parser.cpp
View File

@ -203,22 +203,14 @@ int Parser::format_bytes(uint64_t filesize, char* buf, size_t len)
uint32_t tmp = (uint32_t) filesize; // cast to unsigned int here to saye ugly casts in next line 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); if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%u " D_FILE_SIZE_BYTES), tmp);
filesize /= D_FILE_SIZE_DIVIDER; const char* suffix[] = {D_FILE_SIZE_KILOBYTES, D_FILE_SIZE_MEGABYTES, D_FILE_SIZE_GIGABYTES};
int n = -1;
while (filesize > D_FILE_SIZE_DIVIDER * 100) {
n += 1;
filesize /= D_FILE_SIZE_DIVIDER;
}
tmp = (uint32_t) filesize; tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100) return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u %s"), tmp / 100, tmp % 100, suffix[n]);
return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u " D_FILE_SIZE_KILOBYTES), tmp / 100,
tmp % 100);
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_MEGABYTES), tmp / 100,
tmp % 100);
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);
} }
uint8_t Parser::get_action_id(const char* action) uint8_t Parser::get_action_id(const char* action)