Remove specific exceptions.

etr · etr · commit 768dec32c014 · 2018-12-23T08:01:07.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -377,7 +377,7 @@ ip_representation::ip_representation(const std::string& ip)
                 {
                     if(y != 12)
                     {
-                        throw bad_ip_format_exception();
+                        throw std::invalid_argument("IP is badly formatted");
                     }
                     if(parts[i].find('.') != std::string::npos)
                     {
@@ -403,12 +403,12 @@ ip_representation::ip_representation(const std::string& ip)
                         }
                         else
                         {
-                            throw bad_ip_format_exception();
+                            throw std::invalid_argument("IP is badly formatted");
                         }
                     }
                     else
                     {
-                        throw bad_ip_format_exception();
+                        throw std::invalid_argument("IP is badly formatted");
                     }
                 }
             }
@@ -434,7 +434,7 @@ ip_representation::ip_representation(const std::string& ip)
                 }
                 else
                 {
-                    throw bad_ip_format_exception();
+                    throw std::invalid_argument("IP is badly formatted");
                 }
             }
         }
@@ -459,7 +459,7 @@ ip_representation::ip_representation(const std::string& ip)
         }
         else
         {
-            throw bad_ip_format_exception();
+            throw std::invalid_argument("IP is badly formatted");
         }
     }
 }
@@ -497,7 +497,7 @@ char* load_file (const char *filename)
         return content;
     }
     else
-        throw file_access_exception();
+        throw std::invalid_argument("Unable to open file");
     return content;
 }
 
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -42,22 +42,6 @@
 namespace httpserver {
 namespace http {
 
-class bad_ip_format_exception: public std::exception
-{
-    virtual const char* what() const throw()
-    {
-        return "IP is badly formatted!";
-    }
-};
-
-class file_access_exception: public std::exception
-{
-    virtual const char* what() const throw()
-    {
-        return "Unable to open file!";
-    }
-};
-
 class http_utils
 {
     public:
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <stdexcept>
 
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
 #include <winsock2.h>
@@ -904,7 +905,7 @@ int webserver::finalize_answer(
         {
             mr->dhrs->get_raw_response(&raw_response, this);
         }
-        catch(const file_access_exception& fae)
+        catch(const std::invalid_argument& iae)
         {
             mr->dhrs = NEW_OR_MOVE(http_response, not_found_page(mr));
             mr->dhrs->get_raw_response(&raw_response, this);

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ ip_representation::ip_representation(const std::string& ip)`
`377`	`377`	`{`
`378`	`378`	`if(y != 12)`
`379`	`379`	`{`
`380`		`- throw bad_ip_format_exception();`
	`380`	`+ throw std::invalid_argument("IP is badly formatted");`
`381`	`381`	`}`
`382`	`382`	`if(parts[i].find('.') != std::string::npos)`
`383`	`383`	`{`
`@@ -403,12 +403,12 @@ ip_representation::ip_representation(const std::string& ip)`
`403`	`403`	`}`
`404`	`404`	`else`
`405`	`405`	`{`
`406`		`- throw bad_ip_format_exception();`
	`406`	`+ throw std::invalid_argument("IP is badly formatted");`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`	`else`
`410`	`410`	`{`
`411`		`- throw bad_ip_format_exception();`
	`411`	`+ throw std::invalid_argument("IP is badly formatted");`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`	`}`
`@@ -434,7 +434,7 @@ ip_representation::ip_representation(const std::string& ip)`
`434`	`434`	`}`
`435`	`435`	`else`
`436`	`436`	`{`
`437`		`- throw bad_ip_format_exception();`
	`437`	`+ throw std::invalid_argument("IP is badly formatted");`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`	`}`
`@@ -459,7 +459,7 @@ ip_representation::ip_representation(const std::string& ip)`
`459`	`459`	`}`
`460`	`460`	`else`
`461`	`461`	`{`
`462`		`- throw bad_ip_format_exception();`
	`462`	`+ throw std::invalid_argument("IP is badly formatted");`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`	`}`
`@@ -497,7 +497,7 @@ char* load_file (const char *filename)`
`497`	`497`	`return content;`
`498`	`498`	`}`
`499`	`499`	`else`
`500`		`- throw file_access_exception();`
	`500`	`+ throw std::invalid_argument("Unable to open file");`
`501`	`501`	`return content;`
`502`	`502`	`}`
`503`	`503`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include <sys/stat.h>`
`29`	`29`	`#include <sys/types.h>`
`30`	`30`	`#include <sys/time.h>`
	`31`	`+#include <stdexcept>`
`31`	`32`
`32`	`33`	`#if defined(__MINGW32__) \|\| defined(__CYGWIN32__)`
`33`	`34`	`#include <winsock2.h>`
`@@ -904,7 +905,7 @@ int webserver::finalize_answer(`
`904`	`905`	`{`
`905`	`906`	`mr->dhrs->get_raw_response(&raw_response, this);`
`906`	`907`	`}`
`907`		`- catch(const file_access_exception& fae)`
	`908`	`+ catch(const std::invalid_argument& iae)`
`908`	`909`	`{`
`909`	`910`	`mr->dhrs = NEW_OR_MOVE(http_response, not_found_page(mr));`
`910`	`911`	`mr->dhrs->get_raw_response(&raw_response, this);`