[trafficserver] 02/02: Cleans up some build issue and unecessary casts

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit adbf109cc62e4066cdbe1b820647eda0c35424b1
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Nov 28 16:15:20 2017 -0700

    Cleans up some build issue and unecessary casts
    
    (cherry picked from commit edbb9692712b66bbcaa0dc78936f66b82adaba5e)
---
 proxy/http/HttpTransact.cc | 5 ++---
 proxy/logstats.cc          | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 365c1d7..c120e30 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7710,9 +7710,8 @@ HttpTransact::handle_server_died(State *s)
     body_type = "response#bad_response";
     break;
   case CONNECTION_ERROR:
-    status = HTTP_STATUS_BAD_GATEWAY;
-    reason =
-      static_cast<const char *>(get_error_string(s->cause_of_death_errno == 0 ? -ENET_CONNECT_FAILED : s->cause_of_death_errno));
+    status    = HTTP_STATUS_BAD_GATEWAY;
+    reason    = get_error_string(s->cause_of_death_errno == 0 ? -ENET_CONNECT_FAILED : s->cause_of_death_errno);
     body_type = "connect#failed_connect";
     break;
   case OPEN_RAW_ERROR:
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 6331ea3..ff1ea11 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -1254,10 +1254,10 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false, bool aggregate
 
   // Parsed results
   int http_code = 0, size = 0, result = 0, hier = 0, elapsed = 0;
+  bool ipv6 = false;
   OriginStats *o_stats;
   HTTPMethod method;
   URLScheme scheme;
-  bool ipv6;
 
   if (!fieldlist) {
     fieldlist = new LogFieldList;

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.