[trafficserver] branch master updated: Fix Clang format problems.

[bc...@apache.org]

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

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e3f259  Fix Clang format problems.
6e3f259 is described below

commit 6e3f25928eaf9025db0e32b882359b44da4bedb2
Author: Walter Karas <wk...@oath.com>
AuthorDate: Thu Sep 20 13:13:59 2018 -0500

    Fix Clang format problems.
---
 include/tscore/ts_file.h      | 4 ++--
 iocore/net/I_NetVConnection.h | 4 ++--
 proxy/http/HttpSM.cc          | 3 ++-
 proxy/http/HttpTransact.cc    | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/tscore/ts_file.h b/include/tscore/ts_file.h
index 0d2ecf9..9236747 100644
--- a/include/tscore/ts_file.h
+++ b/include/tscore/ts_file.h
@@ -43,8 +43,8 @@ namespace file
     using self_type = path;
 
   public:
-    using value_type = char;
-    using string_type = std::string;
+    using value_type                          = char;
+    using string_type                         = std::string;
     static constexpr char preferred_separator = value_type{'/'};
 
     /// Default construct empty path.
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index 3cfa6a2..de9b44b 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -237,9 +237,9 @@ struct NetVCOptions {
       /*
        * It is odd but necessary to null the scoped string pointer here
        * and then explicitly call release on them in the string assignements
-       * below.  
+       * below.
        * We a memcpy from that to this.  This will put that's string pointers into
-       * this's memory.  Therefore we must first explicitly null out 
+       * this's memory.  Therefore we must first explicitly null out
        * this's original version of the string.  The release after the
        * memcpy removes the extra reference to that's copy of the string
        * Removing the release will eventualy cause a double free crash
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 0dd7ca5..8bba961 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1729,7 +1729,8 @@ HttpSM::state_http_server_open(int event, void *data)
 {
   SMDebug("http_track", "entered inside state_http_server_open");
   STATE_ENTER(&HttpSM::state_http_server_open, event);
-  ink_release_assert(event == EVENT_INTERVAL || event == NET_EVENT_OPEN || event == NET_EVENT_OPEN_FAILED || pending_action == nullptr);
+  ink_release_assert(event == EVENT_INTERVAL || event == NET_EVENT_OPEN || event == NET_EVENT_OPEN_FAILED ||
+                     pending_action == nullptr);
   if (event != NET_EVENT_OPEN) {
     pending_action = nullptr;
   }
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 6893ef6..81a7021 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -8277,7 +8277,6 @@ HttpTransact::client_result_stat(State *s, ink_hrtime total_time, ink_hrtime req
   }
   // Count the status codes, assuming the client didn't abort (i.e. there is an m_http)
   if ((s->source != SOURCE_NONE) && (s->client_info.abort == DIDNOT_ABORT)) {
-
     switch (client_response_status) {
     case 100:
       HTTP_INCREMENT_DYN_STAT(http_response_status_100_count_stat);