Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced NULL with nullptr, removed constant value attribute initialization from the initializer list

Browse Source
This commit is contained in:
Th3maz1ng 2022-04-17 21:48:56 +02:00
parent 365b7764a2
commit 453f4cdd6e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/TCPServer.h
View File

@ -13,7 +13,7 @@ template <typename T>
class TCPServer class TCPServer
{ {
public: public:
TCPServer(uint16_t port = 80, uint8_t maxClient = MAX_CLIENT, uint16_t clientDataBufferSize = 255) : _serverStarted(true), _maxClient(maxClient), _clientDataBufferSize(clientDataBufferSize), _wifiServer(port), _currentClient(NULL) TCPServer(uint16_t port = 80, uint8_t maxClient = MAX_CLIENT, uint16_t clientDataBufferSize = 256) : _maxClient(maxClient), _clientDataBufferSize(clientDataBufferSize), _wifiServer(port)
{ {
_wifiServer.begin(); _wifiServer.begin();
} }
@ -108,12 +108,12 @@ class TCPServer
_currentClient = _clientList.removeLastRef();//We pick a client in the list to process it's request _currentClient = _clientList.removeLastRef();//We pick a client in the list to process it's request
if(_currentClient != NULL) if(_currentClient != nullptr)
{ {
if(_currentClient->_error != TCPClient::OK) if(_currentClient->_error != TCPClient::OK)
{ {
_currentClient->closeConnection(); _currentClient->closeConnection();
delete _currentClient; _currentClient = NULL; delete _currentClient; _currentClient = nullptr;
} }
} }
} }
@ -125,7 +125,7 @@ class TCPServer
virtual void getClientData() virtual void getClientData()
{ {
if(_currentClient == NULL) if(_currentClient == nullptr)
{ {
return; return;
} }
@ -170,7 +170,7 @@ class TCPServer
Serial.printf("TCPServer : Client was discarded : %u\n", _currentClient->_id); Serial.printf("TCPServer : Client was discarded : %u\n", _currentClient->_id);
#endif #endif
delete _currentClient; delete _currentClient;
_currentClient = NULL; _currentClient = nullptr;
return; return;
} }
@ -204,11 +204,11 @@ class TCPServer
return freeId; return freeId;
} }
boolean _serverStarted; boolean _serverStarted = true;
uint8_t _maxClient, _TKACount = 0; uint8_t _maxClient, _TKACount = 0;
uint16_t _clientDataBufferSize, _TKAIdleSec = 0, _TKAIntvSec = 0; uint16_t _clientDataBufferSize, _TKAIdleSec = 0, _TKAIntvSec = 0;
WiFiServer _wifiServer; WiFiServer _wifiServer;
T *_currentClient; //current client to be processed T *_currentClient = nullptr; //current client to be processed
List<T> _clientList; List<T> _clientList;
private: private:
}; };