arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

make compiler happier

Browse Source
This commit is contained in:
Me No Dev
2015-11-25 18:11:16 +02:00
parent dea1d46f80
commit a44632b8cf
11 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View File

@ -33,6 +33,7 @@
ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
: _server(addr, port)
, _currentMethod(HTTP_ANY)
, _currentHandler(0)
, _firstHandler(0)
, _lastHandler(0)
@ -40,11 +41,13 @@ ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
, _currentArgs(0)
, _headerKeysCount(0)
, _currentHeaders(0)
, _contentLength(0)
{
}
ESP8266WebServer::ESP8266WebServer(int port)
: _server(port)
, _currentMethod(HTTP_ANY)
, _currentHandler(0)
, _firstHandler(0)
, _lastHandler(0)
@ -52,6 +55,7 @@ ESP8266WebServer::ESP8266WebServer(int port)
, _currentArgs(0)
, _headerKeysCount(0)
, _currentHeaders(0)
, _contentLength(0)
{
}

22
libraries/ESP8266WebServer/src/ESP8266WebServer.h
View File

@ -146,23 +146,23 @@ protected:
HTTPMethod _currentMethod;
String _currentUri;
size_t _currentArgCount;
RequestArgument* _currentArgs;
HTTPUpload _currentUpload;
RequestArgument* _currentHeaders;
size_t _headerKeysCount;
size_t _contentLength;
String _responseHeaders;
String _hostHeader;
RequestHandler* _currentHandler;
RequestHandler* _firstHandler;
RequestHandler* _lastHandler;
THandlerFunction _notFoundHandler;
THandlerFunction _fileUploadHandler;
int _currentArgCount;
RequestArgument* _currentArgs;
HTTPUpload _currentUpload;
int _headerKeysCount;
RequestArgument* _currentHeaders;
size_t _contentLength;
String _responseHeaders;
String _hostHeader;
};

4
libraries/ESP8266WebServer/src/Parsing.cpp
View File

@ -203,7 +203,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
}
bool ESP8266WebServer::_collectHeader(const char* headerName, const char* headerValue) {
for (size_t i = 0; i < _headerKeysCount; i++) {
for (int i = 0; i < _headerKeysCount; i++) {
if (_currentHeaders[i].key==headerName) {
_currentHeaders[i].value=headerValue;
return true;
@ -226,7 +226,7 @@ void ESP8266WebServer::_parseArguments(String data) {
}
_currentArgCount = 1;
for (int i = 0; i < data.length(); ) {
for (int i = 0; i < (int)data.length(); ) {
i = data.indexOf('&', i);
if (i == -1)
break;

6
libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
View File

@ -44,10 +44,10 @@ public:
}
protected:
String _uri;
HTTPMethod _method;
ESP8266WebServer::THandlerFunction _fn;
ESP8266WebServer::THandlerFunction _ufn;
String _uri;
HTTPMethod _method;
};
class StaticRequestHandler : public RequestHandler {
@ -67,7 +67,7 @@ public:
if (requestMethod != HTTP_GET)
return false;
if (_isFile && requestUri != _uri || !requestUri.startsWith(_uri))
if ((_isFile && requestUri != _uri) || !requestUri.startsWith(_uri))
return false;
return true;