Changed Arg hasArg hasHeader from const char * to String

hallard · hallard · commit c74a7703d2aa · 2016-02-03T12:04:03.000+01:00
This permet calling these with const char *, String or PGM_P type
parameter
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -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,22 +395,14 @@ 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;
   }
   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,24 +439,14 @@ 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;
   }
   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;
 }
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -87,20 +87,17 @@ class ESP8266WebServer
   WiFiClient client() { return _currentClient; }
   HTTPUpload& upload() { return _currentUpload; }
 
-  String arg(const char* name);   // get request argument value by name
-  String arg_P(PGM_P name);       // get request argument value by name
+  String arg(String name);        // get request argument value by name
   String arg(int i);              // get request argument value by number
   String argName(int i);          // get request argument name by number
   int args();                     // get arguments count
-  bool hasArg(const char* name);  // check if argument exists
-  bool hasArg_P(PGM_P name);      // check if argument exists
+  bool hasArg(String name);       // check if argument exists
   void collectHeaders(const char* headerKeys[], const size_t headerKeysCount); // set the request headers to collect
   String header(const char* name);   // get request header value by name
   String header(int i);              // get request header value by number
   String headerName(int i);          // get request header name by number
   int headers();                     // get header count
-  bool hasHeader(const char* name);  // check if header exists
-  bool hasHeader_P(PGM_P name);      // check if header exists
+  bool hasHeader(String name);       // check if header exists
 
   String hostHeader();            // get request host header if available or empty String if not
 
