Codebase modernization

RamseyK · RamseyK · commit 0c34c8e80112 · 2025-01-03T22:42:04.000-05:00
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp
@@ -48,13 +48,6 @@ ByteBuffer::ByteBuffer(const byte* arr, unsigned int size) {
     }
 }
 
-/**
- * ByteBuffer Deconstructor
- *
- */
-ByteBuffer::~ByteBuffer() {
-}
-
 /**
  * Bytes Remaining
  * Returns the number of bytes from the current read position till the end of the buffer
diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h
@@ -19,9 +19,6 @@
 #ifndef _BYTEBUFFER_H_
 #define _BYTEBUFFER_H_
 
-// Default number of bytes to allocate in the backing buffer if no size is provided
-constexpr unsigned int DEFAULT_SIZE = 4096;
-
 // If defined, utility functions within the class are enabled
 #define BB_UTILITY
 
@@ -36,6 +33,9 @@ constexpr unsigned int DEFAULT_SIZE = 4096;
 
 using byte = unsigned char;
 
+// Default number of bytes to allocate in the backing buffer if no size is provided
+constexpr unsigned int DEFAULT_SIZE = 4096;
+
 class ByteBuffer {
 private:
     unsigned int rpos = 0;
@@ -80,7 +80,7 @@ class ByteBuffer {
 public:
     explicit ByteBuffer(unsigned int size = DEFAULT_SIZE);
     explicit ByteBuffer(const byte* arr, unsigned int size);
-    virtual ~ByteBuffer();
+    virtual ~ByteBuffer() = default;
 
     unsigned int bytesRemaining() const; // Number of bytes from the current read position till the end of the buffer
     void clear(); // Clear our the vector and reset read and write positions
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -145,8 +145,8 @@ void HTTPServer::stop() {
 
     if (listenSocket != INVALID_SOCKET) {
         // Close all open connections and delete Client's from memory
-        for (auto& x : clientMap)
-            disconnectClient(x.second, false);
+        for (auto& [clfd, cl] : clientMap)
+            disconnectClient(cl, false);
 
         // Clear the map
         clientMap.clear();
@@ -519,8 +519,7 @@ void HTTPServer::handleGet(Client* cl, HTTPRequest* req) {
             dc = true;
 
         // If Connection: close is specified, the connection should be terminated after the request is serviced
-        std::string connection_val = req->getHeaderValue("Connection");
-        if (connection_val.compare("close") == 0)
+        if (auto con_val = req->getHeaderValue("Connection"); con_val.compare("close") == 0)
             dc = true;
 
         sendResponse(cl, resp, dc);
diff --git a/src/Resource.h b/src/Resource.h
@@ -72,17 +72,15 @@ class Resource {
     // Get the file name
     std::string getName() const {
         std::string name = "";
-        size_t slash_pos = location.find_last_of("/");
-        if (slash_pos != std::string::npos)
+        if (auto slash_pos = location.find_last_of("/"); slash_pos != std::string::npos)
             name = location.substr(slash_pos + 1);
         return name;
     }
 
     // Get the file extension
     std::string getExtension() const {
         std::string ext = "";
-        size_t ext_pos = location.find_last_of(".");
-        if (ext_pos != std::string::npos)
+        if (auto ext_pos = location.find_last_of("."); ext_pos != std::string::npos)
             ext = location.substr(ext_pos + 1);
         return ext;
     }
diff --git a/src/ResourceHost.cpp b/src/ResourceHost.cpp
@@ -22,9 +22,6 @@ ResourceHost::ResourceHost(std::string const& base) : baseDiskPath(base) {
     // TODO: Check to see if the baseDiskPath is a valid path
 }
 
-ResourceHost::~ResourceHost() {
-}
-
 /**
  * Looks up a MIME type in the dictionary
  *
@@ -89,10 +86,11 @@ Resource* ResourceHost::readFile(std::string const& path, struct stat const& sb)
     }
 
     std::string mimetype = lookupMimeType(res->getExtension());
-    if (mimetype.length() != 0)
+    if (mimetype.length() != 0) {
         res->setMimeType(mimetype);
-    else
+    } else {
         res->setMimeType("application/octet-stream");  // default to binary
+    }
 
     res->setData(fdata, len);
 
diff --git a/src/ResourceHost.h b/src/ResourceHost.h
@@ -64,7 +64,7 @@ class ResourceHost {
 
 public:
 	explicit ResourceHost(std::string const& base);
-	~ResourceHost();
+	~ResourceHost() = default;
 
 	// Write a resource to the file system
 	void putResource(Resource* res, bool writeToDisk);
diff --git a/src/main.cpp b/src/main.cpp
@@ -25,7 +25,7 @@
 #include "HTTPServer.h"
 #include "ResourceHost.h"
 
-static HTTPServer* svr;
+static std::unique_ptr<HTTPServer> svr;
 
 // Ignore signals with this function
 void handleSigPipe([[maybe_unused]] int snum) {
@@ -42,9 +42,12 @@ int main()
     // Parse config file
     std::map<std::string, std::string> config;
     std::fstream cfile;
-    std::string line, key, val;
+    std::string line;
+    std::string key;
+    std::string val;
     int epos = 0;
-    int drop_uid = 0, drop_gid = 0;
+    int drop_uid = 0;
+    int drop_gid = 0;
     cfile.open("server.config");
     if (!cfile.is_open()) {
         std::cout << "Unable to open server.config file in working directory" << std::endl;
@@ -101,10 +104,9 @@ int main()
     signal(SIGTERM, &handleTermSig);
 
     // Instantiate and start the server
-    svr = new HTTPServer(vhosts, atoi(config["port"].c_str()), config["diskpath"], drop_uid, drop_gid);
+    svr = std::make_unique<HTTPServer>(vhosts, atoi(config["port"].c_str()), config["diskpath"], drop_uid, drop_gid);
     if (!svr->start()) {
         svr->stop();
-        delete svr;
         return -1;
     }
 
@@ -113,7 +115,6 @@ int main()
 
     // Stop the server
     svr->stop();
-    delete svr;
 
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,6 @@ ByteBuffer::ByteBuffer(const byte* arr, unsigned int size) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-/**`
`52`		`- * ByteBuffer Deconstructor`
`53`		`- *`
`54`		`- */`
`55`		`-ByteBuffer::~ByteBuffer() {`
`56`		`-}`
`57`		`-`
`58`	`51`	`/**`
`59`	`52`	`* Bytes Remaining`
`60`	`53`	`* Returns the number of bytes from the current read position till the end of the buffer`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@ ResourceHost::ResourceHost(std::string const& base) : baseDiskPath(base) {`
`22`	`22`	`// TODO: Check to see if the baseDiskPath is a valid path`
`23`	`23`	`}`
`24`	`24`
`25`		`-ResourceHost::~ResourceHost() {`
`26`		`-}`
`27`		`-`
`28`	`25`	`/**`
`29`	`26`	`* Looks up a MIME type in the dictionary`
`30`	`27`	`*`
`@@ -89,10 +86,11 @@ Resource* ResourceHost::readFile(std::string const& path, struct stat const& sb)`
`89`	`86`	`}`
`90`	`87`
`91`	`88`	`std::string mimetype = lookupMimeType(res->getExtension());`
`92`		`- if (mimetype.length() != 0)`
	`89`	`+ if (mimetype.length() != 0) {`
`93`	`90`	`res->setMimeType(mimetype);`
`94`		`- else`
	`91`	`+ } else {`
`95`	`92`	`res->setMimeType("application/octet-stream"); // default to binary`
	`93`	`+ }`
`96`	`94`
`97`	`95`	`res->setData(fdata, len);`
`98`	`96`