From: Automatic source maintenance Date: Thu, 16 Dec 2010 01:15:12 +0000 (-0700) Subject: SourceFormat Enforcement X-Git-Tag: take00~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90737510f14ee0242d6535aed6c0e9e147eb6096;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc index 3e6056084e..b552130bfd 100644 --- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc +++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc @@ -283,7 +283,7 @@ StringSplit(char *In_Str, char chr, char *Out_Str, size_t Out_Sz) memset(In_Str, 0, In_Len); // return (-3); // Returning <0 breaks current ConvertIP() code for last object - return (i); + return (i); } // move the unused In_Str forward @@ -336,7 +336,7 @@ BinarySplit(void *In_Obj, size_t In_Sz, char chr, void *Out_Obj, size_t Out_Sz) memset(In_Obj, 0, In_Sz); // return (-3); // Returning <0 breaks current code for last object - return (i); + return (i); } // move the unused In_Obj forward diff --git a/src/client_side.cc b/src/client_side.cc index 01efa3de13..f9c3960e80 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -256,7 +256,7 @@ ConnStateData::readSomeData() debugs(33, 4, "clientReadSomeData: FD " << fd << ": reading request..."); - if(!maybeMakeSpaceAvailable()) + if (!maybeMakeSpaceAvailable()) return; typedef CommCbMemFunT Dialer; @@ -2254,16 +2254,16 @@ bool ConnStateData::maybeMakeSpaceAvailable() { if (getAvailableBufferLength() < 2) { - size_t newSize; - if (in.allocatedSize >= Config.maxRequestBufferSize) { - debugs(33, 4, "request buffer full: client_request_buffer_max_size=" << Config.maxRequestBufferSize); - return false; - } - if ((newSize=in.allocatedSize * 2) > Config.maxRequestBufferSize) { - newSize=Config.maxRequestBufferSize; - } - in.buf = (char *)memReallocBuf(in.buf, newSize, &in.allocatedSize); - debugs(33, 2, "growing request buffer: notYetUsed=" << in.notYetUsed << " size=" << in.allocatedSize); + size_t newSize; + if (in.allocatedSize >= Config.maxRequestBufferSize) { + debugs(33, 4, "request buffer full: client_request_buffer_max_size=" << Config.maxRequestBufferSize); + return false; + } + if ((newSize=in.allocatedSize * 2) > Config.maxRequestBufferSize) { + newSize=Config.maxRequestBufferSize; + } + in.buf = (char *)memReallocBuf(in.buf, newSize, &in.allocatedSize); + debugs(33, 2, "growing request buffer: notYetUsed=" << in.notYetUsed << " size=" << in.allocatedSize); } return true; } @@ -2978,7 +2978,7 @@ ConnStateData::abortChunkedRequestBody(const err_type error) void ConnStateData::noteMoreBodySpaceAvailable(BodyPipe::Pointer ) { - if (!handleRequestBodyData()) + if (!handleRequestBodyData()) return; readSomeData();