From 79856e655432a30f5bba2e8d7adecdc3626ce94f Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 14 Aug 2017 14:54:58 -0700
Subject: MAINT-7634: Feedback from code review, move enum to string converter
 to own function.

---
 indra/llcorehttp/_httpoprequest.cpp | 38 +++++++++++++++++++------------------
 indra/llcorehttp/_httpoprequest.h   |  4 +++-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index 36955f3797..f526af37b5 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -247,24 +247,7 @@ void HttpOpRequest::visitNotifier(HttpRequest * request)
 		response->setHeaders(mReplyHeaders);
         response->setRequestURL(mReqURL);
 
-        std::string method("UNKNOWN");
-
-        if (mReqMethod == HOR_COPY)
-            method = "COPY";
-        else if (mReqMethod == HOR_DELETE)
-            method = "DELETE";
-        else if (mReqMethod == HOR_GET)
-            method = "GET";
-        else if (mReqMethod == HOR_MOVE)
-            method = "MOVE";
-        else if (mReqMethod == HOR_PATCH)
-            method = "PATCH";
-        else if (mReqMethod == HOR_POST)
-            method = "POST";
-        else if (mReqMethod == HOR_PUT)
-            method = "PUT";
-
-        response->setRequestMethod(method);
+        response->setRequestMethod(methodToString(mReqMethod));
 
         if (mReplyOffset || mReplyLength)
 		{
@@ -1161,6 +1144,25 @@ int HttpOpRequest::debugCallback(CURL * handle, curl_infotype info, char * buffe
 	return 0;
 }
 
+std::string HttpOpRequest::methodToString(const HttpOpRequest::EMethod &e)
+{
+    if (e == HOR_COPY)
+        return "COPY";
+    else if (e == HOR_DELETE)
+        return  "DELETE";
+    else if (e == HOR_GET)
+        return "GET";
+    else if (e == HOR_MOVE)
+        return "MOVE";
+    else if (e == HOR_PATCH)
+        return "PATCH";
+    else if (e == HOR_POST)
+        return "POST";
+    else if (e == HOR_PUT)
+        return "PUT";
+
+    return "UNKNOWN";
+}
 
 }   // end namespace LLCore
 
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index dbcc57d0fd..201c37d5c3 100644
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -87,7 +87,8 @@ public:
         HOR_COPY,
         HOR_MOVE
 	};
-	
+    static std::string methodToString(const EMethod &);
+
 	virtual void stageFromRequest(HttpService *);
 	virtual void stageFromReady(HttpService *);
 	virtual void stageFromActive(HttpService *);
@@ -235,6 +236,7 @@ public:
 };  // end class HttpOpRequest
 
 
+
 /// HttpOpRequestCompare isn't an operation but a uniform comparison
 /// functor for STL containers that order by priority.  Mainly
 /// used for the ready queue container but defined here.
-- 
cgit v1.2.3