Improve style

Author: PythonGermany

src/config/Config.cpp

@@ -96,8 +96,8 @@ std::string isListen(std::string const &value, size_t index) {
     port = value.substr(pos + 1);
   }
   if (isNumeric(port, index) != "") return "Invalid listen port";
-  if (ipv6 && address.empty()) return "Invalid listen ipv6 address";
-  if (!ipv6 && address.empty()) return "Invalid listen ipv4 address";
+  if (ipv6 == true && address.empty()) return "Invalid listen ipv6 address";
+  if (ipv6 == false && address.empty()) return "Invalid listen ipv4 address";
   return "";
 }
 

src/http/Http.cpp

@@ -36,14 +36,14 @@ void Http::OnRequestRecv(std::string msg) {
   parseRet |= _request.getUri().decode();
   accessLog_g.write("Decoded URI: " + _request.getUri().generate(), DEBUG);
 
-  bool validPath = !_request.getUri().resolveDots();
+  bool validPath = (_request.getUri().resolveDots() == false);
   accessLog_g.write("Resolved URI: " + _request.getUri().generate(), DEBUG);
 
   const Uri &uriRef = _request.getUri();
   validPath &= startsWith(uriRef.getPath(), "/") ||
                (_request.isMethod("OPTIONS") && uriRef.getPath() == "*");
 
-  if (parseRet || !validPath)
+  if (parseRet || validPath == false)
     processError("400", "Bad Request", true);
   else if (isHttpVersionValid(_request.getVersion()) == false) {
     processError("505", "HTTP Version Not Supported", true);
@@ -116,7 +116,8 @@ void Http::OnTrailerRecv(std::string msg) {
 
 void Http::OnBodyRecv(std::string msg) {
   if (_request.hasHeaderFieldValue("Transfer-Encoding", "chunked")) {
-    if (!endsWith(msg, "\r\n")) return processError("400", "Bad Request", true);
+    if (endsWith(msg, "\r\n") == false)
+      return processError("400", "Bad Request", true);
     msg.erase(msg.size() - 2, 2);
   }
   accessLog_g.write("HTTP body: '" + msg + "'", VERBOSE);
@@ -245,13 +246,13 @@ void Http::processFile(std::string uri) {
 
   // Set mime type
   std::string mimeType = VirtualHost::getMimeType(file.getExtension());
-  if (!mimeType.empty()) _response.setHeader("Content-Type", mimeType);
+  if (mimeType.empty() == false) _response.setHeader("Content-Type", mimeType);
   _response.setReady();
 }
 
 void Http::processCgi(std::string contentLength) {
   std::string pathname(cgiFilePathname);
-  if (!startsWith(pathname, "/")) pathname.insert(0, cwd_g);
+  if (startsWith(pathname, "/") == false) pathname.insert(0, cwd_g);
 
   std::vector<std::string> env;
   // const values:
@@ -328,7 +329,7 @@ void Http::processBodyRequest() {
     return processFile(_uri);
   else if (_request.isMethod("PUT")) {
     std::string path = _context->getDirective("root", true)[0][0] + _uri;
-    _newFile = !File(path).exists();
+    _newFile = (File(path).exists() == false);
 
     if (!File(File(path).getDir()).exists())
       return processError("404", "Not found");
@@ -504,14 +505,15 @@ void Http::addIndexToPath(File &file, std::string &uri) {
 }
 
 void Http::checkResourceValidity(const File &file, const std::string &uri) {
-  if (!file.exists()) return processError("404", "Not Found");
+  if (file.exists() == false) return processError("404", "Not Found");
   if (file.dir()) {
-    if (!endsWith(file.getPath(), "/")) return processRedirect(uri + "/");
+    if (endsWith(file.getPath(), "/") == false)
+      return processRedirect(uri + "/");
     if (_context->exists("autoindex", true) &&
         _context->getDirective("autoindex", true)[0][0] == "on")
       return processAutoindex(uri);
     return processError("403", "Forbidden");
-  } else if (!file.readable())
+  } else if (file.readable() == false)
     return processError("403", "Forbidden");
 }
 
@@ -622,7 +624,7 @@ bool Http::isBodySizeValid(size_t size) const {
 }
 
 std::string Http::getCgiPath(std::string extension) const {
-  if (!_context->exists("cgi", true)) return "";
+  if (_context->exists("cgi", true) == false) return "";
   std::vector<std::vector<std::string> > &cgis =
       _context->getDirective("cgi", true);
   for (size_t i = 0; i < cgis.size(); i++)

src/http/Request.cpp

@@ -80,7 +80,7 @@ int Request::parseRequestLine(std::string line) {
   if (_method.find_first_of(WHITESPACE) != std::string::npos ||
       _version.find_first_of(WHITESPACE) != std::string::npos)
     return 1;
-  if (!startsWith(_version, "HTTP/")) return 1;
+  if (startsWith(_version, "HTTP/") == false) return 1;
   return _uri.load(requestLineTokens[1]);
 }
 

src/http/Uri.cpp

@@ -117,7 +117,6 @@ std::string Uri::generate() const {
   return uri;
 }
 
-#include <iostream>
 int Uri::resolveDots() {
   std::list<std::string> blocks =
       split<std::list<std::string> >(_path, "/", true);

src/main.cpp

@@ -9,7 +9,7 @@
 static void initGlobals() {
   cwd_g = getcwd();
   if (cwd_g.empty()) throw std::runtime_error("getcwd(): Failed to init cwd");
-  if (!endsWith(cwd_g, "/")) cwd_g.append("/");
+  if (endsWith(cwd_g, "/") == false) cwd_g.append("/");
   try {
     accessLog_g.init(LOG_PATH);
     errorLog_g.init(LOG_ERROR_PATH);
@@ -44,12 +44,11 @@ int main(int argc, char** argv) {
     if (ret) return 0;
     Init::init(context);
     while (true) {
-      if (!Poll::poll()) break;
+      if (Poll::poll() == false) break;
     }
   } catch (const std::exception& e) {
     try {
-      if (errorLog_g.getLogToFile() == false)
-        Log::setLogToTerminal(true, true);
+      if (errorLog_g.getLogToFile() == false) Log::setLogToTerminal(true, true);
       errorLog_g.write(e.what(), ERROR);
       printHelp(PRINT);
     } catch (...) {

src/poll/Address.cpp

@@ -257,7 +257,7 @@ static std::ostream &operator<<(std::ostream &os, in6_addr const &src) {
     bool first = (i % 2 == 0);
 
     if (zeroField.second == 0 || i < zeroField.first || i > zeroField.second) {
-      if (!first) {
+      if (first == false) {
         if (addr[i - 1] != 0) os << std::setw(2) << std::setfill('0');
         os << (int)addr[i];
         if (i != 15) os << ':';

src/utils/utils.cpp

@@ -161,7 +161,7 @@ std::string getTime(std::string format, const time_t* timer) {
     std::time(&rawtime);
     timer = &rawtime;
   }
-  if (!endsWith(format, " GMT")) format += " GMT";
+  if (endsWith(format, " GMT") == false) format += " GMT";
   while (true) {
     std::string buffer(size, '\0');
     timeinfo = std::gmtime(timer);