Skip to content

Commit

Permalink
fix: formatting of HTTPServer
Browse files Browse the repository at this point in the history
  • Loading branch information
ayushsharma82 committed Jun 13, 2024
1 parent 963c966 commit df3f635
Showing 1 changed file with 51 additions and 51 deletions.
102 changes: 51 additions & 51 deletions libraries/WebServer/src/HTTPServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,62 +208,62 @@ void HTTPServer::requestAuthentication(HTTPAuthMethod mode, const char* realm, c
}

RequestHandler& HTTPServer::on(const Uri &uri, HTTPServer::THandlerFunction handler) {
return on(uri, HTTP_ANY, handler);
return on(uri, HTTP_ANY, handler);
}

RequestHandler& HTTPServer::on(const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn) {
return on(uri, method, fn, _fileUploadHandler);
return on(uri, method, fn, _fileUploadHandler);
}

RequestHandler& HTTPServer::on(const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn, HTTPServer::THandlerFunction ufn) {
FunctionRequestHandler *handler = new FunctionRequestHandler(fn, ufn, uri, method);
_addRequestHandler(handler);
return *handler;
FunctionRequestHandler *handler = new FunctionRequestHandler(fn, ufn, uri, method);
_addRequestHandler(handler);
return *handler;
}

bool HTTPServer::removeRoute(const char *uri) {
return removeRoute(String(uri), HTTP_ANY);
return removeRoute(String(uri), HTTP_ANY);
}

bool HTTPServer::removeRoute(const char *uri, HTTPMethod method) {
return removeRoute(String(uri), method);
return removeRoute(String(uri), method);
}

bool HTTPServer::removeRoute(const String &uri) {
return removeRoute(uri, HTTP_ANY);
return removeRoute(uri, HTTP_ANY);
}

bool HTTPServer::removeRoute(const String &uri, HTTPMethod method) {
bool anyHandlerRemoved = false;
RequestHandler *handler = _firstHandler;
RequestHandler *previousHandler = nullptr;

while (handler) {
if (handler->canHandle(method, uri)) {
if (_removeRequestHandler(handler)) {
anyHandlerRemoved = true;
// Move to the next handler
if (previousHandler) {
handler = previousHandler->next();
} else {
handler = _firstHandler;
bool anyHandlerRemoved = false;
RequestHandler *handler = _firstHandler;
RequestHandler *previousHandler = nullptr;

while (handler) {
if (handler->canHandle(method, uri)) {
if (_removeRequestHandler(handler)) {
anyHandlerRemoved = true;
// Move to the next handler
if (previousHandler) {
handler = previousHandler->next();
} else {
handler = _firstHandler;
}
continue;
}
}
continue;
}
previousHandler = handler;
handler = handler->next();
}
previousHandler = handler;
handler = handler->next();
}

return anyHandlerRemoved;
return anyHandlerRemoved;
}

void HTTPServer::addHandler(RequestHandler* handler) {
_addRequestHandler(handler);
}

bool HTTPServer::removeHandler(RequestHandler *handler) {
return _removeRequestHandler(handler);
return _removeRequestHandler(handler);
}

void HTTPServer::_addRequestHandler(RequestHandler* handler) {
Expand All @@ -277,29 +277,29 @@ void HTTPServer::_addRequestHandler(RequestHandler* handler) {
}

bool HTTPServer::_removeRequestHandler(RequestHandler *handler) {
RequestHandler *current = _firstHandler;
RequestHandler *previous = nullptr;

while (current != nullptr) {
if (current == handler) {
if (previous == nullptr) {
_firstHandler = current->next();
} else {
previous->next(current->next());
}

if (current == _lastHandler) {
_lastHandler = previous;
}

// Delete 'matching' handler
delete current;
return true;
}
previous = current;
current = current->next();
}
return false;
RequestHandler *current = _firstHandler;
RequestHandler *previous = nullptr;

while (current != nullptr) {
if (current == handler) {
if (previous == nullptr) {
_firstHandler = current->next();
} else {
previous->next(current->next());
}

if (current == _lastHandler) {
_lastHandler = previous;
}

// Delete 'matching' handler
delete current;
return true;
}
previous = current;
current = current->next();
}
return false;
}

void HTTPServer::serveStatic(const char* uri, FS& fs, const char* path, const char* cache_header) {
Expand Down

0 comments on commit df3f635

Please sign in to comment.