Replaced NULL with nullptr, removed constant value attribute initialization from the initializer list
This commit is contained in:
parent
365b7764a2
commit
453f4cdd6e
@ -13,7 +13,7 @@ template <typename T>
|
||||
class TCPServer
|
||||
{
|
||||
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();
|
||||
}
|
||||
@ -108,12 +108,12 @@ class TCPServer
|
||||
|
||||
_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)
|
||||
{
|
||||
_currentClient->closeConnection();
|
||||
delete _currentClient; _currentClient = NULL;
|
||||
delete _currentClient; _currentClient = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -125,7 +125,7 @@ class TCPServer
|
||||
|
||||
virtual void getClientData()
|
||||
{
|
||||
if(_currentClient == NULL)
|
||||
if(_currentClient == nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@ -170,7 +170,7 @@ class TCPServer
|
||||
Serial.printf("TCPServer : Client was discarded : %u\n", _currentClient->_id);
|
||||
#endif
|
||||
delete _currentClient;
|
||||
_currentClient = NULL;
|
||||
_currentClient = nullptr;
|
||||
|
||||
return;
|
||||
}
|
||||
@ -204,11 +204,11 @@ class TCPServer
|
||||
return freeId;
|
||||
}
|
||||
|
||||
boolean _serverStarted;
|
||||
boolean _serverStarted = true;
|
||||
uint8_t _maxClient, _TKACount = 0;
|
||||
uint16_t _clientDataBufferSize, _TKAIdleSec = 0, _TKAIntvSec = 0;
|
||||
WiFiServer _wifiServer;
|
||||
T *_currentClient; //current client to be processed
|
||||
T *_currentClient = nullptr; //current client to be processed
|
||||
List<T> _clientList;
|
||||
private:
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user