trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject trafficserver git commit: TS-3514 TS-3502 TS-3515 Run clang-format
Date Wed, 22 Apr 2015 02:54:53 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master ef36a509c -> be1e01757


TS-3514 TS-3502 TS-3515 Run clang-format


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/be1e0175
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/be1e0175
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/be1e0175

Branch: refs/heads/master
Commit: be1e0175724562523a3a92fee29b82cc840fe252
Parents: ef36a50
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue Apr 21 20:54:45 2015 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue Apr 21 20:54:45 2015 -0600

----------------------------------------------------------------------
 lib/ts/ink_atomic.h             | 2 +-
 proxy/InkAPI.cc                 | 2 +-
 proxy/api/ts/ts.h               | 2 +-
 proxy/http/remap/RemapConfig.cc | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be1e0175/lib/ts/ink_atomic.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index 8d6037b..de35075 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -63,7 +63,7 @@ typedef vlong *pvlong;
 typedef vvoidp *pvvoidp;
 
 /* GCC compiler >= 4.1 */
-#if defined(__GNUC__) && ( ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1))
|| (__GNUC__ >= 5) )
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) ||
(__GNUC__ >= 5))
 
 
 /* see http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html */

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be1e0175/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index b57edde..55def42 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -7010,7 +7010,7 @@ TSReturnCode
 TSHttpTxnServerFdGet(TSHttpTxn txnp, int *fdp)
 {
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
-  sdk_assert(sdk_sanity_check_null_ptr((void*)fdp) == TS_SUCCESS);
+  sdk_assert(sdk_sanity_check_null_ptr((void *)fdp) == TS_SUCCESS);
 
   HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
   *fdp = -1;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be1e0175/proxy/api/ts/ts.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index 1060b3e..2ba589b 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -1358,7 +1358,7 @@ tsapi struct sockaddr const *TSHttpTxnNextHopAddrGet(TSHttpTxn txnp);
 tsapi TSReturnCode TSHttpTxnClientFdGet(TSHttpTxn txnp, int *fdp);
 tsapi TSReturnCode TSHttpTxnOutgoingAddrSet(TSHttpTxn txnp, struct sockaddr const *addr);
 tsapi TSReturnCode TSHttpTxnOutgoingTransparencySet(TSHttpTxn txnp, int flag);
-tsapi TSReturnCode TSHttpTxnServerFdGet(TSHttpTxn txnp, int* fdp);
+tsapi TSReturnCode TSHttpTxnServerFdGet(TSHttpTxn txnp, int *fdp);
 
 /* TS-1008: the above TXN calls for the Client conn should work with SSN */
 tsapi struct sockaddr const *TSHttpSsnClientAddrGet(TSHttpSsn ssnp);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be1e0175/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 3f5db31..c8af9d1 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -805,7 +805,8 @@ process_regex_mapping_config(const char *from_host_lower, url_mapping
*new_mappi
     goto lFail;
   }
   if (captures >= UrlRewrite::MAX_REGEX_SUBS) { // off by one for $0 (implicit capture)
-    Warning("regex has %d capturing subpatterns (including entire regex); Max allowed: %d",
captures + 1, UrlRewrite::MAX_REGEX_SUBS);
+    Warning("regex has %d capturing subpatterns (including entire regex); Max allowed: %d",
captures + 1,
+            UrlRewrite::MAX_REGEX_SUBS);
     goto lFail;
   }
 


Mime
View raw message