From: Automatic source maintenance Date: Sun, 8 Aug 2010 00:12:41 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: take1~412 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dcaab393abef754bbc2131b1587b6f639481c954;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index cc98207579..753545e97b 100644 --- a/src/AccessLogEntry.h +++ b/src/AccessLogEntry.h @@ -204,7 +204,7 @@ public: int64_t bytesSent; ///< number of bytes sent to ICAP server so far int64_t bytesRead; ///< number of bytes read from ICAP server so far /** - * number of ICAP body bytes read from ICAP server or -1 for no encapsulated + * number of ICAP body bytes read from ICAP server or -1 for no encapsulated * message data in ICAP reply (eg 204 responses) */ int64_t bodyBytesRead; diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h index 07a16ba65c..d29e89a87e 100644 --- a/src/adaptation/icap/ModXact.h +++ b/src/adaptation/icap/ModXact.h @@ -279,7 +279,7 @@ private: */ int64_t replyHttpHeaderSize; /** - * size of dechunked HTTP body in ICAP reply or -1 if there is not any + * size of dechunked HTTP body in ICAP reply or -1 if there is not any * encapsulated message data */ int64_t replyHttpBodySize; diff --git a/src/gopher.cc b/src/gopher.cc index 75c821c568..6b47c0afdd 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -822,9 +822,9 @@ gopherReadReply(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, void IOStats.Gopher.read_hist[bin]++; HttpRequest *req = gopherState->fwd->request; - if (req->hier.bodyBytesRead < 0) + if (req->hier.bodyBytesRead < 0) req->hier.bodyBytesRead = 0; - + req->hier.bodyBytesRead += len; } diff --git a/src/log/access_log.cc b/src/log/access_log.cc index b6be66527a..1bb4e9e607 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -893,7 +893,7 @@ accessLogCustom(AccessLogEntry * al, customlog * log) dooff = 1; } // else if icap.bodyBytesRead < 0, we do not have any http data, - // so just print a "-" (204 responses etc) + // so just print a "-" (204 responses etc) break; case LFT_ICAP_REQ_HEADER: @@ -1108,7 +1108,7 @@ accessLogCustom(AccessLogEntry * al, customlog * log) dooff = 1; } // else if hier.bodyBytesRead < 0 we did not have any data exchange with - // a peer server so just print a "-" (eg requests served from cache, + // a peer server so just print a "-" (eg requests served from cache, // or internal error messages). break;