From 792cda4b52a073b06d3a227424e41227d2075b44 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Thu, 18 Sep 2025 17:45:42 +0200 Subject: [PATCH] client: add NOLINT comments for array usage and buffer handling server: mark handleRequest as const and add NOLINT for array index --- webserv/client/Client.cpp | 11 ++++++----- webserv/server/Server.cpp | 4 ++-- webserv/server/Server.hpp | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/webserv/client/Client.cpp b/webserv/client/Client.cpp index ac19a86..694ada3 100644 --- a/webserv/client/Client.cpp +++ b/webserv/client/Client.cpp @@ -13,7 +13,7 @@ Client::~Client() server.removeFromEpoll(*client_socket_); }; -int Client::parseHeaderforContentLength(const std::string &request) +int Client::parseHeaderforContentLength(const std::string &request) //NOLINT { std::string header = "Content-Length: "; size_t pos = request.find(header); @@ -33,8 +33,9 @@ int Client::parseHeaderforContentLength(const std::string &request) void Client::request() { - char buffer[9] = {}; - ssize_t bytesRead = client_socket_->recv(buffer, sizeof(buffer) - 1); + char buffer[9] = {}; // NOLINT(cppcoreguidelines-avoid-c-arrays) + ssize_t bytesRead = + client_socket_->recv(buffer, sizeof(buffer) - 1); // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay) if (bytesRead < 0) { perror("Read error"); @@ -46,8 +47,8 @@ void Client::request() return; } - buffer[bytesRead] = '\0'; // Null-terminate the buffer - requestBuffer_ += buffer; + buffer[bytesRead] = '\0'; // NOLINT(cppcoreguidelines-pro-bounds-constant-array-index) + requestBuffer_ += buffer; // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay) if (header_.empty()) { auto headerEnd = requestBuffer_.find("\r\n\r\n"); diff --git a/webserv/server/Server.cpp b/webserv/server/Server.cpp index 4930dec..1d69c1e 100644 --- a/webserv/server/Server.cpp +++ b/webserv/server/Server.cpp @@ -138,7 +138,7 @@ const ServerConfig &Server::getConfig(int fd) const throw std::runtime_error("Config not found for fd: " + std::to_string(fd)); } -void Server::handleRequest(struct epoll_event *event) +void Server::handleRequest(struct epoll_event *event) const { int client_fd = event->data.fd; @@ -172,7 +172,7 @@ void Server::eventLoop() } for (int i = 0; i < nfds; ++i) { - epoll_event &event = events[i]; + epoll_event &event = events[i]; // NOLINT(cppcoreguidelines-pro-bounds-constant-array-index) if ((event.events & EPOLLERR) > 0 || (event.events & EPOLLHUP) > 0) { std::cerr << "Epoll error on fd " << event.data.fd << '\n'; diff --git a/webserv/server/Server.hpp b/webserv/server/Server.hpp index 839505c..9112647 100644 --- a/webserv/server/Server.hpp +++ b/webserv/server/Server.hpp @@ -31,7 +31,7 @@ class Server void removeFromEpoll(const Socket &socket) const ; void setupServerSocket(const ServerConfig &config); void handleConnection(struct epoll_event *event); - void handleRequest(struct epoll_event *event); + void handleRequest(struct epoll_event *event) const; void responseReady(int client_fd) const; void eventLoop(); Socket &getListener(int fd) const;