arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-07 16:23:38 +03:00
Code

Fix String build warning with DEBUG_ESP_PORT but without DEBUG_ESP_CORE (#8849)

Browse Source
This commit is contained in:
david gauchard 2023-02-05 13:35:56 +01:00 committed by GitHub
parent badb407bbb
commit 9a3d55c781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cores/esp8266/WString.cpp
View File

@ -200,7 +200,7 @@ bool String::reserve(unsigned int size) {
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
static void identifyString (const String& badOne) static void identifyString (const String& badOne)
{ {
DEBUGV("[String] '%." STR(OOM_STRING_BORDER_DISPLAY) "s ... %." STR(OOM_STRING_BORDER_DISPLAY) "s': ", DEBUG_ESP_PORT.printf("[String] '%." STR(OOM_STRING_BORDER_DISPLAY) "s ... %." STR(OOM_STRING_BORDER_DISPLAY) "s': ",
badOne.c_str(), badOne.c_str(),
badOne.length() > OOM_STRING_BORDER_DISPLAY? badOne.c_str() + std::max((int)badOne.length() - OOM_STRING_BORDER_DISPLAY, OOM_STRING_BORDER_DISPLAY): ""); badOne.length() > OOM_STRING_BORDER_DISPLAY? badOne.c_str() + std::max((int)badOne.length() - OOM_STRING_BORDER_DISPLAY, OOM_STRING_BORDER_DISPLAY): "");
} }
@ -231,14 +231,14 @@ bool String::changeBuffer(unsigned int maxStrLen) {
if (!isSSO() && capacity() >= OOM_STRING_THRESHOLD_REALLOC_WARN && maxStrLen > capacity()) { if (!isSSO() && capacity() >= OOM_STRING_THRESHOLD_REALLOC_WARN && maxStrLen > capacity()) {
// warn when badly re-allocating // warn when badly re-allocating
identifyString(*this); identifyString(*this);
DEBUGV("Reallocating large String(%d -> %d bytes)\n", len(), maxStrLen); DEBUG_ESP_PORT.printf("Reallocating large String(%d -> %d bytes)\n", len(), maxStrLen);
} }
#endif #endif
// Make sure we can fit newsize in the buffer // Make sure we can fit newsize in the buffer
if (newSize > CAPACITY_MAX) { if (newSize > CAPACITY_MAX) {
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
identifyString(*this); identifyString(*this);
DEBUGV("Maximum capacity reached (" STR(CAPACITY_MAX) ")\n"); DEBUG_ESP_PORT.printf("Maximum capacity reached (" STR(CAPACITY_MAX) ")\n");
#endif #endif
return false; return false;
} }
@ -261,7 +261,7 @@ bool String::changeBuffer(unsigned int maxStrLen) {
} }
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
identifyString(*this); identifyString(*this);
DEBUGV("OOM: %d -> %d bytes\n", isSSO() ? 0: capacity(), newSize); DEBUG_ESP_PORT.printf("OOM: %d -> %zu bytes\n", isSSO() ? 0: capacity(), newSize);
#endif #endif
return false; return false;
} }