Simplification fixes

Author: RamseyK

src/ResourceHost.cpp

@@ -144,15 +144,13 @@ std::unique_ptr<Resource> ResourceHost::readFile(std::string const& path, struct
  */
 std::unique_ptr<Resource> ResourceHost::readDirectory(std::string path, struct stat const& sb) {
     // Make the path end with a / (for consistency) if it doesnt already
-    if (path.empty() || path[path.length() - 1] != '/')
+    if (!path.ends_with('/'))
         path += "/";
 
     // Probe for valid indexes
-    uint32_t numIndexes = std::size(g_validIndexes);
-    std::string loadIndex;
-    struct stat sidx = {0};
-    for (uint32_t i = 0; i < numIndexes; i++) {
-        loadIndex = path + g_validIndexes[i];
+    for (auto const& idx : g_validIndexes) {
+        std::string loadIndex = path + idx;
+        struct stat sidx = {0};
         // Found a suitable index file to load and return to the client
         if (stat(loadIndex.c_str(), &sidx) == 0)
             return readFile(loadIndex, sidx);

src/main.cpp

@@ -44,27 +44,22 @@ int main()
 {
     // Parse config file
     std::map<std::string, std::string, std::less<>> config;
-    std::fstream cfile;
-    std::string line;
-    std::string key;
-    std::string val;
-    int32_t epos = 0;
-    cfile.open("server.config");
+    std::ifstream cfile("server.config");
     if (!cfile.is_open()) {
         std::print("Unable to open server.config file in working directory\n");
         return -1;
     }
+    std::string line;
     while (getline(cfile, line)) {
         // Skip empty lines or those beginning with a #
         if (line.length() == 0 || line.rfind("#", 0) == 0)
             continue;
 
-        epos = line.find("=");
-        key = line.substr(0, epos);
-        val = line.substr(epos + 1, line.length());
+        size_t epos = line.find("=");
+        std::string key = line.substr(0, epos);
+        std::string val = line.substr(epos + 1, line.length());
         config.try_emplace(key, val);
     }
-    cfile.close();
 
     // Validate at least vhost, port, and diskpath are present
     if (!config.contains("vhost") || !config.contains("port") || !config.contains("diskpath")) {