diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-08 14:49:08 -0700 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-08 14:49:08 -0700 | 
| commit | 75b12d79e1aeeef297182e4419df7022ede485f3 (patch) | |
| tree | d55c6d1e5e626ed96b3d21a3f74d86f1940bffa4 | |
| parent | fed4463cb90efc29525128db21a16899b63fbcc0 (diff) | |
Enforcing constness of refs
| -rwxr-xr-x | indra/llcorehttp/_httpoprequest.cpp | 32 | ||||
| -rwxr-xr-x | indra/llcorehttp/_httpoprequest.h | 32 | ||||
| -rwxr-xr-x | indra/llcorehttp/httprequest.cpp | 28 | ||||
| -rwxr-xr-x | indra/llcorehttp/httprequest.h | 28 | ||||
| -rw-r--r-- | indra/llmessage/llcorehttputil.cpp | 12 | ||||
| -rw-r--r-- | indra/llmessage/llcorehttputil.h | 34 | 
6 files changed, 83 insertions, 83 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index 7baef25aca..e588ed8a9b 100755 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -281,8 +281,8 @@ HttpStatus HttpOpRequest::cancel()  HttpStatus HttpOpRequest::setupGet(HttpRequest::policy_t policy_id,  								   HttpRequest::priority_t priority,  								   const std::string & url, -                                   HttpOptions::ptr_t & options, -								   HttpHeaders::ptr_t & headers) +                                   const HttpOptions::ptr_t & options, +								   const HttpHeaders::ptr_t & headers)  {  	setupCommon(policy_id, priority, url, NULL, options, headers);  	mReqMethod = HOR_GET; @@ -296,8 +296,8 @@ HttpStatus HttpOpRequest::setupGetByteRange(HttpRequest::policy_t policy_id,  											const std::string & url,  											size_t offset,  											size_t len, -                                            HttpOptions::ptr_t & options, -                                            HttpHeaders::ptr_t & headers) +                                            const HttpOptions::ptr_t & options, +                                            const HttpHeaders::ptr_t & headers)  {  	setupCommon(policy_id, priority, url, NULL, options, headers);  	mReqMethod = HOR_GET; @@ -316,8 +316,8 @@ HttpStatus HttpOpRequest::setupPost(HttpRequest::policy_t policy_id,  									HttpRequest::priority_t priority,  									const std::string & url,  									BufferArray * body, -                                    HttpOptions::ptr_t & options, -                                    HttpHeaders::ptr_t & headers) +                                    const HttpOptions::ptr_t & options, +                                    const HttpHeaders::ptr_t & headers)  {  	setupCommon(policy_id, priority, url, body, options, headers);  	mReqMethod = HOR_POST; @@ -330,8 +330,8 @@ HttpStatus HttpOpRequest::setupPut(HttpRequest::policy_t policy_id,  								   HttpRequest::priority_t priority,  								   const std::string & url,  								   BufferArray * body, -                                   HttpOptions::ptr_t & options, -								   HttpHeaders::ptr_t & headers) +                                   const HttpOptions::ptr_t & options, +								   const HttpHeaders::ptr_t & headers)  {  	setupCommon(policy_id, priority, url, body, options, headers);  	mReqMethod = HOR_PUT; @@ -343,8 +343,8 @@ HttpStatus HttpOpRequest::setupPut(HttpRequest::policy_t policy_id,  HttpStatus HttpOpRequest::setupDelete(HttpRequest::policy_t policy_id,      HttpRequest::priority_t priority,      const std::string & url, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t & headers) +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t & headers)  {      setupCommon(policy_id, priority, url, NULL, options, headers);      mReqMethod = HOR_DELETE; @@ -357,8 +357,8 @@ HttpStatus HttpOpRequest::setupPatch(HttpRequest::policy_t policy_id,      HttpRequest::priority_t priority,      const std::string & url,      BufferArray * body, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t & headers) +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t & headers)  {      setupCommon(policy_id, priority, url, body, options, headers);      mReqMethod = HOR_PATCH; @@ -370,8 +370,8 @@ HttpStatus HttpOpRequest::setupPatch(HttpRequest::policy_t policy_id,  HttpStatus HttpOpRequest::setupCopy(HttpRequest::policy_t policy_id,      HttpRequest::priority_t priority,      const std::string & url, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t &headers) +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t &headers)  {      setupCommon(policy_id, priority, url, NULL, options, headers);      mReqMethod = HOR_COPY; @@ -384,8 +384,8 @@ void HttpOpRequest::setupCommon(HttpRequest::policy_t policy_id,  								HttpRequest::priority_t priority,  								const std::string & url,  								BufferArray * body, -                                HttpOptions::ptr_t & options, -								HttpHeaders::ptr_t & headers) +                                const HttpOptions::ptr_t & options, +								const HttpHeaders::ptr_t & headers)  {  	mProcFlags = 0U;  	mReqPolicy = policy_id; diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h index 42db71e7a0..a9083be02b 100755 --- a/indra/llcorehttp/_httpoprequest.h +++ b/indra/llcorehttp/_httpoprequest.h @@ -104,49 +104,49 @@ public:  	HttpStatus setupGet(HttpRequest::policy_t policy_id,  						HttpRequest::priority_t priority,  						const std::string & url, -						HttpOptions::ptr_t & options, -						HttpHeaders::ptr_t & headers); +						const HttpOptions::ptr_t & options, +						const HttpHeaders::ptr_t & headers);  	HttpStatus setupGetByteRange(HttpRequest::policy_t policy_id,  								 HttpRequest::priority_t priority,  								 const std::string & url,  								 size_t offset,  								 size_t len, -                                 HttpOptions::ptr_t & options, -								 HttpHeaders::ptr_t & headers); +                                 const HttpOptions::ptr_t & options, +								 const HttpHeaders::ptr_t & headers);  	HttpStatus setupPost(HttpRequest::policy_t policy_id,  						 HttpRequest::priority_t priority,  						 const std::string & url,  						 BufferArray * body, -                         HttpOptions::ptr_t & options, -						 HttpHeaders::ptr_t & headers); +                         const HttpOptions::ptr_t & options, +						 const HttpHeaders::ptr_t & headers);  	HttpStatus setupPut(HttpRequest::policy_t policy_id,  						HttpRequest::priority_t priority,  						const std::string & url,  						BufferArray * body, -                        HttpOptions::ptr_t & options, -						HttpHeaders::ptr_t & headers); +                        const HttpOptions::ptr_t & options, +						const HttpHeaders::ptr_t & headers);      HttpStatus setupDelete(HttpRequest::policy_t policy_id,                          HttpRequest::priority_t priority,                          const std::string & url, -                        HttpOptions::ptr_t & options, -                        HttpHeaders::ptr_t & headers); +                        const HttpOptions::ptr_t & options, +                        const HttpHeaders::ptr_t & headers);      HttpStatus setupPatch(HttpRequest::policy_t policy_id,                          HttpRequest::priority_t priority,                          const std::string & url,                          BufferArray * body, -                        HttpOptions::ptr_t & options, -                        HttpHeaders::ptr_t & headers); +                        const HttpOptions::ptr_t & options, +                        const HttpHeaders::ptr_t & headers);      HttpStatus setupCopy(HttpRequest::policy_t policy_id,                          HttpRequest::priority_t priority,                          const std::string & url, -                        HttpOptions::ptr_t & options, -                        HttpHeaders::ptr_t & headers); +                        const HttpOptions::ptr_t & options, +                        const HttpHeaders::ptr_t & headers);      // Internal method used to setup the libcurl options for a request.  	// Does all the libcurl handle setup in one place. @@ -166,8 +166,8 @@ protected:  					 HttpRequest::priority_t priority,  					 const std::string & url,  					 BufferArray * body, -                     HttpOptions::ptr_t & options, -					 HttpHeaders::ptr_t & headers); +                     const HttpOptions::ptr_t & options, +					 const HttpHeaders::ptr_t & headers);  	// libcurl operational callbacks  	// diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp index 4a7352c962..f0dfde6153 100755 --- a/indra/llcorehttp/httprequest.cpp +++ b/indra/llcorehttp/httprequest.cpp @@ -197,8 +197,8 @@ HttpStatus HttpRequest::getStatus() const  HttpHandle HttpRequest::requestGet(policy_t policy_id,  								   priority_t priority,  								   const std::string & url, -                                   HttpOptions::ptr_t & options, -								   HttpHeaders::ptr_t & headers, +                                   const HttpOptions::ptr_t & options, +								   const HttpHeaders::ptr_t & headers,  								   HttpHandler * user_handler)  {  	HttpStatus status; @@ -231,8 +231,8 @@ HttpHandle HttpRequest::requestGetByteRange(policy_t policy_id,  											const std::string & url,  											size_t offset,  											size_t len, -                                            HttpOptions::ptr_t & options, -											HttpHeaders::ptr_t & headers, +                                            const HttpOptions::ptr_t & options, +											const HttpHeaders::ptr_t & headers,  											HttpHandler * user_handler)  {  	HttpStatus status; @@ -264,8 +264,8 @@ HttpHandle HttpRequest::requestPost(policy_t policy_id,  									priority_t priority,  									const std::string & url,  									BufferArray * body, -                                    HttpOptions::ptr_t & options, -									HttpHeaders::ptr_t & headers, +                                    const HttpOptions::ptr_t & options, +									const HttpHeaders::ptr_t & headers,  									HttpHandler * user_handler)  {  	HttpStatus status; @@ -297,8 +297,8 @@ HttpHandle HttpRequest::requestPut(policy_t policy_id,  								   priority_t priority,  								   const std::string & url,  								   BufferArray * body, -                                   HttpOptions::ptr_t & options, -								   HttpHeaders::ptr_t & headers, +                                   const HttpOptions::ptr_t & options, +								   const HttpHeaders::ptr_t & headers,  								   HttpHandler * user_handler)  {  	HttpStatus status; @@ -328,8 +328,8 @@ HttpHandle HttpRequest::requestPut(policy_t policy_id,  HttpHandle HttpRequest::requestDelete(policy_t policy_id,      priority_t priority,      const std::string & url, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t & headers, +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t & headers,      HttpHandler * user_handler)  {      HttpStatus status; @@ -360,8 +360,8 @@ HttpHandle HttpRequest::requestPatch(policy_t policy_id,      priority_t priority,      const std::string & url,      BufferArray * body, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t & headers, +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t & headers,      HttpHandler * user_handler)  {      HttpStatus status; @@ -391,8 +391,8 @@ HttpHandle HttpRequest::requestPatch(policy_t policy_id,  HttpHandle HttpRequest::requestCopy(policy_t policy_id,      priority_t priority,      const std::string & url, -    HttpOptions::ptr_t & options, -    HttpHeaders::ptr_t & headers, +    const HttpOptions::ptr_t & options, +    const HttpHeaders::ptr_t & headers,      HttpHandler * user_handler)  {      HttpStatus status; diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h index 58aea1444c..20a223c482 100755 --- a/indra/llcorehttp/httprequest.h +++ b/indra/llcorehttp/httprequest.h @@ -348,8 +348,8 @@ public:  	HttpHandle requestGet(policy_t policy_id,  						  priority_t priority,  						  const std::string & url, -                          HttpOptions::ptr_t & options, -						  HttpHeaders::ptr_t & headers, +                          const HttpOptions::ptr_t & options, +						  const HttpHeaders::ptr_t & headers,  						  HttpHandler * handler); @@ -391,8 +391,8 @@ public:  								   const std::string & url,  								   size_t offset,  								   size_t len, -                                   HttpOptions::ptr_t & options, -								   HttpHeaders::ptr_t & headers, +                                   const HttpOptions::ptr_t & options, +								   const HttpHeaders::ptr_t & headers,  								   HttpHandler * handler); @@ -432,8 +432,8 @@ public:  						   priority_t priority,  						   const std::string & url,  						   BufferArray * body, -                           HttpOptions::ptr_t & options, -						   HttpHeaders::ptr_t & headers, +                           const HttpOptions::ptr_t & options, +						   const HttpHeaders::ptr_t & headers,  						   HttpHandler * handler); @@ -473,8 +473,8 @@ public:  						  priority_t priority,  						  const std::string & url,  						  BufferArray * body, -                          HttpOptions::ptr_t & options, -						  HttpHeaders::ptr_t & headers, +                          const HttpOptions::ptr_t & options, +						  const HttpHeaders::ptr_t & headers,  						  HttpHandler * handler); @@ -493,8 +493,8 @@ public:      HttpHandle requestDelete(policy_t policy_id,              priority_t priority,              const std::string & url, -            HttpOptions::ptr_t & options, -            HttpHeaders::ptr_t & headers, +            const HttpOptions::ptr_t & options, +            const HttpHeaders::ptr_t & headers,              HttpHandler * user_handler);      /// Queue a full HTTP PUT.  Query arguments and body may @@ -516,8 +516,8 @@ public:              priority_t priority,              const std::string & url,              BufferArray * body, -            HttpOptions::ptr_t & options, -            HttpHeaders::ptr_t & headers, +            const HttpOptions::ptr_t & options, +            const HttpHeaders::ptr_t & headers,              HttpHandler * user_handler);      /// Queue a full HTTP PUT.  Query arguments and body may @@ -535,8 +535,8 @@ public:      HttpHandle requestCopy(policy_t policy_id,              priority_t priority,              const std::string & url, -            HttpOptions::ptr_t & options, -            HttpHeaders::ptr_t & headers, +            const HttpOptions::ptr_t & options, +            const HttpHeaders::ptr_t & headers,              HttpHandler * user_handler);      /// Queue a NoOp request. diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp index 5b5929383a..a2004db30a 100644 --- a/indra/llmessage/llcorehttputil.cpp +++ b/indra/llmessage/llcorehttputil.cpp @@ -102,8 +102,8 @@ HttpHandle requestPostWithLLSD(HttpRequest * request,      HttpRequest::priority_t priority,      const std::string & url,      const LLSD & body, -    HttpOptions::ptr_t options, -    HttpHeaders::ptr_t headers, +    const HttpOptions::ptr_t &options, +    const HttpHeaders::ptr_t &headers,      HttpHandler * handler)  {      HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID); @@ -129,8 +129,8 @@ HttpHandle requestPutWithLLSD(HttpRequest * request,      HttpRequest::priority_t priority,      const std::string & url,      const LLSD & body, -    HttpOptions::ptr_t options, -    HttpHeaders::ptr_t headers, +    const HttpOptions::ptr_t &options, +    const HttpHeaders::ptr_t &headers,      HttpHandler * handler)  {      HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID); @@ -155,8 +155,8 @@ HttpHandle requestPatchWithLLSD(HttpRequest * request,      HttpRequest::priority_t priority,      const std::string & url,      const LLSD & body, -    HttpOptions::ptr_t options, -    HttpHeaders::ptr_t headers, +    const HttpOptions::ptr_t &options, +    const HttpHeaders::ptr_t &headers,      HttpHandler * handler)  {      HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID); diff --git a/indra/llmessage/llcorehttputil.h b/indra/llmessage/llcorehttputil.h index 3dd13d0a0c..6d8f333c72 100644 --- a/indra/llmessage/llcorehttputil.h +++ b/indra/llmessage/llcorehttputil.h @@ -107,21 +107,21 @@ std::string responseToString(LLCore::HttpResponse * response);  ///						a now-useless HttpHandler object.  ///  LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest * request, -									   LLCore::HttpRequest::policy_t policy_id, -									   LLCore::HttpRequest::priority_t priority, -									   const std::string & url, -									   const LLSD & body, -                                       LLCore::HttpOptions::ptr_t options, -									   LLCore::HttpHeaders::ptr_t headers, -									   LLCore::HttpHandler * handler); +    LLCore::HttpRequest::policy_t policy_id, +    LLCore::HttpRequest::priority_t priority, +    const std::string & url, +    const LLSD & body, +    const LLCore::HttpOptions::ptr_t &options, +    const LLCore::HttpHeaders::ptr_t &headers, +    LLCore::HttpHandler * handler);  inline LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest::ptr_t & request,  	LLCore::HttpRequest::policy_t policy_id,  	LLCore::HttpRequest::priority_t priority,  	const std::string & url,  	const LLSD & body, -	LLCore::HttpOptions::ptr_t & options, -	LLCore::HttpHeaders::ptr_t & headers, +	const LLCore::HttpOptions::ptr_t & options, +	const LLCore::HttpHeaders::ptr_t & headers,  	LLCore::HttpHandler * handler)  {      return requestPostWithLLSD(request.get(), policy_id, priority, @@ -164,8 +164,8 @@ LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest * request,  	LLCore::HttpRequest::priority_t priority,  	const std::string & url,  	const LLSD & body, -	LLCore::HttpOptions::ptr_t options, -	LLCore::HttpHeaders::ptr_t headers, +	const LLCore::HttpOptions::ptr_t &options, +	const LLCore::HttpHeaders::ptr_t &headers,  	LLCore::HttpHandler * handler);  inline LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest::ptr_t & request, @@ -173,8 +173,8 @@ inline LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest::ptr_t & reques  	LLCore::HttpRequest::priority_t priority,  	const std::string & url,  	const LLSD & body, -	LLCore::HttpOptions::ptr_t & options, -	LLCore::HttpHeaders::ptr_t & headers, +	const LLCore::HttpOptions::ptr_t & options, +	const LLCore::HttpHeaders::ptr_t & headers,  	LLCore::HttpHandler * handler)  {      return requestPutWithLLSD(request.get(), policy_id, priority, @@ -216,8 +216,8 @@ LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest * request,      LLCore::HttpRequest::priority_t priority,      const std::string & url,      const LLSD & body, -    LLCore::HttpOptions::ptr_t options, -    LLCore::HttpHeaders::ptr_t headers, +    const LLCore::HttpOptions::ptr_t &options, +    const LLCore::HttpHeaders::ptr_t &headers,      LLCore::HttpHandler * handler);  inline LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest::ptr_t & request, @@ -225,8 +225,8 @@ inline LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest::ptr_t & requ      LLCore::HttpRequest::priority_t priority,      const std::string & url,      const LLSD & body, -    LLCore::HttpOptions::ptr_t & options, -    LLCore::HttpHeaders::ptr_t & headers, +    const LLCore::HttpOptions::ptr_t & options, +    const LLCore::HttpHeaders::ptr_t & headers,      LLCore::HttpHandler * handler)  {      return requestPatchWithLLSD(request.get(), policy_id, priority,  | 
