You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/05/05 05:51:32 UTC
trafficserver git commit: Fix clang format,
it is 132 character wide in our .clang-format config
Repository: trafficserver
Updated Branches:
refs/heads/master 2c971b6ff -> 261d0742e
Fix clang format, it is 132 character wide in our .clang-format config
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/261d0742
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/261d0742
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/261d0742
Branch: refs/heads/master
Commit: 261d0742e67748cae62f8e7101e859c9c0907eeb
Parents: 2c971b6
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon May 4 21:51:09 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon May 4 21:51:09 2015 -0600
----------------------------------------------------------------------
iocore/cache/Cache.cc | 4 ++--
iocore/cache/CacheWrite.cc | 8 ++++----
iocore/cache/P_CacheInternal.h | 14 ++++++++------
3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/261d0742/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 5160349..ae647f0 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -3102,8 +3102,8 @@ Lfree:
}
Action *
-Cache::remove(Continuation *cont, const CacheKey *key, CacheFragType type, bool /* user_agents ATS_UNUSED */, bool /* link ATS_UNUSED */,
- const char *hostname, int host_len)
+Cache::remove(Continuation *cont, const CacheKey *key, CacheFragType type, bool /* user_agents ATS_UNUSED */,
+ bool /* link ATS_UNUSED */, const char *hostname, int host_len)
{
if (!CacheProcessor::IsCacheReady(type)) {
if (cont)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/261d0742/iocore/cache/CacheWrite.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index afff938..b34ae2c 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -1605,8 +1605,8 @@ CacheVC::openWriteStartBegin(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED
// main entry point for writing of of non-http documents
Action *
-Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_type, int options, time_t apin_in_cache, const char *hostname,
- int host_len)
+Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_type, int options, time_t apin_in_cache,
+ const char *hostname, int host_len)
{
if (!CacheProcessor::IsCacheReady(frag_type)) {
cont->handleEvent(CACHE_EVENT_OPEN_WRITE_FAILED, (void *)-ECACHE_NOT_READY);
@@ -1673,8 +1673,8 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_ty
#ifdef HTTP_CACHE
// main entry point for writing of http documents
Action *
-Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info, time_t apin_in_cache, const CacheKey * /* key1 ATS_UNUSED */,
- CacheFragType type, const char *hostname, int host_len)
+Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info, time_t apin_in_cache,
+ const CacheKey * /* key1 ATS_UNUSED */, CacheFragType type, const char *hostname, int host_len)
{
if (!CacheProcessor::IsCacheReady(type)) {
cont->handleEvent(CACHE_EVENT_OPEN_WRITE_FAILED, (void *)-ECACHE_NOT_READY);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/261d0742/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index 19c5c64..f4de6c5 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -1027,8 +1027,8 @@ struct Cache {
inkcoreapi Action *open_read(Continuation *cont, const CacheKey *key, CacheFragType type, const char *hostname, int len);
inkcoreapi Action *open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_type, int options = 0,
time_t pin_in_cache = (time_t)0, const char *hostname = 0, int host_len = 0);
- inkcoreapi Action *remove(Continuation *cont, const CacheKey *key, CacheFragType type = CACHE_FRAG_TYPE_HTTP, bool user_agents = true,
- bool link = false, const char *hostname = 0, int host_len = 0);
+ inkcoreapi Action *remove(Continuation *cont, const CacheKey *key, CacheFragType type = CACHE_FRAG_TYPE_HTTP,
+ bool user_agents = true, bool link = false, const char *hostname = 0, int host_len = 0);
Action *scan(Continuation *cont, const char *hostname = 0, int host_len = 0, int KB_per_second = 2500);
#ifdef HTTP_CACHE
@@ -1037,13 +1037,15 @@ struct Cache {
CacheFragType type, const char *hostname, int host_len);
Action *open_read(Continuation *cont, CacheURL *url, CacheHTTPHdr *request, CacheLookupHttpConfig *params, CacheFragType type);
Action *open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *old_info, time_t pin_in_cache = (time_t)0,
- const CacheKey *key1 = NULL, CacheFragType type = CACHE_FRAG_TYPE_HTTP, const char *hostname = 0, int host_len = 0);
- Action *open_write(Continuation *cont, CacheURL *url, CacheHTTPHdr *request, CacheHTTPInfo *old_info, time_t pin_in_cache = (time_t)0,
- CacheFragType type = CACHE_FRAG_TYPE_HTTP);
+ const CacheKey *key1 = NULL, CacheFragType type = CACHE_FRAG_TYPE_HTTP, const char *hostname = 0,
+ int host_len = 0);
+ Action *open_write(Continuation *cont, CacheURL *url, CacheHTTPHdr *request, CacheHTTPInfo *old_info,
+ time_t pin_in_cache = (time_t)0, CacheFragType type = CACHE_FRAG_TYPE_HTTP);
static void generate_key(INK_MD5 *md5, CacheURL *url);
#endif
- Action *link(Continuation *cont, const CacheKey *from, const CacheKey *to, CacheFragType type, const char *hostname, int host_len);
+ Action *link(Continuation *cont, const CacheKey *from, const CacheKey *to, CacheFragType type, const char *hostname,
+ int host_len);
Action *deref(Continuation *cont, const CacheKey *key, CacheFragType type, const char *hostname, int host_len);
void vol_initialized(bool result);