From 7aea91bd423065cb6eefd4581f383444e4b66cfc Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Wed, 23 Oct 2024 14:36:10 +0200 Subject: [PATCH] Code cleanup --- src/ESPAsyncWebServer.h | 23 ++++++++++------------- src/WebRequest.cpp | 2 +- src/WebResponses.cpp | 4 +--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h index d5d55a1..15a60d1 100644 --- a/src/ESPAsyncWebServer.h +++ b/src/ESPAsyncWebServer.h @@ -140,7 +140,6 @@ class AsyncWebHeader { String _value; public: - AsyncWebHeader() = default; AsyncWebHeader(const AsyncWebHeader&) = default; AsyncWebHeader(const char* name, const char* value) : _name(name), _value(value) {} AsyncWebHeader(const String& name, const String& value) : _name(name), _value(value) {} @@ -739,14 +738,12 @@ class AsyncWebHandler : public AsyncMiddlewareChain { public: AsyncWebHandler() {} + virtual ~AsyncWebHandler() {} AsyncWebHandler& setFilter(ArRequestFilterFunction fn); AsyncWebHandler& setAuthentication(const char* username, const char* password); AsyncWebHandler& setAuthentication(const String& username, const String& password) { return setAuthentication(username.c_str(), password.c_str()); }; bool filter(AsyncWebServerRequest* request) { return _filter == NULL || _filter(request); } - virtual ~AsyncWebHandler() {} - virtual bool canHandle(AsyncWebServerRequest* request __attribute__((unused))) const { - return false; - } + virtual bool canHandle(AsyncWebServerRequest* request __attribute__((unused))) const { return false; } virtual void handleRequest(__unused AsyncWebServerRequest* request) {} virtual void handleUpload(__unused AsyncWebServerRequest* request, __unused const String& filename, __unused size_t index, __unused uint8_t* data, __unused size_t len, __unused bool final) {} virtual void handleBody(__unused AsyncWebServerRequest* request, __unused uint8_t* data, __unused size_t len, __unused size_t index, __unused size_t total) {} @@ -789,18 +786,18 @@ class AsyncWebServerResponse { public: AsyncWebServerResponse(); - virtual ~AsyncWebServerResponse(); - virtual void setCode(int code); + virtual ~AsyncWebServerResponse() {} + void setCode(int code); int code() const { return _code; } - virtual void setContentLength(size_t len); + void setContentLength(size_t len); void setContentType(const String& type) { setContentType(type.c_str()); } - virtual void setContentType(const char* type); - virtual bool addHeader(const char* name, const char* value, bool replaceExisting = true); + void setContentType(const char* type); + bool addHeader(const char* name, const char* value, bool replaceExisting = true); bool addHeader(const String& name, const String& value, bool replaceExisting = true) { return addHeader(name.c_str(), value.c_str(), replaceExisting); } bool addHeader(const char* name, long value, bool replaceExisting = true) { return addHeader(name, String(value), replaceExisting); } bool addHeader(const String& name, long value, bool replaceExisting = true) { return addHeader(name.c_str(), value, replaceExisting); } - virtual bool removeHeader(const char* name); - virtual const AsyncWebHeader* getHeader(const char* name) const; + bool removeHeader(const char* name); + const AsyncWebHeader* getHeader(const char* name) const; const std::list& getHeaders() const { return _headers; } #ifndef ESP8266 @@ -811,7 +808,7 @@ class AsyncWebServerResponse { _assembleHead(buffer, version); return buffer; } - virtual void _assembleHead(String& buffer, uint8_t version); + void _assembleHead(String& buffer, uint8_t version); virtual bool _started() const; virtual bool _finished() const; diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp index 7b745ab..f399dc3 100644 --- a/src/WebRequest.cpp +++ b/src/WebRequest.cpp @@ -49,7 +49,7 @@ AsyncWebServerRequest::~AsyncWebServerRequest() { _pathParams.clear(); - AsyncWebServerResponse* r = _response + AsyncWebServerResponse* r = _response; _response = NULL; delete r; diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp index e7edf5e..e683176 100644 --- a/src/WebResponses.cpp +++ b/src/WebResponses.cpp @@ -225,8 +225,6 @@ AsyncWebServerResponse::AsyncWebServerResponse() } } -AsyncWebServerResponse::~AsyncWebServerResponse() = default; - void AsyncWebServerResponse::setCode(int code) { if (_state == RESPONSE_SETUP) _code = code; @@ -871,7 +869,7 @@ AsyncResponseStream::AsyncResponseStream(const char* contentType, size_t bufferS _content = std::unique_ptr(new cbuf(bufferSize)); // std::make_unique(bufferSize); } -AsyncResponseStream::~AsyncResponseStream() = default; +AsyncResponseStream::~AsyncResponseStream() {}; size_t AsyncResponseStream::_fillBuffer(uint8_t* buf, size_t maxLen) { return _content->read((char*)buf, maxLen);