Browse Source

Code cleanup

yhirose 7 years ago
parent
commit
abf79d5a38
2 changed files with 5 additions and 7 deletions
  1. 1 1
      example/server.cc
  2. 4 6
      httplib.h

+ 1 - 1
example/server.cc

@@ -96,7 +96,7 @@ int main(void)
         res.set_content(dump_headers(req.headers), "text/plain");
         res.set_content(dump_headers(req.headers), "text/plain");
     });
     });
 
 
-    svr.Get("/stop", [&](const Request& /*req*/, Response& res) {
+    svr.Get("/stop", [&](const Request& /*req*/, Response& /*res*/) {
         svr.stop();
         svr.stop();
     });
     });
 
 

+ 4 - 6
httplib.h

@@ -1828,9 +1828,7 @@ inline bool Server::process_request(Stream& strm, bool last_connection, bool& co
         return true;
         return true;
     }
     }
 
 
-    auto ret = true;
     if (req.get_header_value("Connection") == "close") {
     if (req.get_header_value("Connection") == "close") {
-        // ret = false;
         connection_close = true;
         connection_close = true;
     }
     }
 
 
@@ -1841,7 +1839,7 @@ inline bool Server::process_request(Stream& strm, bool last_connection, bool& co
         if (!detail::read_content(strm, req)) {
         if (!detail::read_content(strm, req)) {
             res.status = 400;
             res.status = 400;
             write_response(strm, last_connection, req, res);
             write_response(strm, last_connection, req, res);
-            return ret;
+            return true;
         }
         }
 
 
         const auto& content_type = req.get_header_value("Content-Type");
         const auto& content_type = req.get_header_value("Content-Type");
@@ -1852,7 +1850,7 @@ inline bool Server::process_request(Stream& strm, bool last_connection, bool& co
 #else
 #else
             res.status = 415;
             res.status = 415;
             write_response(strm, last_connection, req, res);
             write_response(strm, last_connection, req, res);
-            return ret;
+            return true;
 #endif
 #endif
         }
         }
 
 
@@ -1864,7 +1862,7 @@ inline bool Server::process_request(Stream& strm, bool last_connection, bool& co
                 !detail::parse_multipart_formdata(boundary, req.body, req.files)) {
                 !detail::parse_multipart_formdata(boundary, req.body, req.files)) {
                 res.status = 400;
                 res.status = 400;
                 write_response(strm, last_connection, req, res);
                 write_response(strm, last_connection, req, res);
-                return ret;
+                return true;
             }
             }
         }
         }
     }
     }
@@ -1878,7 +1876,7 @@ inline bool Server::process_request(Stream& strm, bool last_connection, bool& co
     }
     }
 
 
     write_response(strm, last_connection, req, res);
     write_response(strm, last_connection, req, res);
-    return ret;
+    return true;
 }
 }
 
 
 inline bool Server::is_valid() const
 inline bool Server::is_valid() const