me-no-dev/ESPAsyncWebServer
1
0
Fork 1
mirror of https://github.com/me-no-dev/ESPAsyncWebServer.git synced 2025-08-02 12:14:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Mathieu Carbou
2024-10-23 14:36:10 +02:00
parent b152719851
commit 7aea91bd42
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ESPAsyncWebServer.h
View File

@@ -140,7 +140,6 @@ class AsyncWebHeader {
String _value; String _value;
public: public:
AsyncWebHeader() = default;
AsyncWebHeader(const AsyncWebHeader&) = default; AsyncWebHeader(const AsyncWebHeader&) = default;
AsyncWebHeader(const char* name, const char* value) : _name(name), _value(value) {} AsyncWebHeader(const char* name, const char* value) : _name(name), _value(value) {}
AsyncWebHeader(const String& name, const String& 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: public:
AsyncWebHandler() {} AsyncWebHandler() {}
virtual ~AsyncWebHandler() {}
AsyncWebHandler& setFilter(ArRequestFilterFunction fn); AsyncWebHandler& setFilter(ArRequestFilterFunction fn);
AsyncWebHandler& setAuthentication(const char* username, const char* password); AsyncWebHandler& setAuthentication(const char* username, const char* password);
AsyncWebHandler& setAuthentication(const String& username, const String& password) { return setAuthentication(username.c_str(), password.c_str()); }; 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); } 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 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 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) {} 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: public:
AsyncWebServerResponse(); AsyncWebServerResponse();
virtual ~AsyncWebServerResponse(); virtual ~AsyncWebServerResponse() {}
virtual void setCode(int code); void setCode(int code);
int code() const { return _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()); } void setContentType(const String& type) { setContentType(type.c_str()); }
virtual void setContentType(const char* type); void setContentType(const char* type);
virtual bool addHeader(const char* name, const char* value, bool replaceExisting = true); 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 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 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); } bool addHeader(const String& name, long value, bool replaceExisting = true) { return addHeader(name.c_str(), value, replaceExisting); }
virtual bool removeHeader(const char* name); bool removeHeader(const char* name);
virtual const AsyncWebHeader* getHeader(const char* name) const; const AsyncWebHeader* getHeader(const char* name) const;
const std::list<AsyncWebHeader>& getHeaders() const { return _headers; } const std::list<AsyncWebHeader>& getHeaders() const { return _headers; }
#ifndef ESP8266 #ifndef ESP8266
@@ -811,7 +808,7 @@ class AsyncWebServerResponse {
_assembleHead(buffer, version); _assembleHead(buffer, version);
return buffer; return buffer;
} }
virtual void _assembleHead(String& buffer, uint8_t version); void _assembleHead(String& buffer, uint8_t version);
virtual bool _started() const; virtual bool _started() const;
virtual bool _finished() const; virtual bool _finished() const;

2
src/WebRequest.cpp
View File

@@ -49,7 +49,7 @@ AsyncWebServerRequest::~AsyncWebServerRequest() {
_pathParams.clear(); _pathParams.clear();
AsyncWebServerResponse* r = _response AsyncWebServerResponse* r = _response;
_response = NULL; _response = NULL;
delete r; delete r;

4
src/WebResponses.cpp
View File

@@ -225,8 +225,6 @@ AsyncWebServerResponse::AsyncWebServerResponse()
} }
} }
AsyncWebServerResponse::~AsyncWebServerResponse() = default;
void AsyncWebServerResponse::setCode(int code) { void AsyncWebServerResponse::setCode(int code) {
if (_state == RESPONSE_SETUP) if (_state == RESPONSE_SETUP)
_code = code; _code = code;
@@ -871,7 +869,7 @@ AsyncResponseStream::AsyncResponseStream(const char* contentType, size_t bufferS
_content = std::unique_ptr<cbuf>(new cbuf(bufferSize)); // std::make_unique<cbuf>(bufferSize); _content = std::unique_ptr<cbuf>(new cbuf(bufferSize)); // std::make_unique<cbuf>(bufferSize);
} }
AsyncResponseStream::~AsyncResponseStream() = default; AsyncResponseStream::~AsyncResponseStream() {};
size_t AsyncResponseStream::_fillBuffer(uint8_t* buf, size_t maxLen) { size_t AsyncResponseStream::_fillBuffer(uint8_t* buf, size_t maxLen) {
return _content->read((char*)buf, maxLen); return _content->read((char*)buf, maxLen);