Template container instead of direct pointer manipulation. (#95)

* using Container instead ofdirect pointers list manipulation

* fixed different type of virtual methods.

* Fixed typo in conditional

* Renamed ListArray to LinkedList

* Const reference to String as method parameters to prevent additional copy and memory allocation when String passed by value

* fix 'min' redefinition

* removed #include <iterator>
begin/end methods it's enough for 'for( : )' loop
count() renamed to length()
spacing fixing

* Const reference to String as method parameters to prevent additional copy and memory allocation when String passed by value

* Fixed unused params warnings

Author: nut-code-monkey

examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino

@@ -189,7 +189,7 @@ void setup(){
 
     request->send(404);
   });
-  server.onFileUpload([](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+  server.onFileUpload([](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final){
     if(!index)
       Serial.printf("UploadStart: %s\n", filename.c_str());
     Serial.printf("%s", (const char*)data);

src/AsyncEventSource.cpp

@@ -110,7 +110,6 @@ AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, A
   _client = request->client();
   _server = server;
   _lastId = 0;
-  next = NULL;
   if(request->hasHeader("Last-Event-ID"))
     _lastId = atoi(request->getHeader("Last-Event-ID")->value().c_str());
 
@@ -119,7 +118,7 @@ AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, A
   _client->onAck(NULL, NULL);
   _client->onPoll(NULL, NULL);
   _client->onData(NULL, NULL);
-  _client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
+  _client->onTimeout([](void *r, AsyncClient* c __attribute__((unused)), uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
   _client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onDisconnect(); delete c; }, this);
   _server->_addClient(this);
   delete request;
@@ -129,7 +128,7 @@ AsyncEventSourceClient::~AsyncEventSourceClient(){
   close();
 }
 
-void AsyncEventSourceClient::_onTimeout(uint32_t time){
+void AsyncEventSourceClient::_onTimeout(uint32_t time __attribute__((unused))){
   _client->close(true);
 }
 
@@ -161,9 +160,9 @@ void AsyncEventSourceClient::send(const char *message, const char *event, uint32
 
 // Handler
 
-AsyncEventSource::AsyncEventSource(String url)
+AsyncEventSource::AsyncEventSource(const String& url)
   : _url(url)
-  , _clients(NULL)
+  , _clients(LinkedList<AsyncEventSourceClient *>([](AsyncEventSourceClient *c){ delete c; }))
   , _connectcb(NULL)
 {}
 
@@ -188,68 +187,38 @@ void AsyncEventSource::_addClient(AsyncEventSourceClient * client){
     client->write((const char *)temp, 2053);
     free(temp);
   }*/
-  if(_clients == NULL){
-    _clients = client;
-    if(_connectcb)
-      _connectcb(client);
-    return;
-  }
-  AsyncEventSourceClient * c = _clients;
-  while(c->next != NULL) c = c->next;
-  c->next = client;
+  
+  _clients.add(client);
   if(_connectcb)
     _connectcb(client);
 }
 
 void AsyncEventSource::_handleDisconnect(AsyncEventSourceClient * client){
-  if(_clients == NULL){
-    return;
-  }
-  if(_clients == client){
-    _clients = client->next;
-    delete client;
-    return;
-  }
-  AsyncEventSourceClient * c = _clients;
-  while(c->next != NULL && c->next != client) c = c->next;
-  if(c->next == NULL){
-    return;
-  }
-  c->next = client->next;
-  delete client;
+  _clients.remove(client);
 }
 
 void AsyncEventSource::close(){
-  AsyncEventSourceClient * c = _clients;
-  while(c != NULL){
+  for(const auto &c: _clients){
     if(c->connected())
       c->close();
-    c = c->next;
   }
 }
 
 void AsyncEventSource::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  if(_clients == NULL)
+  if(_clients.isEmpty())
     return;
 
   String ev = generateEventMessage(message, event, id, reconnect);
-  AsyncEventSourceClient * c = _clients;
-  while(c != NULL){
+  for(const auto &c: _clients){
     if(c->connected())
       c->write(ev.c_str(), ev.length());
-    c = c->next;
   }
 }
 
-size_t AsyncEventSource::count(){
-  size_t i = 0;
-  AsyncEventSourceClient * c = _clients;
-  while(c != NULL){
-    if(c->connected())
-      i++;
-    c = c->next;
-  }
-  return i;
+size_t AsyncEventSource::count() const {
+  return _clients.count_if([](AsyncEventSourceClient *c){
+    return c->connected();
+  });
 }
 
 bool AsyncEventSource::canHandle(AsyncWebServerRequest *request){
@@ -280,7 +249,7 @@ void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request){
   _state = RESPONSE_WAIT_ACK;
 }
 
-size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time __attribute__((unused))){
   if(len){
     new AsyncEventSourceClient(request, _server);
   }

src/AsyncEventSource.h

@@ -36,7 +36,6 @@ class AsyncEventSourceClient {
     uint32_t _lastId;
 
   public:
-    AsyncEventSourceClient * next;
 
     AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
     ~AsyncEventSourceClient();
@@ -45,8 +44,8 @@ class AsyncEventSourceClient {
     void close();
     void write(const char * message, size_t len);
     void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    bool connected(){ return (_client != NULL) && _client->connected(); }
-    uint32_t lastId(){ return _lastId; }
+    bool connected() const { return (_client != NULL) && _client->connected(); }
+    uint32_t lastId() const { return _lastId; }
 
     //system callbacks (do not call)
     void _onTimeout(uint32_t time);
@@ -56,23 +55,23 @@ class AsyncEventSourceClient {
 class AsyncEventSource: public AsyncWebHandler {
   private:
     String _url;
-    AsyncEventSourceClient * _clients;
+    LinkedList<AsyncEventSourceClient *> _clients;
     ArEventHandlerFunction _connectcb;
   public:
-    AsyncEventSource(String url);
+    AsyncEventSource(const String& url);
     ~AsyncEventSource();
 
-    const char * url(){ return _url.c_str(); }
+    const char * url() const { return _url.c_str(); }
     void close();
     void onConnect(ArEventHandlerFunction cb);
     void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    size_t count(); //number clinets connected
+    size_t count() const; //number clinets connected
 
     //system callbacks (do not call)
     void _addClient(AsyncEventSourceClient * client);
     void _handleDisconnect(AsyncEventSourceClient * client);
-    bool canHandle(AsyncWebServerRequest *request);
-    void handleRequest(AsyncWebServerRequest *request);
+    virtual bool canHandle(AsyncWebServerRequest *request) override final;
+    virtual void handleRequest(AsyncWebServerRequest *request) override final;
 };
 
 class AsyncEventSourceResponse: public AsyncWebServerResponse {

src/AsyncJson.h

@@ -69,7 +69,7 @@ class AsyncJsonResponse: public AsyncAbstractResponse {
     size_t setLength() {
       _contentLength = _root.measureLength();
       if (_contentLength) { _isValid = true; }
-      return _contentLength; 
+      return _contentLength;
     }
 
     size_t _fillBuffer(uint8_t *data, size_t len){