diff --git a/src/app/CFGParameterValue.cpp b/src/app/CFGParameterValue.cpp index 706a0a3..366424a 100644 --- a/src/app/CFGParameterValue.cpp +++ b/src/app/CFGParameterValue.cpp @@ -1,11 +1,11 @@ #include "CFGParameterValue.h" -CFGParameterValue::CFGParameterValue():DictionaryInterface(),_parameter(NULL), _value(NULL), _quotedParameter(false), _quotedValue(false) +CFGParameterValue::CFGParameterValue() : DictionaryInterface() { } -CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, boolean quotedParameter, boolean quotedValue):_quotedParameter(quotedParameter), _quotedValue(quotedValue) +CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, boolean quotedParameter, boolean quotedValue) : DictionaryInterface(), _quotedParameter(quotedParameter), _quotedValue(quotedValue) { _parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character @@ -14,7 +14,7 @@ CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, b strcpy(_value, value); } -CFGParameterValue::CFGParameterValue(const char *parameter, const char *value):CFGParameterValue() +CFGParameterValue::CFGParameterValue(const char *parameter, const char *value) : CFGParameterValue() { _parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character @@ -23,7 +23,7 @@ CFGParameterValue::CFGParameterValue(const char *parameter, const char *value):C strcpy(_value, value); } -CFGParameterValue::CFGParameterValue(const CFGParameterValue &Object) +CFGParameterValue::CFGParameterValue(const CFGParameterValue &Object) : DictionaryInterface() { _parameter = (char *) malloc((strlen(Object._parameter) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(Object._value) * sizeof(char)) + 1); //+1 for the string terminating character diff --git a/src/app/CFGParameterValue.h b/src/app/CFGParameterValue.h index 3085676..740526d 100644 --- a/src/app/CFGParameterValue.h +++ b/src/app/CFGParameterValue.h @@ -29,18 +29,18 @@ public: const char *getParameter() const{return _parameter == NULL ? "" : _parameter;} bool isQuotedParameter()const{return _quotedParameter;} bool isQuotedValue()const{return _quotedValue;} - virtual const char *toString() + virtual const char *toString() { return _value; } void setValue(const char *value, bool isQuoted); protected: private: - char *_parameter; - char *_value; + char *_parameter = NULL; + char *_value = NULL; - bool _quotedParameter; - bool _quotedValue; + bool _quotedParameter = false; + bool _quotedValue = false; }; diff --git a/src/app/HttpClient.cpp b/src/app/HttpClient.cpp index a62c177..31bf450 100644 --- a/src/app/HttpClient.cpp +++ b/src/app/HttpClient.cpp @@ -7,11 +7,9 @@ * End of HttpClientHelper */ -HttpClient::HttpClient(const char *address, uint16_t port, uint32_t timeout) : WiFiClient(), _connectionStatus(NO_ATTEMPT), _resource(NULL), _pAddress(address), _port(0), _keepAlive(false), _maxRetries(-1), _retries(0), _isIp(false), _httpCode(HTTP_CODE::UNDEFINED_CODE), _httpCodeParsed(false) +HttpClient::HttpClient(const char *address, uint16_t port, uint32_t timeout) : WiFiClient(), _pAddress(address), _port(port) { - _port = port; setTimeout(timeout); - connectByHostOrIp(); } @@ -24,7 +22,7 @@ HttpClient::HttpClient(const char *address, const char *resource, uint16_t port, } } -HttpClient::HttpClient(const HttpClient &object) +HttpClient::HttpClient(const HttpClient &object) : WiFiClient() { if(object._resource != NULL) { diff --git a/src/app/HttpClient.h b/src/app/HttpClient.h index f4a7fa7..949bd64 100644 --- a/src/app/HttpClient.h +++ b/src/app/HttpClient.h @@ -49,16 +49,16 @@ class HttpClient : public WiFiClient, public HttpConstants void sendHeader(HttpMIMEType contentType = HttpMIMEType::UNKNOWN_MIME, uint64_t contentLength = 0, Dictionary *headerData = NULL, HttpVersion httpVersion = HttpVersion::HTTP_1_1); uint64_t computeBodyLength(Dictionary *data); - ConnectionStatus _connectionStatus; - char *_resource; + ConnectionStatus _connectionStatus = NO_ATTEMPT; + char *_resource = NULL; const char *_pAddress; uint16_t _port; - boolean _keepAlive; - int16_t _maxRetries; - uint16_t _retries; - boolean _isIp; - HTTP_CODE _httpCode; - boolean _httpCodeParsed; + boolean _keepAlive = false; + int16_t _maxRetries = -1; + uint16_t _retries = 0; + boolean _isIp = false; + HTTP_CODE _httpCode = HTTP_CODE::UNDEFINED_CODE; + boolean _httpCodeParsed = false; }; #endif //HTTPCLIENT_H diff --git a/src/app/ScreenManager.cpp b/src/app/ScreenManager.cpp index 0ed0f9a..3bb16c3 100644 --- a/src/app/ScreenManager.cpp +++ b/src/app/ScreenManager.cpp @@ -3,10 +3,10 @@ ScreenManager::ScreenManager(Adafruit_SSD1306 &display, SDCardManager *sdCardManager) : _displayRef(display), _error(OK) , _displayColorInverted(false), _displayDimmed(false), _enabled(true), _refreshRateHz(1), _refreshInterval(1000), _timeRef(0),_forceRefresh(false) , _currentView(NO_CURRENT_VIEW), _tail(NULL) -, _viewNotFound{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} -, _viewFuncUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} -, _currentViewUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} -, _viewFunctionFailedToExecute{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} +, _viewNotFound{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL} +, _viewFuncUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL} +, _currentViewUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL} +, _viewFunctionFailedToExecute{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL} ,_sdCardManager(sdCardManager) { _viewLinkedList = (ViewLinkedList) createEmptyList(); @@ -72,7 +72,7 @@ void ScreenManager::setDefault() boolean ScreenManager::addView(boolean (*viewLogicFunction)(Adafruit_SSD1306&, void*), void *pData, const unsigned char UID) { - ViewLink viewLink ={viewLogicFunction, pData, UID, NULL, NULL}; + ViewLink viewLink = {viewLogicFunction, pData, UID, NULL, NULL}; return addNewLinkAtTheEnd(&_viewLinkedList, viewLink); }