From 7fd3b9491b0e553aa7d60a68bda82968a79da8f5 Mon Sep 17 00:00:00 2001 From: JoaoAJMatos Date: Thu, 8 Dec 2022 17:31:14 +0000 Subject: [PATCH 1/2] refactor: Deleted unreachable code in httpserver.cpp Removed all break statements from both RequestMethodString and GetRequestMethod functions as they were unreachable --- src/httpserver.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 1a19555f76..3531039f74 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -192,16 +192,12 @@ std::string RequestMethodString(HTTPRequest::RequestMethod m) switch (m) { case HTTPRequest::GET: return "GET"; - break; case HTTPRequest::POST: return "POST"; - break; case HTTPRequest::HEAD: return "HEAD"; - break; case HTTPRequest::PUT: return "PUT"; - break; default: return "unknown"; } @@ -626,19 +622,14 @@ HTTPRequest::RequestMethod HTTPRequest::GetRequestMethod() const switch (evhttp_request_get_command(req)) { case EVHTTP_REQ_GET: return GET; - break; case EVHTTP_REQ_POST: return POST; - break; case EVHTTP_REQ_HEAD: return HEAD; - break; case EVHTTP_REQ_PUT: return PUT; - break; default: return UNKNOWN; - break; } } From 8f5c560e11a9f3c7c5877f444caa605bdc296e81 Mon Sep 17 00:00:00 2001 From: JoaoAJMatos Date: Thu, 8 Dec 2022 17:40:02 +0000 Subject: [PATCH 2/2] refactor: Refactored RequestMethodString function to follow developer notes Removed the default case in the switch statement in order to comply with the Developer Notes --- src/httpserver.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 3531039f74..6f84d5c83b 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -198,9 +198,10 @@ std::string RequestMethodString(HTTPRequest::RequestMethod m) return "HEAD"; case HTTPRequest::PUT: return "PUT"; - default: + case HTTPRequest::UNKNOWN: return "unknown"; - } + } // no default case, so the compiler can warn about missing cases + assert(false); } /** HTTP request callback */