From 2472970933b298bfb573eac062095de2f1b1f56c Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Sun, 26 Apr 2015 15:52:14 +0200 Subject: [PATCH] fix some warnings warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=] warning: defined but not used [-Wunused-variable] warning: declared 'static' but never defined [-Wunused-function] warning: suggest parentheses around '&&' within '||' [-Wparentheses} --- cores/esp8266/core_esp8266_noniso.c | 2 +- cores/esp8266/core_esp8266_wiring_digital.c | 1 - libraries/ESP8266WebServer/src/ESP8266WebServer.cpp | 2 +- libraries/ESP8266WiFi/src/lwip/mem_manager.h | 8 ++++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cores/esp8266/core_esp8266_noniso.c b/cores/esp8266/core_esp8266_noniso.c index 952dd97e7..a7efef4c4 100644 --- a/cores/esp8266/core_esp8266_noniso.c +++ b/cores/esp8266/core_esp8266_noniso.c @@ -180,7 +180,7 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) { // Extract the integer part of the number and print it unsigned long int_part = (unsigned long) number; double remainder = number - (double) int_part; - out += sprintf(out, "%d", int_part); + out += sprintf(out, "%ld", int_part); // Print the decimal point, but only if there are digits beyond if(prec > 0) { diff --git a/cores/esp8266/core_esp8266_wiring_digital.c b/cores/esp8266/core_esp8266_wiring_digital.c index ca63d01ac..cf9ddce52 100644 --- a/cores/esp8266/core_esp8266_wiring_digital.c +++ b/cores/esp8266/core_esp8266_wiring_digital.c @@ -63,7 +63,6 @@ volatile uint32_t* portModeRegister(uint32_t port) { enum PinFunction { GPIO, PWM }; -static uint32_t g_gpio_function[PINCOUNT] = { GPIO }; extern void __pinMode(uint8_t pin, uint8_t mode) { if(pin == 16) { diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp index 0906dbc4e..c4db82225 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp +++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp @@ -259,7 +259,7 @@ void ESP8266WebServer::_parseArguments(String data) Serial.print(" &@ "); Serial.println(next_arg_index); #endif - if (equal_sign_index == -1 || equal_sign_index > next_arg_index && next_arg_index != -1) { + if ((equal_sign_index == -1) || ((equal_sign_index > next_arg_index) && (next_arg_index != -1))) { #ifdef DEBUG Serial.print("arg missing value: "); Serial.println(iarg); diff --git a/libraries/ESP8266WiFi/src/lwip/mem_manager.h b/libraries/ESP8266WiFi/src/lwip/mem_manager.h index 185cc4a72..035596891 100644 --- a/libraries/ESP8266WiFi/src/lwip/mem_manager.h +++ b/libraries/ESP8266WiFi/src/lwip/mem_manager.h @@ -44,7 +44,7 @@ //#define configADJUSTED_HEAP_SIZE ( configTOTAL_HEAP_SIZE - portBYTE_ALIGNMENT ) //static unsigned char ucHeap[ configTOTAL_HEAP_SIZE ]; -static unsigned char *ucHeap; +//static unsigned char *ucHeap; typedef struct A_BLOCK_LINK { @@ -56,16 +56,16 @@ static const unsigned short heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + portBYTE_ //static const size_t xTotalHeapSize = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK ); -static xBlockLink xStart, *pxEnd = NULL; +//static xBlockLink xStart, *pxEnd = NULL; //static size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK ); /*------------------------º¯ÊýÉùÃ÷-----------------------------------*/ -static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR; +//static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR; -static void prvHeapInit( void ) ;//ICACHE_FLASH_ATTR; +//static void prvHeapInit( void ) ;//ICACHE_FLASH_ATTR; void vApplicationMallocFailedHook( void ) ;//ICACHE_FLASH_ATTR;