Skip to content

Commit df3f635

Browse files
committed
fix: formatting of HTTPServer
1 parent 963c966 commit df3f635

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

libraries/WebServer/src/HTTPServer.cpp

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -208,62 +208,62 @@ void HTTPServer::requestAuthentication(HTTPAuthMethod mode, const char* realm, c
208208
}
209209

210210
RequestHandler& HTTPServer::on(const Uri &uri, HTTPServer::THandlerFunction handler) {
211-
return on(uri, HTTP_ANY, handler);
211+
return on(uri, HTTP_ANY, handler);
212212
}
213213

214214
RequestHandler& HTTPServer::on(const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn) {
215-
return on(uri, method, fn, _fileUploadHandler);
215+
return on(uri, method, fn, _fileUploadHandler);
216216
}
217217

218218
RequestHandler& HTTPServer::on(const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn, HTTPServer::THandlerFunction ufn) {
219-
FunctionRequestHandler *handler = new FunctionRequestHandler(fn, ufn, uri, method);
220-
_addRequestHandler(handler);
221-
return *handler;
219+
FunctionRequestHandler *handler = new FunctionRequestHandler(fn, ufn, uri, method);
220+
_addRequestHandler(handler);
221+
return *handler;
222222
}
223223

224224
bool HTTPServer::removeRoute(const char *uri) {
225-
return removeRoute(String(uri), HTTP_ANY);
225+
return removeRoute(String(uri), HTTP_ANY);
226226
}
227227

228228
bool HTTPServer::removeRoute(const char *uri, HTTPMethod method) {
229-
return removeRoute(String(uri), method);
229+
return removeRoute(String(uri), method);
230230
}
231231

232232
bool HTTPServer::removeRoute(const String &uri) {
233-
return removeRoute(uri, HTTP_ANY);
233+
return removeRoute(uri, HTTP_ANY);
234234
}
235235

236236
bool HTTPServer::removeRoute(const String &uri, HTTPMethod method) {
237-
bool anyHandlerRemoved = false;
238-
RequestHandler *handler = _firstHandler;
239-
RequestHandler *previousHandler = nullptr;
240-
241-
while (handler) {
242-
if (handler->canHandle(method, uri)) {
243-
if (_removeRequestHandler(handler)) {
244-
anyHandlerRemoved = true;
245-
// Move to the next handler
246-
if (previousHandler) {
247-
handler = previousHandler->next();
248-
} else {
249-
handler = _firstHandler;
237+
bool anyHandlerRemoved = false;
238+
RequestHandler *handler = _firstHandler;
239+
RequestHandler *previousHandler = nullptr;
240+
241+
while (handler) {
242+
if (handler->canHandle(method, uri)) {
243+
if (_removeRequestHandler(handler)) {
244+
anyHandlerRemoved = true;
245+
// Move to the next handler
246+
if (previousHandler) {
247+
handler = previousHandler->next();
248+
} else {
249+
handler = _firstHandler;
250+
}
251+
continue;
252+
}
250253
}
251-
continue;
252-
}
254+
previousHandler = handler;
255+
handler = handler->next();
253256
}
254-
previousHandler = handler;
255-
handler = handler->next();
256-
}
257257

258-
return anyHandlerRemoved;
258+
return anyHandlerRemoved;
259259
}
260260

261261
void HTTPServer::addHandler(RequestHandler* handler) {
262262
_addRequestHandler(handler);
263263
}
264264

265265
bool HTTPServer::removeHandler(RequestHandler *handler) {
266-
return _removeRequestHandler(handler);
266+
return _removeRequestHandler(handler);
267267
}
268268

269269
void HTTPServer::_addRequestHandler(RequestHandler* handler) {
@@ -277,29 +277,29 @@ void HTTPServer::_addRequestHandler(RequestHandler* handler) {
277277
}
278278

279279
bool HTTPServer::_removeRequestHandler(RequestHandler *handler) {
280-
RequestHandler *current = _firstHandler;
281-
RequestHandler *previous = nullptr;
282-
283-
while (current != nullptr) {
284-
if (current == handler) {
285-
if (previous == nullptr) {
286-
_firstHandler = current->next();
287-
} else {
288-
previous->next(current->next());
289-
}
290-
291-
if (current == _lastHandler) {
292-
_lastHandler = previous;
293-
}
294-
295-
// Delete 'matching' handler
296-
delete current;
297-
return true;
298-
}
299-
previous = current;
300-
current = current->next();
301-
}
302-
return false;
280+
RequestHandler *current = _firstHandler;
281+
RequestHandler *previous = nullptr;
282+
283+
while (current != nullptr) {
284+
if (current == handler) {
285+
if (previous == nullptr) {
286+
_firstHandler = current->next();
287+
} else {
288+
previous->next(current->next());
289+
}
290+
291+
if (current == _lastHandler) {
292+
_lastHandler = previous;
293+
}
294+
295+
// Delete 'matching' handler
296+
delete current;
297+
return true;
298+
}
299+
previous = current;
300+
current = current->next();
301+
}
302+
return false;
303303
}
304304

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

0 commit comments

Comments
 (0)