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-3554 clang-format
Date Thu, 23 Apr 2015 20:11:35 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 98c87ee51 -> fad02a76e


TS-3554 clang-format


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

Branch: refs/heads/master
Commit: fad02a76e16cf93be301296d61cccf80e37ccdee
Parents: 98c87ee
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Thu Apr 23 14:11:30 2015 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Thu Apr 23 14:11:30 2015 -0600

----------------------------------------------------------------------
 iocore/net/SSLUtils.cc | 2 +-
 mgmt/ProxyConfig.cc    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fad02a76/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 3648630..ff2ff93 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1900,7 +1900,7 @@ ssl_callback_session_ticket(SSL *ssl, unsigned char *keyname, unsigned
char *iv,
   if (cc == NULL || cc->keyblock == NULL) {
     // No, key specified.  Must fail out at this point.
     // Alternatively we could generate a random key
-    
+
     return -1;
   }
   ssl_ticket_key_block *keyblock = cc->keyblock;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fad02a76/mgmt/ProxyConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index 6ee1687..09545e2 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -154,7 +154,8 @@ ConfigProcessor::set(unsigned int id, ConfigInfo *info, unsigned timeout_secs)
     old_info = infos[idx];
   } while (!ink_atomic_cas(&infos[idx], old_info, info));
 
-  Debug("config", "Set for slot %d 0x%" PRId64 " was 0x%" PRId64 " with ref count %d", id,
(int64_t)info, (int64_t)old_info, (old_info) ? old_info->refcount():0);
+  Debug("config", "Set for slot %d 0x%" PRId64 " was 0x%" PRId64 " with ref count %d", id,
(int64_t)info, (int64_t)old_info,
+        (old_info) ? old_info->refcount() : 0);
 
   if (old_info) {
     // The ConfigInfoReleaser now takes our refcount, but
@@ -206,7 +207,7 @@ ConfigProcessor::release(unsigned int id, ConfigInfo *info)
 
   if (info->refcount_dec() == 0) {
     // When we release, we should already have replaced this object in the index.
-    Debug("config", "Release config %d 0x%" PRId64,  id, (int64_t)info);
+    Debug("config", "Release config %d 0x%" PRId64, id, (int64_t)info);
     ink_release_assert(info != this->infos[idx]);
     delete info;
   }


Mime
View raw message