From: Automatic source maintenance Date: Sun, 30 May 2010 00:15:16 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~178 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b32112a02cd0141065146155e17df27a9fa1780;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/lib/MemPoolChunked.cc b/lib/MemPoolChunked.cc index ec3ca9bf07..aa0786603e 100644 --- a/lib/MemPoolChunked.cc +++ b/lib/MemPoolChunked.cc @@ -230,7 +230,7 @@ MemPoolChunked::get() /* then try perchunk freelist chain */ if (nextFreeChunk == NULL) { /* no chunk with frees, so create new one */ - saved_calls--; // compensate for the ++ above + saved_calls--; // compensate for the ++ above createChunk(); } /* now we have some in perchunk freelist chain */ diff --git a/lib/MemPoolMalloc.cc b/lib/MemPoolMalloc.cc index 043b635b3b..bca0e9ff43 100644 --- a/lib/MemPoolMalloc.cc +++ b/lib/MemPoolMalloc.cc @@ -56,11 +56,11 @@ MemPoolMalloc::allocate() { void *obj = freelist.pop(); if (obj) { - memMeterDec(meter.idle); - saved_calls++; + memMeterDec(meter.idle); + saved_calls++; } else { - obj = xcalloc(1, obj_size); - memMeterInc(meter.alloc); + obj = xcalloc(1, obj_size); + memMeterInc(meter.alloc); } memMeterInc(meter.inuse); return obj; @@ -71,13 +71,13 @@ MemPoolMalloc::deallocate(void *obj, bool aggressive) { memMeterDec(meter.inuse); if (aggressive) { - xfree(obj); - memMeterDec(meter.alloc); + xfree(obj); + memMeterDec(meter.alloc); } else { - if (doZeroOnPush) - memset(obj, 0, obj_size); - memMeterInc(meter.idle); - freelist.push_back(obj); + if (doZeroOnPush) + memset(obj, 0, obj_size); + memMeterInc(meter.idle); + freelist.push_back(obj); } } @@ -134,9 +134,9 @@ void MemPoolMalloc::clean(time_t maxage) { while (void *obj = freelist.pop()) { - memMeterDec(meter.idle); - memMeterDec(meter.alloc); - xfree(obj); + memMeterDec(meter.idle); + memMeterDec(meter.alloc); + xfree(obj); } } diff --git a/src/mem.cc b/src/mem.cc index 75cfd2d27f..23010d376d 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -588,8 +588,8 @@ Mem::PoolReport(const MemPoolStats * mp_st, const MemPoolMeter * AllMeter, std:: /* Chunks */ if (mp_st->chunk_capacity) { - stream << std::setw(4) << toKB(mp_st->obj_size * mp_st->chunk_capacity) << delim; - stream << std::setw(4) << mp_st->chunk_capacity << delim; + stream << std::setw(4) << toKB(mp_st->obj_size * mp_st->chunk_capacity) << delim; + stream << std::setw(4) << mp_st->chunk_capacity << delim; needed = mp_st->items_inuse / mp_st->chunk_capacity; @@ -598,19 +598,19 @@ Mem::PoolReport(const MemPoolStats * mp_st, const MemPoolMeter * AllMeter, std:: excess = mp_st->chunks_inuse - needed; - stream << std::setw(4) << mp_st->chunks_alloc << delim; - stream << std::setw(4) << mp_st->chunks_inuse << delim; - stream << std::setw(4) << mp_st->chunks_free << delim; - stream << std::setw(4) << mp_st->chunks_partial << delim; - stream << std::setprecision(3) << xpercent(excess, needed) << delim; + stream << std::setw(4) << mp_st->chunks_alloc << delim; + stream << std::setw(4) << mp_st->chunks_inuse << delim; + stream << std::setw(4) << mp_st->chunks_free << delim; + stream << std::setw(4) << mp_st->chunks_partial << delim; + stream << std::setprecision(3) << xpercent(excess, needed) << delim; } else { - stream << delim; - stream << delim; - stream << delim; - stream << delim; - stream << delim; - stream << delim; - stream << delim; + stream << delim; + stream << delim; + stream << delim; + stream << delim; + stream << delim; + stream << delim; + stream << delim; } /* * Fragmentation calculation: