From e7a1e6198b9bf1b42d60bff9559494887e22d5e7 Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Mon, 23 Mar 2015 13:39:33 -0700
Subject: [PATCH] Slightly cleaner than this-> ing everythnig.
---
indra/llcorehttp/httpcommon.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index c2014004235..d923dfa5d62 100755
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -131,18 +131,18 @@ std::string HttpStatus::toString() const
{
return std::string("");
}
- switch (this->mDetails->mType)
+ switch (getType())
{
case EXT_CURL_EASY:
- return std::string(curl_easy_strerror(CURLcode(this->mDetails->mStatus)));
+ return std::string(curl_easy_strerror(CURLcode(getStatus())));
case EXT_CURL_MULTI:
- return std::string(curl_multi_strerror(CURLMcode(this->mDetails->mStatus)));
+ return std::string(curl_multi_strerror(CURLMcode(getStatus())));
case LLCORE:
- if (this->mDetails->mStatus >= 0 && this->mDetails->mStatus < llcore_errors_count)
+ if (getStatus() >= 0 && getStatus() < llcore_errors_count)
{
- return std::string(llcore_errors[this->mDetails->mStatus]);
+ return std::string(llcore_errors[getStatus()]);
}
break;
@@ -154,7 +154,7 @@ std::string HttpStatus::toString() const
while (true)
{
int at((bottom + top) / 2);
- if (this->mDetails->mType == http_errors[at].mCode)
+ if (getType() == http_errors[at].mCode)
{
return std::string(http_errors[at].mText);
}
@@ -162,7 +162,7 @@ std::string HttpStatus::toString() const
{
break;
}
- else if (this->mDetails->mType < http_errors[at].mCode)
+ else if (getType() < http_errors[at].mCode)
{
top = at;
}
@@ -182,9 +182,9 @@ std::string HttpStatus::toTerseString() const
{
std::ostringstream result;
- unsigned int error_value((unsigned short)(this->mDetails->mStatus));
+ unsigned int error_value((unsigned short)getStatus());
- switch (this->mDetails->mType)
+ switch (getType())
{
case EXT_CURL_EASY:
result << "Easy_";
@@ -202,7 +202,7 @@ std::string HttpStatus::toTerseString() const
if (isHttpStatus())
{
result << "Http_";
- error_value = this->mDetails->mType;
+ error_value = getType();
}
else
{
@@ -244,7 +244,7 @@ bool HttpStatus::isRetryable() const
// Disable the '*this == inv_status' test and look for 'Core_9'
// failures in log files.
- return ((isHttpStatus() && this->mDetails->mType >= 499 && this->mDetails->mType <= 599) || // Include special 499 in retryables
+ return ((isHttpStatus() && getType() >= 499 && getType() <= 599) || // Include special 499 in retryables
*this == cant_connect || // Connection reset/endpoint problems
*this == cant_res_proxy || // DNS problems
*this == cant_res_host || // DNS problems
--
GitLab