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

Changed Arg hasArg hasHeader from const char * to String

Browse Source 
This permet calling these with const char *, String or PGM_P type
parameter
This commit is contained in:
Charles
2016-02-03 12:04:03 +01:00
parent 090c3e3533
commit c74a7703d2
2 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,18 +370,10 @@ void ESP8266WebServer::sendContent_P(PGM_P content, size_t size) {
}
}
String ESP8266WebServer::arg(const char* name) {
for (int i = 0; i < _currentArgCount; ++i) {
if (_currentArgs[i].key == name)
return _currentArgs[i].value;
}
return String();
}
String ESP8266WebServer::arg_P(PGM_P name) {
String argname = name; // Copy to RAM, avoid loop search compare from flash
String ESP8266WebServer::arg(String name) {
for (int i = 0; i < _currentArgCount; ++i) {
if ( _currentArgs[i].key == argname )
if ( _currentArgs[i].key == name )
return _currentArgs[i].value;
}
return String();
@ -403,7 +395,7 @@ int ESP8266WebServer::args() {
return _currentArgCount;
}
bool ESP8266WebServer::hasArg(const char* name) {
bool ESP8266WebServer::hasArg(String name) {
for (int i = 0; i < _currentArgCount; ++i) {
if (_currentArgs[i].key == name)
return true;
@ -411,14 +403,6 @@ bool ESP8266WebServer::hasArg(const char* name) {
return false;
}
bool ESP8266WebServer::hasArg_P(PGM_P name) {
String argname = name; // Copy to RAM, avoid loop search compare from flash
for (int i = 0; i < _currentArgCount; ++i) {
if ( _currentArgs[i].key == argname )
return true;
}
return false;
}
String ESP8266WebServer::header(const char* name) {
for (int i = 0; i < _headerKeysCount; ++i) {
@ -455,7 +439,7 @@ int ESP8266WebServer::headers() {
return _headerKeysCount;
}
bool ESP8266WebServer::hasHeader(const char* name) {
bool ESP8266WebServer::hasHeader(String name) {
for (int i = 0; i < _headerKeysCount; ++i) {
if ((_currentHeaders[i].key == name) && (_currentHeaders[i].value.length() > 0))
return true;
@ -463,16 +447,6 @@ bool ESP8266WebServer::hasHeader(const char* name) {
return false;
}
bool ESP8266WebServer::hasHeader_P(PGM_P name) {
String argname = name; // Copy to RAM, avoid loop search compare from flash
for (int i = 0; i < _headerKeysCount; ++i) {
if ((_currentHeaders[i].key == argname ) && (_currentHeaders[i].value.length() > 0))
return true;
}
return false;
}
String ESP8266WebServer::hostHeader() {
return _hostHeader;
}