make use of %zd

cores/esp8266/Updater.cpp

@@ -87,18 +87,18 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
   uintptr_t updateStartAddress = 0;
   if (command == U_FLASH) {
     //size of current sketch rounded to a sector
-    uint32_t currentSketchSize = (ESP.getSketchSize() + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
+    size_t currentSketchSize = (ESP.getSketchSize() + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
     //address of the end of the space available for sketch and update
     uintptr_t updateEndAddress = (uintptr_t)&_SPIFFS_start - 0x40200000;
     //size of the update rounded to a sector
-    uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
+    size_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
     //address where we will start writing the update
     updateStartAddress = (updateEndAddress > roundedSize)? (updateEndAddress - roundedSize) : 0;
 
 #ifdef DEBUG_UPDATER
-        DEBUG_UPDATER.printf("[begin] roundedSize:       0x%08X (%d)\n", roundedSize, roundedSize);
-        DEBUG_UPDATER.printf("[begin] updateEndAddress:  0x%08X (%d)\n", (int)updateEndAddress, (int)updateEndAddress);
-        DEBUG_UPDATER.printf("[begin] currentSketchSize: 0x%08X (%d)\n", currentSketchSize, currentSketchSize);
+        DEBUG_UPDATER.printf("[begin] roundedSize:       0x%08zX (%zd)\n", roundedSize, roundedSize);
+        DEBUG_UPDATER.printf("[begin] updateEndAddress:  0x%08zX (%zd)\n", updateEndAddress, updateEndAddress);
+        DEBUG_UPDATER.printf("[begin] currentSketchSize: 0x%08zX (%zd)\n", currentSketchSize, currentSketchSize);
 #endif
 
     //make sure that the size of both sketches is less than the total space (updateEndAddress)
@@ -133,7 +133,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
 #ifdef DEBUG_UPDATER
   DEBUG_UPDATER.printf("[begin] _startAddress:     0x%08X (%d)\n", _startAddress, _startAddress);
   DEBUG_UPDATER.printf("[begin] _currentAddress:   0x%08X (%d)\n", _currentAddress, _currentAddress);
-  DEBUG_UPDATER.printf("[begin] _size:             0x%08X (%d)\n", (int)_size, (int)_size);
+  DEBUG_UPDATER.printf("[begin] _size:             0x%08zX (%zd)\n", _size, _size);
 #endif
 
   _md5.begin();
@@ -159,7 +159,7 @@ bool UpdaterClass::end(bool evenIfRemaining){
 
   if(hasError() || (!isFinished() && !evenIfRemaining)){
 #ifdef DEBUG_UPDATER
-    DEBUG_UPDATER.printf("premature end: res:%u, pos:%u/%u\n", getError(), (unsigned)progress(), (unsigned)_size);
+    DEBUG_UPDATER.printf("premature end: res:%u, pos:%zu/%zu\n", getError(), progress(), _size);
 #endif
 
     _reset();
@@ -199,10 +199,10 @@ bool UpdaterClass::end(bool evenIfRemaining){
     eboot_command_write(&ebcmd);
 
 #ifdef DEBUG_UPDATER
-    DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08X\n", _startAddress, (unsigned)_size);
+    DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08zX\n", _startAddress, _size);
   }
   else if (_command == U_SPIFFS) {
-    DEBUG_UPDATER.printf("SPIFFS: address:0x%08X, size:0x%08X\n", _startAddress, (unsigned)_size);
+    DEBUG_UPDATER.printf("SPIFFS: address:0x%08X, size:0x%08zX\n", _startAddress, _size);
 #endif
   }
 

cores/esp8266/spiffs_api.h

@@ -220,9 +220,9 @@ class SPIFFSImpl : public FSImpl
         size_t cacheBufSize = SPIFFS_buffer_bytes_for_cache(&_fs, _maxOpenFds);
 
         if (!_workBuf) {
-            DEBUGV("SPIFFSImpl: allocating %d+%d+%d=%d bytes\r\n",
-                   (int)workBufSize, (int)fdsBufSize, (int)cacheBufSize,
-                   (int)(workBufSize + fdsBufSize + cacheBufSize));
+            DEBUGV("SPIFFSImpl: allocating %zd+%zd+%zd=%zd bytes\r\n",
+                   workBufSize, fdsBufSize, cacheBufSize,
+                   workBufSize + fdsBufSize + cacheBufSize);
             _workBuf.reset(new uint8_t[workBufSize]);
             _fdsBuf.reset(new uint8_t[fdsBufSize]);
             _cacheBuf.reset(new uint8_t[cacheBufSize]);

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -734,7 +734,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
         free(buff);
 
         if(size && (int) size != bytesWritten) {
-            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, (int)size);
+            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %zd mismatch!.\n", bytesWritten, size);
             DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] ERROR SEND PAYLOAD FAILED!");
             return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
         } else {

libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

@@ -439,7 +439,7 @@ void ESP8266WebServer::sendContent(const String& content) {
   size_t len = content.length();
   if(_chunked) {
     char chunkSize[11];
-    sprintf(chunkSize, "%x\r\n", (unsigned)len);
+    sprintf(chunkSize, "%zx\r\n", len);
     _currentClientWrite(chunkSize, strlen(chunkSize));
   }
   _currentClientWrite(content.c_str(), len);
@@ -459,7 +459,7 @@ void ESP8266WebServer::sendContent_P(PGM_P content, size_t size) {
   const char * footer = "\r\n";
   if(_chunked) {
     char chunkSize[11];
-    sprintf(chunkSize, "%x\r\n", (unsigned)size);
+    sprintf(chunkSize, "%zx\r\n", size);
     _currentClientWrite(chunkSize, strlen(chunkSize));
   }
   _currentClientWrite_P(content, size);

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -1405,7 +1405,7 @@ extern "C" {
     int freeheap = ESP.getFreeHeap();
     static int laststack, lastheap, laststack2;
     if ((laststack != freestack) || (lastheap != freeheap) || (laststack2 != (int)br_esp8266_stack_proxy_usage())) {
-      Serial.printf("%s:%s(%d): FREESTACK=%d, STACK2USAGE=%d, FREEHEAP=%d\n", file, fcn, line, freestack, (int)br_esp8266_stack_proxy_usage(), freeheap);
+      Serial.printf("%s:%s(%d): FREESTACK=%d, STACK2USAGE=%zd, FREEHEAP=%d\n", file, fcn, line, freestack, br_esp8266_stack_proxy_usage(), freeheap);
       if (freestack < 256) {
         Serial.printf("!!! Out of main stack space\n");
       }

tests/host/Makefile

@@ -60,7 +60,7 @@ MOCK_CPP_FILES_COMMON := $(addprefix common/,\
 	Arduino.cpp \
 	spiffs_mock.cpp \
 	WMath.cpp \
-	HardwareSerial.cpp \
+	MockSerial.cpp \
 	MockTools.cpp \
 )
 
@@ -222,7 +222,7 @@ MOCK_ARDUINO_LIBS := \
 	common/MockWiFiServerSocket.cpp \
 	common/MockWiFiServer.cpp \
 	common/UdpContextSocket.cpp \
-	common/MockWire.cpp \
+	common/HostWiring.cpp \
 	common/MockEsp.cpp \
 	common/MockEEPROM.cpp \
 	common/MockSPI.cpp \

tests/host/common/ArduinoMain.cpp

@@ -113,7 +113,7 @@ int main (int argc, char* const argv [])
 			exit(EXIT_FAILURE);
 		}
 	}
-	
+
 	// setup global global_ipv4_netfmt
 	wifi_get_ip_info(0, nullptr);
 
@@ -122,9 +122,9 @@ int main (int argc, char* const argv [])
 	{
 		if (!fast)
 			usleep(10000); // not 100% cpu
-		
+
 		loop();
-		
+
 		// check incoming udp
 		for (auto& udp: udps)
 		{
@@ -133,11 +133,10 @@ int main (int argc, char* const argv [])
 			p.events = POLLIN;
 			if (poll(&p, 1, 0) && p.revents == POLLIN)
 			{
-				fprintf(stderr, MOCK "UDP poll(%d) -> cb\r", (int)p.fd);
+				fprintf(stderr, MOCK "UDP poll(%d) -> cb\r", p.fd);
 				udp.second->mock_cb();
 			}
 		}
-
 	}
 	return 0;
 }

tests/host/common/ClientContextSocket.cpp

@@ -73,7 +73,7 @@ size_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize)
 	if (ret == -1)
 	{
 		if (errno != EAGAIN)
-			fprintf(stderr, MOCK "ClientContext::(read/peek): filling buffer for %d bytes: %s\n", (int)maxread, strerror(errno));
+			fprintf(stderr, MOCK "ClientContext::(read/peek): filling buffer for %zd bytes: %s\n", maxread, strerror(errno));
 		ret = 0;
 	}
 	return ccinbufsize += ret;
@@ -82,7 +82,7 @@ size_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize)
 size_t mockPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
 {
 	if (usersize > CCBUFSIZE)
-		fprintf(stderr, MOCK "CCBUFSIZE(%d) should be increased by %d bytes (-> %d)\n", CCBUFSIZE, (int)usersize - CCBUFSIZE, (int)usersize);
+		fprintf(stderr, MOCK "CCBUFSIZE(%d) should be increased by %zd bytes (-> %zd)\n", CCBUFSIZE, usersize - CCBUFSIZE, usersize);
 
 	struct pollfd p;
 	size_t retsize = 0;
@@ -143,7 +143,7 @@ size_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms)
 		}
 		if (ret != (int)size)
 		{
-			fprintf(stderr, MOCK "ClientContext::write: short write (%d < %d) (TODO)\n", (int)ret, (int)size);
+			fprintf(stderr, MOCK "ClientContext::write: short write (%d < %zd) (TODO)\n", ret, size);
 			exit(EXIT_FAILURE);
 		}
 	}

tests/host/common/MockTools.cpp

@@ -58,8 +58,8 @@ extern "C" void configTime(long timezone, int daylightOffset_sec,
 	(void)server1;
 	(void)server2;
 	(void)server3;
-	
-	fprintf(stderr, MOCK "configTime: TODO (tz=%dH offset=%dS) (time will be host's)\n", (int)timezone, daylightOffset_sec);
+
+	fprintf(stderr, MOCK "configTime: TODO (tz=%ldH offset=%dS) (time will be host's)\n", timezone, daylightOffset_sec);
 }
 
 void stack_thunk_add_ref() { }

tests/host/common/MockWiFiServerSocket.cpp

@@ -66,7 +66,7 @@ void WiFiServer::begin ()
 {
 	int sock;
 	struct sockaddr_in server;
-	
+
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
 	{
 		perror(MOCK "socket()");
@@ -79,7 +79,7 @@ void WiFiServer::begin ()
 		perror(MOCK "reuseport");
 		exit(EXIT_FAILURE);
 	}
-    
+
     	server.sin_family = AF_INET;
 	server.sin_port = htons(_port);
 	server.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -88,7 +88,7 @@ void WiFiServer::begin ()
 		perror(MOCK "bind()");
 		exit(EXIT_FAILURE);
 	}
-	
+
 	if (listen(sock, 1) == -1)
 	{
 		perror(MOCK "listen()");
@@ -115,7 +115,7 @@ size_t WiFiServer::write (uint8_t c)
 
 size_t WiFiServer::write (const uint8_t *buf, size_t size)
 {
-	fprintf(stderr, MOCK "todo: WiFiServer::write(%p, %d)\n", buf, (int)size);
+	fprintf(stderr, MOCK "todo: WiFiServer::write(%p, %zd)\n", buf, size);
 	return 0;
 }
 

tests/host/common/UdpContextSocket.cpp

@@ -59,28 +59,28 @@ bool mockUDPListen (int sock, uint32_t dstaddr, uint16_t port, uint32_t mcast)
 		fprintf(stderr, MOCK "SO_REUSEADDR failed\n");
 
 	struct sockaddr_in servaddr;
-	memset(&servaddr, 0, sizeof(servaddr)); 
-	
-	// Filling server information 
+	memset(&servaddr, 0, sizeof(servaddr));
+
+	// Filling server information
 	servaddr.sin_family = AF_INET;
 	//servaddr.sin_addr.s_addr = global_ipv4_netfmt?: dstaddr;
 	servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
 	servaddr.sin_port = htons(port);
-	
-	// Bind the socket with the server address 
+
+	// Bind the socket with the server address
 	if (bind(sock, (const struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
 	{
-		fprintf(stderr, MOCK "UDP bind on port %d failed: %s\n", port, strerror(errno)); 
+		fprintf(stderr, MOCK "UDP bind on port %d failed: %s\n", port, strerror(errno));
 		return false;
 	}
 	else
-		fprintf(stderr, MOCK "UDP server on port %d (sock=%d)\n", (int)port, (int)sock);
-	
+		fprintf(stderr, MOCK "UDP server on port %d (sock=%d)\n", (int)port, sock);
+
 	if (mcast)
 	{
 		// https://web.cs.wpi.edu/~claypool/courses/4514-B99/samples/multicast.c
 		// https://stackoverflow.com/questions/12681097/c-choose-interface-for-udp-multicast-socket
-		
+
 		struct ip_mreq mreq;
 		mreq.imr_multiaddr.s_addr = mcast;
 		//mreq.imr_interface.s_addr = global_ipv4_netfmt?: htonl(INADDR_ANY);
@@ -99,7 +99,7 @@ bool mockUDPListen (int sock, uint32_t dstaddr, uint16_t port, uint32_t mcast)
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -114,10 +114,10 @@ size_t mockUDPFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize, uint8_t&
 	if (ret == -1)
 	{
 		if (errno != EAGAIN)
-			fprintf(stderr, MOCK "UDPContext::(read/peek): filling buffer for %d bytes: %s\n", (int)maxread, strerror(errno));
+			fprintf(stderr, MOCK "UDPContext::(read/peek): filling buffer for %zd bytes: %s\n", maxread, strerror(errno));
 		ret = 0;
 	}
-	
+
 	if (ret > 0)
 	{
 		port = ntohs(((sockaddr_in*)&addrbuf)->sin_port);
@@ -136,7 +136,7 @@ size_t mockUDPFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize, uint8_t&
 size_t mockUDPPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
 {
 	if (usersize > CCBUFSIZE)
-		fprintf(stderr, MOCK "CCBUFSIZE(%d) should be increased by %d bytes (-> %d)\n", CCBUFSIZE, (int)usersize - CCBUFSIZE, (int)usersize);
+		fprintf(stderr, MOCK "CCBUFSIZE(%d) should be increased by %zd bytes (-> %zd)\n", CCBUFSIZE, usersize - CCBUFSIZE, usersize);
 
 	size_t retsize = 0;
 	if (ccinbufsize)
@@ -161,7 +161,7 @@ size_t mockUDPRead (int sock, char* dst, size_t size, int timeout_ms, char* ccin
 
 size_t mockUDPWrite (int sock, const uint8_t* data, size_t size, int timeout_ms, uint32_t ipv4, uint16_t port)
 {
-	// Filling server information 
+	// Filling server information
 	struct sockaddr_in peer;
 	peer.sin_family = AF_INET;
 	peer.sin_addr.s_addr = ipv4; //XXFIXME should use lwip_htonl?
@@ -174,7 +174,7 @@ size_t mockUDPWrite (int sock, const uint8_t* data, size_t size, int timeout_ms,
 	}
 	if (ret != (int)size)
 	{
-		fprintf(stderr, MOCK "UDPContext::write: short write (%d < %d) (TODO)\n", (int)ret, (int)size);
+		fprintf(stderr, MOCK "UDPContext::write: short write (%d < %zd) (TODO)\n", ret, size);
 		exit(EXIT_FAILURE);
 	}
 

tests/host/common/include/UdpContext.h

@@ -111,7 +111,7 @@ class UdpContext
         fprintf(stderr, MOCK "TODO: implement UDP offset\n");
         if (!isValidOffset(pos))
         {
-            fprintf(stderr, MOCK "UDPContext::seek too far (%d >= %d)\n", (int)pos, (int)_inbufsize);
+            fprintf(stderr, MOCK "UDPContext::seek too far (%zd >= %zd)\n", pos, _inbufsize);
             exit(EXIT_FAILURE);
         }
     }
@@ -183,7 +183,7 @@ class UdpContext
     {
         if (size + _outbufsize > sizeof _outbuf)
         {
-            fprintf(stderr, MOCK "UdpContext::append: increase CCBUFSIZE (%d -> %d)\n", CCBUFSIZE, (int)(size + _outbufsize));
+            fprintf(stderr, MOCK "UdpContext::append: increase CCBUFSIZE (%d -> %zd)\n", CCBUFSIZE, (size + _outbufsize));
             exit(EXIT_FAILURE);
         }
 
@@ -200,7 +200,7 @@ class UdpContext
         _outbufsize = 0;
         return ret > 0;
     }
-    
+
     void mock_cb (void)
     {
         if (_on_rx) _on_rx();
@@ -232,14 +232,14 @@ class UdpContext
 
     ip_addr_t _dst;
     uint16_t _dstport;
-    
+
     char _inbuf [CCBUFSIZE];
     size_t _inbufsize = 0;
     char _outbuf [CCBUFSIZE];
     size_t _outbufsize = 0;
 
     int _timeout_ms = 0;
-    
+
     uint8_t addrsize;
     uint8_t addr[16];
 };