From 2ee344289852ef85dc0117b99571f12e926d42e7 Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Mon, 4 Feb 2013 18:13:29 -0700 Subject: [PATCH] SourceFormat Enforcement --- src/client_side.cc | 6 +++--- src/store_swapout.cc | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/client_side.cc b/src/client_side.cc index 93d0143253..800fc25a47 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -2295,7 +2295,7 @@ parseHttpRequest(ConnStateData *csd, HttpParser *hp, HttpRequestMethod * method_ #endif debugs(33,5, HERE << "repare absolute URL from " << - (csd->transparent()?"intercept":(csd->port->flags.accelSurrogate ? "accel":""))); + (csd->transparent()?"intercept":(csd->port->flags.accelSurrogate ? "accel":""))); /* Rewrite the URL in transparent or accelerator mode */ /* NP: there are several cases to traverse here: * - standard mode (forward proxy) @@ -4033,8 +4033,8 @@ clientHttpConnectionsOpen(void) } if (s->flags.tunnelSslBumping && - !s->staticSslContext && - !s->generateHostCertificates) { + !s->staticSslContext && + !s->generateHostCertificates) { debugs(1, DBG_IMPORTANT, "Will not bump SSL at http_port " << s->s << " due to SSL initialization failure."); s->flags.tunnelSslBumping = false; } diff --git a/src/store_swapout.cc b/src/store_swapout.cc index d36c86ccb7..08f8878bb2 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -440,16 +440,16 @@ StoreEntry::mayStartSwapOut() if (expectedEnd < 0 && store_status != STORE_OK) { const int64_t maxKnownSize = mem_obj->availableForSwapOut(); debugs(20, 7, HERE << "maxKnownSize= " << maxKnownSize); - /* - * NOTE: the store_maxobjsize here is the max of optional - * max-size values from 'cache_dir' lines. It is not the - * same as 'maximum_object_size'. By default, store_maxobjsize - * will be set to -1. However, I am worried that this - * deferance may consume a lot of memory in some cases. - * Should we add an option to limit this memory consumption? - */ - debugs(20, 5, HERE << "Deferring swapout start for " << - (store_maxobjsize - maxKnownSize) << " bytes"); + /* + * NOTE: the store_maxobjsize here is the max of optional + * max-size values from 'cache_dir' lines. It is not the + * same as 'maximum_object_size'. By default, store_maxobjsize + * will be set to -1. However, I am worried that this + * deferance may consume a lot of memory in some cases. + * Should we add an option to limit this memory consumption? + */ + debugs(20, 5, HERE << "Deferring swapout start for " << + (store_maxobjsize - maxKnownSize) << " bytes"); return true; // may still fit, but no final decision yet } } -- 2.47.2