From: Automatic source maintenance Date: Sun, 28 Nov 2010 01:15:27 +0000 (-0700) Subject: SourceFormat Enforcement X-Git-Tag: take1~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31be4b0fa6d5108886eb5f9b3aeb3ea9dd40146;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h index 0c390567ba..9ce281a0ec 100644 --- a/src/comm/IoCallback.h +++ b/src/comm/IoCallback.h @@ -5,7 +5,8 @@ #include "base/AsyncCall.h" #include "comm_err_t.h" -namespace Comm { +namespace Comm +{ /// Type of IO callbacks the Comm layer deals with. typedef enum { @@ -15,7 +16,8 @@ typedef enum { } iocb_type; /// Details about a particular Comm IO callback event. -class IoCallback { +class IoCallback +{ public: iocb_type type; int fd; @@ -48,7 +50,8 @@ private: /// Entry nodes for the IO callback table: iocb_table /// Keyed off the FD which the event applies to. -class CbEntry { +class CbEntry +{ public: int fd; IoCallback readcb; diff --git a/src/comm/Write.cc b/src/comm/Write.cc index e906d99111..822f503d74 100644 --- a/src/comm/Write.cc +++ b/src/comm/Write.cc @@ -65,7 +65,7 @@ Comm::HandleWrite(int fd, void *data) assert(clientInfo->quotaPeekFd() == fd); clientInfo->quotaDequeue(); // we will write or requeue below - if (nleft > 0) { + if (nleft > 0) { const int quota = clientInfo->quotaForDequed(); if (!quota) { // if no write quota left, queue this fd state->quotaQueueReserv = clientInfo->quotaEnqueue(fd); diff --git a/src/comm/Write.h b/src/comm/Write.h index 1d5dcdff92..8300dc80ec 100644 --- a/src/comm/Write.h +++ b/src/comm/Write.h @@ -3,7 +3,8 @@ #include "base/AsyncCall.h" -namespace Comm { +namespace Comm +{ /** * Queue a write. callback is scheduled when the write diff --git a/src/tunnel.cc b/src/tunnel.cc index c17d627844..269229b5d4 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -324,7 +324,7 @@ TunnelStateData::copy (size_t len, comm_err_t errcode, int xerrno, Connection &f } } else if (cbdataReferenceValid(this)) { AsyncCall::Pointer call = commCbCall(5,5, "SomeTunnelWriteHandler", - CommIoCbPtrFun(completion, this)); + CommIoCbPtrFun(completion, this)); Comm::Write(to.fd(), from.buf, len, call, NULL); }