Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove warnings, errors during host tests in CI #8358

Merged
merged 5 commits into from
Nov 2, 2021
Merged

Remove warnings, errors during host tests in CI #8358

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d3c054
Remove warnings, errors during host tests in CI
earlephilhower Oct 31, 2021
81c0474
Merge branch 'master' into newhostfix
earlephilhower Oct 31, 2021
bf52dbf
Clean up SpeedTest.ino host build
earlephilhower Oct 31, 2021
31706c0
Update per @mcspr comments
earlephilhower Nov 1, 2021
6ce66dd
Merge branch 'master' into newhostfix
mcspr Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
size_t transferred = stream->sendSize(_client.get(), size);
if (transferred != size)
{
DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] short write, asked for %d but got %d failed.\n", size, transferred);
DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] short write, asked for %u but got %u failed.\n", (unsigned int)size, (unsigned int)transferred);
earlephilhower marked this conversation as resolved.
Show resolved Hide resolved
esp_yield();
return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ void ESP8266WebServerTemplate<ServerType>::sendContent(Stream* content, ssize_t
ssize_t sent = content->sendSize(&_currentClient, content_length);
if (sent != content_length)
{
DBGWS("HTTPServer: error: short send after timeout (%d<%d)\n", sent, content_length);
DBGWS("HTTPServer: error: short send after timeout (%u < %u)\n", (unsigned int)sent, (unsigned int)content_length);
}
if(_chunked) {
_currentClient.printf_P(PSTR("\r\n"));
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ void ESP8266WiFiClass::printDiag(Print& p) {
char ssid[33]; //ssid can be up to 32chars, => plus null term
memcpy(ssid, conf.ssid, sizeof(conf.ssid));
ssid[32] = 0; //nullterm in case of 32 char ssid
p.printf_P(PSTR("SSID (%d): %s\n"), strlen(ssid), ssid);
p.printf_P(PSTR("SSID (%u): %s\n"), (unsigned int)strlen(ssid), ssid);

char passphrase[65];
memcpy(passphrase, conf.password, sizeof(conf.password));
passphrase[64] = 0;
p.printf_P(PSTR("Passphrase (%d): %s\n"), strlen(passphrase), passphrase);
p.printf_P(PSTR("Passphrase (%u): %s\n"), (unsigned int)strlen(passphrase), passphrase);
earlephilhower marked this conversation as resolved.
Show resolved Hide resolved

p.print(F("BSSID set: "));
p.println(conf.bssid_set);
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* psk, int channel,

size_t ssid_len = ssid ? strlen(ssid) : 0;
if(ssid_len == 0 || ssid_len > 32) {
DEBUG_WIFI("[AP] SSID length %u, too long or missing!\n", ssid_len);
DEBUG_WIFI("[AP] SSID length %u, too long or missing!\n", (unsigned int)ssid_len);
return false;
}

size_t psk_len = psk ? strlen(psk) : 0;
if(psk_len > 0 && (psk_len > 64 || psk_len < 8)) {
DEBUG_WIFI("[AP] fail psk length %u, too long or short!\n", psk_len);
DEBUG_WIFI("[AP] fail psk length %u, too long or short!\n", (unsigned int)psk_len);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ wl_status_t ESP8266WiFiMulti::connectWiFiMulti(uint32_t connectTimeoutMs)

// Check SSID
if (ssid == entry.ssid) {
DEBUG_WIFI_MULTI("[WIFIM] Connecting %s\n", ssid);
DEBUG_WIFI_MULTI("[WIFIM] Connecting %s\n", ssid.c_str());
mcspr marked this conversation as resolved.
Show resolved Hide resolved

// Connect to WiFi
WiFi.begin(ssid, entry.passphrase, channel, bssid);
Expand Down Expand Up @@ -361,7 +361,7 @@ wl_status_t ESP8266WiFiMulti::connectWiFiMulti(uint32_t connectTimeoutMs)
}
}

DEBUG_WIFI_MULTI("[WIFIM] Could not connect\n", ssid);
DEBUG_WIFI_MULTI("[WIFIM] Could not connect\n");

// Could not connect to any WiFi network
return WL_CONNECT_FAILED;
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266mDNS/src/LEAmDNS_Helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ bool MDNSResponder::_printRRAnswer(const MDNSResponder::stcMDNS_RRAnswer& p_RRAn
if (pTxts)
{
((/*const c_str()!!*/stcMDNS_RRAnswerTXT*)&p_RRAnswer)->m_Txts.c_str(pTxts);
DEBUG_OUTPUT.printf_P(PSTR("TXT(%u) %s"), stTxtLength, pTxts);
DEBUG_OUTPUT.printf_P(PSTR("TXT(%u) %s"), (unsigned int)stTxtLength, pTxts);
earlephilhower marked this conversation as resolved.
Show resolved Hide resolved
delete[] pTxts;
}
break;
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,7 +1666,7 @@ bool MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::finalTimeoutLevel(vo
unsigned long MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout(void) const
{

uint32_t u32Timeout = esp8266::polledTimeout::oneShotMs::neverExpires;
uint32_t u32Timeout = (uint32_t)esp8266::polledTimeout::oneShotMs::neverExpires;
mcspr marked this conversation as resolved.
Show resolved Hide resolved

if (TIMEOUTLEVEL_BASE == m_timeoutLevel) // 80%
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266mDNS/src/LEAmDNS_Transfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ bool MDNSResponder::_readRRAnswer(MDNSResponder::stcMDNS_RRAnswer*& p_rpRRAnswer
if (pTxts)
{
((stcMDNS_RRAnswerTXT*&)p_rpRRAnswer)->m_Txts.c_str(pTxts);
DEBUG_OUTPUT.printf_P(PSTR("TXT(%u) %s"), stTxtLength, pTxts);
DEBUG_OUTPUT.printf_P(PSTR("TXT(%u) %s"), (unsigned int)stTxtLength, pTxts);
delete[] pTxts;
}
break;
Expand Down
2 changes: 1 addition & 1 deletion libraries/LittleFS/examples/SpeedTest/SpeedTest.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void DoTest(FS *fs) {
Serial.printf("==> Time to write %dKB in 256b chunks = %lu milliseconds\n", TESTSIZEKB, stop - start);

f = fs->open("/testwrite.bin", "r");
Serial.printf("==> Created file size = %d\n", f.size());
Serial.printf("==> Created file size = %lu\n", (unsigned long)f.size());
f.close();

Serial.printf("Reading %dKB file sequentially in 256b chunks\n", TESTSIZEKB);
Expand Down
4 changes: 2 additions & 2 deletions libraries/LittleFS/src/LittleFS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,14 +467,14 @@ class LittleFSFileImpl : public FileImpl
if (_creation) {
int rc = lfs_setattr(_fs->getFS(), _name.get(), 'c', (const void *)&_creation, sizeof(_creation));
if (rc < 0) {
DEBUGV("Unable to set creation time on '%s' to %d\n", _name.get(), _creation);
DEBUGV("Unable to set creation time on '%s' to %ld\n", _name.get(), (long)_creation);
}
}
// Add metadata with last write time
time_t now = _timeCallback();
int rc = lfs_setattr(_fs->getFS(), _name.get(), 't', (const void *)&now, sizeof(now));
if (rc < 0) {
DEBUGV("Unable to set last write time on '%s' to %d\n", _name.get(), now);
DEBUGV("Unable to set last write time on '%s' to %ld\n", _name.get(), (long)now);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/SD/src/SD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class SDClass {
uint64_t sz = size64();
#ifdef DEBUG_ESP_PORT
if (sz > (uint64_t)SIZE_MAX) {
DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld>= 4GB). Please update source to use size64().\n"), sz);
DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld>= 4GB). Please update source to use size64().\n"), (long long)sz);
mcspr marked this conversation as resolved.
Show resolved Hide resolved
}
#endif
return (size_t)sz;
Expand Down
2 changes: 1 addition & 1 deletion libraries/SDFS/src/SDFS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class SDFSImpl : public FSImpl
#ifdef DEBUG_ESP_PORT
if (i.totalBytes > (uint64_t)SIZE_MAX) {
// This catches both total and used cases, since used must always be < total.
DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld>= 4GB). Please update source to use info64().\n"), i.totalBytes);
DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld>= 4GB). Please update source to use info64().\n"), (long long)i.totalBytes);
mcspr marked this conversation as resolved.
Show resolved Hide resolved
}
#endif
info.totalBytes = (size_t)i.totalBytes;
Expand Down