Further adjustments

Author: mathieucarbou

src/AsyncEventSource.cpp

@@ -358,12 +358,6 @@ void AsyncEventSourceClient::set_max_inflight_bytes(size_t value) {
 
 void AsyncEventSource::authorizeConnect(ArAuthorizeConnectHandler cb) {
   AsyncAuthorizationMiddleware *m = new AsyncAuthorizationMiddleware(401, cb);
-  if (!m) {
-#ifdef ESP32
-    log_e("Failed to allocate");
-#endif
-    return;
-  }
   m->_freeOnRemoval = true;
   addMiddleware(m);
 }

src/AsyncWebSocket.cpp

@@ -1270,23 +1270,11 @@ void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request) {
 }
 
 AsyncWebSocketMessageBuffer *AsyncWebSocket::makeBuffer(size_t size) {
-  AsyncWebSocketMessageBuffer *buffer = new AsyncWebSocketMessageBuffer(size);
-  if (buffer->length() != size) {
-    delete buffer;
-    return nullptr;
-  } else {
-    return buffer;
-  }
+  return new AsyncWebSocketMessageBuffer(size);
 }
 
 AsyncWebSocketMessageBuffer *AsyncWebSocket::makeBuffer(const uint8_t *data, size_t size) {
-  AsyncWebSocketMessageBuffer *buffer = new AsyncWebSocketMessageBuffer(data, size);
-  if (buffer->length() != size) {
-    delete buffer;
-    return nullptr;
-  } else {
-    return buffer;
-  }
+  return new AsyncWebSocketMessageBuffer(data, size);
 }
 
 /*

src/Middleware.cpp

@@ -14,12 +14,6 @@ AsyncMiddlewareChain::~AsyncMiddlewareChain() {
 
 void AsyncMiddlewareChain::addMiddleware(ArMiddlewareCallback fn) {
   AsyncMiddlewareFunction *m = new AsyncMiddlewareFunction(fn);
-  if (!m) {
-#ifdef ESP32
-    log_e("Failed to allocate");
-#endif
-    return;
-  }
   m->_freeOnRemoval = true;
   _middlewares.emplace_back(m);
 }

src/WebHandlers.cpp

@@ -13,12 +13,6 @@ AsyncWebHandler &AsyncWebHandler::setFilter(ArRequestFilterFunction fn) {
 AsyncWebHandler &AsyncWebHandler::setAuthentication(const char *username, const char *password, AsyncAuthType authMethod) {
   if (!_authMiddleware) {
     _authMiddleware = new AsyncAuthenticationMiddleware();
-    if (!_authMiddleware) {
-#ifdef ESP32
-      log_e("Failed to allocate");
-#endif
-      return *this;
-    }
     _authMiddleware->_freeOnRemoval = true;
     addMiddleware(_authMiddleware);
   }

src/WebServer.cpp

@@ -30,12 +30,6 @@ const char *fs::FileOpenMode::append = "a";
 
 AsyncWebServer::AsyncWebServer(uint16_t port) : _server(port) {
   _catchAllHandler = new AsyncCallbackWebHandler();
-  if (!_catchAllHandler) {
-#ifdef ESP32
-    log_e("Failed to allocate");
-#endif
-    return;
-  }
   _server.onClient(
     [](void *s, AsyncClient *c) {
       if (c == NULL) {
@@ -168,21 +162,15 @@ AsyncStaticWebHandler &AsyncWebServer::serveStatic(const char *uri, fs::FS &fs,
 }
 
 void AsyncWebServer::onNotFound(ArRequestHandlerFunction fn) {
-  if (_catchAllHandler) {
-    _catchAllHandler->onRequest(fn);
-  }
+  _catchAllHandler->onRequest(fn);
 }
 
 void AsyncWebServer::onFileUpload(ArUploadHandlerFunction fn) {
-  if (_catchAllHandler) {
-    _catchAllHandler->onUpload(fn);
-  }
+  _catchAllHandler->onUpload(fn);
 }
 
 void AsyncWebServer::onRequestBody(ArBodyHandlerFunction fn) {
-  if (_catchAllHandler) {
-    _catchAllHandler->onBody(fn);
-  }
+  _catchAllHandler->onBody(fn);
 }
 
 AsyncWebHandler &AsyncWebServer::catchAllHandler() const {
@@ -193,9 +181,7 @@ void AsyncWebServer::reset() {
   _rewrites.clear();
   _handlers.clear();
 
-  if (_catchAllHandler) {
-    _catchAllHandler->onRequest(NULL);
-    _catchAllHandler->onUpload(NULL);
-    _catchAllHandler->onBody(NULL);
-  }
+  _catchAllHandler->onRequest(NULL);
+  _catchAllHandler->onUpload(NULL);
+  _catchAllHandler->onBody(NULL);
 }