From: Automatic source maintenance Date: Tue, 22 Dec 2009 01:12:53 +0000 (-0700) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_1~494 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=307b696e76c0e3989c7a2bb97cd85c8ae6d22e69;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index 1dba711727..18d78c66c4 100644 --- a/src/AccessLogEntry.h +++ b/src/AccessLogEntry.h @@ -55,8 +55,8 @@ public: { public: - HttpDetails() : method(METHOD_NONE), code(0), content_type(NULL), - timedout(false), aborted(false) {} + HttpDetails() : method(METHOD_NONE), code(0), content_type(NULL), + timedout(false), aborted(false) {} HttpRequestMethod method; int code; diff --git a/src/comm.cc b/src/comm.cc index 0bcf565cf2..6d6da26ac6 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1991,8 +1991,8 @@ commHandleWrite(int fd, void *data) debugs(5, 5, "commHandleWrite: write() returns " << len); fd_bytes(fd, len, FD_WRITE); statCounter.syscalls.sock.writes++; - // After each successful partial write, - // reset fde::writeStart to the current time. + // After each successful partial write, + // reset fde::writeStart to the current time. fd_table[fd].writeStart = squid_curtime; if (len == 0) { @@ -2191,8 +2191,7 @@ checkTimeouts(void) if (writeTimedOut(fd)) { // We have an active write callback and we are timed out commio_finish_callback(fd, COMMIO_FD_WRITECB(fd), COMM_ERROR, ETIMEDOUT); - } - else if (AlreadyTimedOut(F)) + } else if (AlreadyTimedOut(F)) continue; debugs(5, 5, "checkTimeouts: FD " << fd << " Expired"); diff --git a/src/log/access_log.cc b/src/log/access_log.cc index eab2f75694..ad42287af7 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -1049,7 +1049,7 @@ accessLogCustom(AccessLogEntry * al, customlog * log) case LFT_SQUID_STATUS: if (al->http.timedout || al->http.aborted) { snprintf(tmp, sizeof(tmp), "%s%s", log_tags[al->cache.code], - al->http.statusSfx()); + al->http.statusSfx()); out = tmp; } else { out = log_tags[al->cache.code];