small changes for more readability

lkabuci · Jan 19, 2024 · 63f8cd5 · 63f8cd5
1 parent 9641d0a
commit 63f8cd5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/include/IRC.h b/include/IRC.h
@@ -28,6 +28,7 @@ extern volatile sig_atomic_t serverIsRunning;
 #include <poll.h>
 #include <string>
 #include <sys/socket.h>
+#include <algorithm>
 #include <unistd.h>
 #include <vector>
 

diff --git a/srcs/Utils/Utils.cpp b/srcs/Utils/Utils.cpp
@@ -1,4 +1,5 @@
 #include "Utils.hpp"
+#include <cstdlib>
 #include <sstream>
 
 std::string Utils::join(const std::vector<std::string>& arr) {
@@ -19,9 +20,11 @@ std::string Utils::join(const std::vector<std::string>& arr) {
 }
 
 std::string Utils::toStr(int nbr) {
-    std::stringstream ss(nbr);
-
-    return ss.str();
+    std::string        ret;
+    std::ostringstream convert;
+    convert << nbr;
+    ret = convert.str();
+    return ret;
 }
 
 bool Utils::isAllDigits(const char* str) {

diff --git a/srcs/server/Reactor.cpp b/srcs/server/Reactor.cpp
@@ -15,10 +15,6 @@ Reactor::~Reactor() {
          it != _clients.end(); ++it) {
         delete *it;
     }
-    for (std::vector<pollfd>::iterator it = _pollfds.begin();
-         it != _pollfds.end(); ++it) {
-        close(it->fd);
-    }
     _clients.clear();
     _pollfds.clear();
 }

diff --git a/srcs/server/Server.cpp b/srcs/server/Server.cpp
@@ -19,3 +19,7 @@ void Server::run() {
 const char* Server::getPasswd() const {
     return _passwd;
 }
+Server::~Server() {
+    std::cout << "Closing server\n";
+    close(_sock.getSocketFd());
+}
diff --git a/srcs/server/Server.hpp b/srcs/server/Server.hpp
@@ -12,6 +12,7 @@
 class Server {
   public:
     explicit Server(const char* port, const char* passwd);
+    ~Server();
     void        run();
     const char* getPasswd() const;