andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

static code analysis nice things

Browse Source
This commit is contained in:
proddy
2020-11-26 23:08:56 +01:00
parent 46a6c3893f
commit ccfe5be568
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/helpers.cpp
View File

@@ -97,11 +97,10 @@ char * Helpers::itoa(char * result, int32_t value, const uint8_t base) {
} }
*ptr-- = '\0'; *ptr-- = '\0';
char tmp_char;
while (ptr1 < ptr) { while (ptr1 < ptr) {
tmp_char = *ptr; char tmp_char = *ptr;
*ptr-- = *ptr1; *ptr-- = *ptr1;
*ptr1++ = tmp_char; *ptr1++ = tmp_char;
} }
return result; return result;
@@ -133,14 +132,16 @@ char * Helpers::render_boolean(char * result, bool value) {
} else { } else {
strlcpy(result, value ? "1" : "0", 2); strlcpy(result, value ? "1" : "0", 2);
} }
return result; return result;
} }
// depending on format render a number or a string // depending on format render a number or a string
char * Helpers::render_enum(char * result, const std::vector<const __FlashStringHelper *> &value, const uint8_t no) { char * Helpers::render_enum(char * result, const std::vector<const __FlashStringHelper *> & value, const uint8_t no) {
if (no >= value.size()) { if (no >= value.size()) {
return nullptr; // out of bounds return nullptr; // out of bounds
} }
strcpy(result, uuid::read_flash_string(value[no]).c_str()); strcpy(result, uuid::read_flash_string(value[no]).c_str());
if (bool_format() == BOOL_FORMAT_TRUEFALSE) { if (bool_format() == BOOL_FORMAT_TRUEFALSE) {
if (no == 0 && uuid::read_flash_string(value[0]) == "off") { if (no == 0 && uuid::read_flash_string(value[0]) == "off") {
@@ -151,6 +152,7 @@ char * Helpers::render_enum(char * result, const std::vector<const __FlashString
} else if (bool_format() == BOOL_FORMAT_NUMBERS) { } else if (bool_format() == BOOL_FORMAT_NUMBERS) {
itoa(result, no); itoa(result, no);
} }
return result; return result;
} }
@@ -271,6 +273,7 @@ char * Helpers::render_value(char * result, const uint16_t value, const uint8_t
if (!hasValue(value)) { if (!hasValue(value)) {
return nullptr; return nullptr;
} }
return (render_value(result, (int16_t)value, format)); // use same code, force it to a signed int return (render_value(result, (int16_t)value, format)); // use same code, force it to a signed int
} }
@@ -279,6 +282,7 @@ char * Helpers::render_value(char * result, const int8_t value, const uint8_t fo
if (!hasValue(value)) { if (!hasValue(value)) {
return nullptr; return nullptr;
} }
return (render_value(result, (int16_t)value, format)); // use same code, force it to a signed int return (render_value(result, (int16_t)value, format)); // use same code, force it to a signed int
} }
@@ -288,23 +292,30 @@ char * Helpers::render_value(char * result, const uint32_t value, const uint8_t
return nullptr; return nullptr;
} }
char s[20];
result[0] = '\0'; result[0] = '\0';
// check if we're converted from minutes to a time
if (format == EMS_VALUE_TIME) {
snprintf_P(result, 40, PSTR("%d days %d hrs %d mins"), (value / 1440), ((value % 1440) / 60), (value % 60));
return result;
}
char s[20];
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
if (!format) { if (!format) {
strlcat(result, ltoa(value, s, 10), 20); // format is 0 strlcpy(result, ltoa(value, s, 10), 20); // format is 0
} else { } else {
strlcat(result, ltoa(value / format, s, 10), 20); strlcpy(result, ltoa(value / format, s, 10), 20);
strlcat(result, ".", 20); strlcat(result, ".", 20);
strlcat(result, ltoa(value % format, s, 10), 20); strlcat(result, ltoa(value % format, s, 10), 20);
} }
#else #else
if (!format) { if (!format) {
strlcat(result, ultostr(s, value, 10), 20); // format is 0 strlcpy(result, ultostr(s, value, 10), 20); // format is 0
} else { } else {
strncat(result, ultostr(s, value / format, 10), 20); strncpy(result, ultostr(s, value / format, 10), 20);
strlcat(result, ".", 20); strlcat(result, ".", 20);
strncat(result, ultostr(s, value % format, 10), 20); strncat(result, ultostr(s, value % format, 10), 20);
} }
@@ -460,7 +471,7 @@ bool Helpers::value2bool(const char * v, bool & value) {
} }
// checks to see if a string is member of a vector and return the index, also allow true/false for on/off // checks to see if a string is member of a vector and return the index, also allow true/false for on/off
bool Helpers::value2enum(const char * v, uint8_t & value, const std::vector<const __FlashStringHelper *> &strs) { bool Helpers::value2enum(const char * v, uint8_t & value, const std::vector<const __FlashStringHelper *> & strs) {
if ((v == nullptr) || (strlen(v) == 0)) { if ((v == nullptr) || (strlen(v) == 0)) {
return false; return false;
} }