From: Amos Jeffries Date: Mon, 4 Aug 2025 12:20:02 +0000 (+0000) Subject: Make spell-check.sh happy and remove stale spelling exceptions (#2122) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e908b3e368c94560dab972218829e3e0422a7a58;p=thirdparty%2Fsquid.git Make spell-check.sh happy and remove stale spelling exceptions (#2122) This change fixes a few misspellings identified by Codespell v2.4.1 and removes all no-longer-used spelling exceptions that we could find. Most of the fixed misspellings were present but ignored in 2020 commit 2f8abb64 because then-current Codespell v1.16.0 did not flag them. N.B. GitHub Actions ubuntu-24.04 runner still uses Codespell v1.16.0. --- diff --git a/ChangeLog b/ChangeLog index 8b1d6c0326..77cc8f87f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2103,7 +2103,7 @@ Changes to squid-3.3.0.3 (09 Jan 2013): Changes to squid-3.3.0.2 (03 Dec 2012): - Support matching empty header field values using req_header and rep_header - - ... and some minor code polish and input vaidations + - ... and some minor code polish and input validation - ... and all changes from squid 3.2.4 Changes to squid-3.3.0.1 (21 Oct 2012): diff --git a/bootstrap.sh b/bootstrap.sh index cd15e67da2..d7a2b25e26 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -164,7 +164,7 @@ if test -f SPONSORS.list; then fi # Fixup autoconf recursion using --silent/--quiet option -# autoconf should inherit this option whe recursing into subdirectories +# autoconf should inherit this option when recursing into subdirectories # but it currently doesn't for some reason. if ! grep "configure_args --quiet" configure >/dev/null; then echo "Fixing configure recursion" diff --git a/compat/compat.dox b/compat/compat.dox index 75abd3d62f..1e239ccf24 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -66,7 +66,7 @@ used seamlessly across all platforms by the main code. \par Wrappers Sometimes common and useful library functions are not always as safe as they could be. An alternative which wraps the original in extra safety checks is provided under the -same name with an 'x' pre-pended. Currently these extra protections are added on string +same name with an 'x' prepended. Currently these extra protections are added on string handling and memory allocation. diff --git a/compat/os/mswindows.h b/compat/os/mswindows.h index 9770d9bad0..6e13a48645 100644 --- a/compat/os/mswindows.h +++ b/compat/os/mswindows.h @@ -486,7 +486,7 @@ WSASocket(int a, int t, int p, LPWSAPROTOCOL_INFO i, GROUP g, DWORD f) #define open _open /* Needed in win32lib.c */ #endif /* #ifdef __cplusplus */ -/* provide missing definitions from resoruce.h */ +/* provide missing definitions from resource.h */ /* NP: sys/resource.h and sys/time.h are apparently order-dependant. */ #if HAVE_SYS_TIME_H #include diff --git a/compat/shm.h b/compat/shm.h index c16f6f052e..231567ad8e 100644 --- a/compat/shm.h +++ b/compat/shm.h @@ -45,7 +45,7 @@ extern "C" { #endif /* HAVE_SHM */ -/// Determines whether segment names are iterpreted as full file paths. +/// Determines whether segment names are interpreted as full file paths. bool shm_portable_segment_name_is_path(); #endif /* SQUID_COMPAT_SHM_H */ diff --git a/lib/heap.c b/lib/heap.c index ba36b35c4e..9f93566740 100644 --- a/lib/heap.c +++ b/lib/heap.c @@ -204,7 +204,7 @@ heap_extractmin(heap * hp) /* * Remove the last node in HP. Frees the heap internal structure and - * returns the data pointes to by the last node. + * returns the data pointed to by the last node. */ heap_t heap_extractlast(heap * hp) diff --git a/lib/rfcnb/rfcnb-priv.h b/lib/rfcnb/rfcnb-priv.h index 88a167f5d9..2d49884d05 100644 --- a/lib/rfcnb/rfcnb-priv.h +++ b/lib/rfcnb/rfcnb-priv.h @@ -78,7 +78,7 @@ struct redirect_addr { typedef struct RFCNB_Con { - int fd; /* File descripter for TCP/IP connection */ + int fd; /* File descriptor for TCP/IP connection */ int errn; /* last error */ int timeout; /* How many milli-secs before IO times out */ int redirects; /* How many times we were redirected */ diff --git a/lib/smblib/usage.txt b/lib/smblib/usage.txt index 0804e77322..f91bf6b36c 100644 --- a/lib/smblib/usage.txt +++ b/lib/smblib/usage.txt @@ -142,7 +142,7 @@ accepty as the second parameter. } -If we wnat to find out the protocol that was negotiated then we can do the +If we want to find out the protocol that was negotiated then we can do the following: protocol = SMB_Get_Protocol_IDX(con); diff --git a/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl index b7514e0251..2cd0265e22 100755 --- a/scripts/boiler-mgr.pl +++ b/scripts/boiler-mgr.pl @@ -74,7 +74,7 @@ my $reClaimPrefix = qr{ Portions\s }xi; -# We have persmission to move these frequent claims to CONTRIBUTORS. +# We have permission to move these frequent claims to CONTRIBUTORS. my $reClaimsOkToMove = qr{ Robert.Collins||| diff --git a/scripts/codespell-ignorelist.txt b/scripts/codespell-ignorelist.txt index d01ac66403..f78ea11624 100644 --- a/scripts/codespell-ignorelist.txt +++ b/scripts/codespell-ignorelist.txt @@ -1,7 +1,6 @@ -actuall -agains -aline +afile alloced +anfd anid ans aparent @@ -9,34 +8,36 @@ backword backwords cachable cas +checkin childs -commend +clen +coexistance crypted dont +eference fo followings -formater hight hist iff -inactivate -initate +implementor +inout nd -neeed nnumber normall othere pasttime performes pevents -pointes preceed querys readed referer -retuned -sence -sheme +requestor +requestors +rin +servent +stylessheet tage te tha @@ -50,10 +51,6 @@ tthe ue uint upto -vaid -valuse -whan whats whe wil -wnat diff --git a/src/BodyPipe.h b/src/BodyPipe.h index ec4242b0a3..e437a84d78 100644 --- a/src/BodyPipe.h +++ b/src/BodyPipe.h @@ -142,7 +142,7 @@ protected: // lower-level interface used by Checkout MemBuf &checkOut(); // obtain raw buffer void checkIn(Checkout &checkout); // return updated raw buffer - void undoCheckOut(Checkout &checkout); // undo checkout efffect + void undoCheckOut(Checkout &checkout); // undo checkout effect void scheduleBodyDataNotification(); void scheduleBodyEndNotification(); diff --git a/src/ClientInfo.h b/src/ClientInfo.h index e6de758fa0..e6361300af 100644 --- a/src/ClientInfo.h +++ b/src/ClientInfo.h @@ -79,7 +79,7 @@ public: bool hasQueue(const CommQuotaQueue*) const; ///< has a given queue unsigned int quotaEnqueue(int fd); ///< client starts waiting in queue; create the queue if necessary int quotaPeekFd() const; ///< returns the next fd reservation - unsigned int quotaPeekReserv() const; ///< returns the next reserv. to pop + unsigned int quotaPeekReserv() const; ///< returns the next reservation to pop void quotaDequeue(); ///< pops queue head from queue void kickQuotaQueue(); ///< schedule commHandleWriteHelper call /// either selects the head descriptor for writing or calls quotaDequeue() diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 4a9f211d7e..eae2ab5b44 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -227,7 +227,7 @@ protected: static bool AllowMacros_; static bool ParseQuotedOrToEol_; ///< The next tokens will be handled as quoted or to_eol token static bool RecognizeQuotedPair_; ///< The next tokens may contain quoted-pair (\-escaped) characters - static bool PreviewMode_; ///< The next token will not popped from cfg files, will just previewd. + static bool PreviewMode_; ///< \copydoc PeekAtToken() static bool ParseKvPair_; ///length = size_diff(last_pos + 1, spec->offset); - /* we managed to parse, check if the result makes sence */ + /* we managed to parse, check if the result makes sense */ if (spec->length <= 0) { debugs(68, 2, "invalid range (" << spec->offset << " += " << (long int) spec->length << ") in resp-range-spec near: '" << field << "'"); diff --git a/src/HttpHeaderFieldStat.h b/src/HttpHeaderFieldStat.h index f7d64f6092..7cce4ee673 100644 --- a/src/HttpHeaderFieldStat.h +++ b/src/HttpHeaderFieldStat.h @@ -18,8 +18,8 @@ public: int aliveCount; /* created but not destroyed (count) */ int seenCount; /* number of fields we've seen */ int parsCount; /* number of parsing attempts */ - int errCount; /* number of pasring errors */ - int repCount; /* number of repetitons */ + int errCount; /* number of parsing errors */ + int repCount; /* number of repetitions */ }; #endif /* SQUID_SRC_HTTPHEADERFIELDSTAT_H */ diff --git a/src/Instance.cc b/src/Instance.cc index 3460a95021..e8d7dd52b8 100644 --- a/src/Instance.cc +++ b/src/Instance.cc @@ -19,7 +19,7 @@ #include -/* To support concurrent PID files, convert local statics into PidFile class */ +/* To support concurrent PID files, convert local static variables into PidFile class */ /// Describes the (last) instance PID file being processed. /// This hack shortens reporting code while keeping its messages consistent. diff --git a/src/StatHist.h b/src/StatHist.h index 2950bf10a9..2ea5d6a318 100644 --- a/src/StatHist.h +++ b/src/StatHist.h @@ -74,7 +74,7 @@ public: /** Import values from another histogram * - * \note: the two histograms MUST have the same capicity, min and max or + * \note: the two histograms MUST have the same capacity, min and max or * an exception will be raised */ StatHist &operator += (const StatHist &B); diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc index c14bb3cdb1..8143dd4eaa 100644 --- a/src/acl/Checklist.cc +++ b/src/acl/Checklist.cc @@ -279,7 +279,7 @@ ACLChecklist::fastCheck(const ACLList * const list) // may use a mixture of fastCheck(void) and fastCheck(list) calls. const auto savedList = swapAcl(list); - // assume DENY/ALLOW on mis/matches due to action-free accessList + // assume DENY/ALLOW on mismatches/matches due to action-free accessList // matchAndFinish() takes care of the ALLOW case if (accessList) matchAndFinish(); // calls markFinished() on success diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc index 80a5d634b4..70230653a4 100644 --- a/src/acl/RegexData.cc +++ b/src/acl/RegexData.cc @@ -87,7 +87,7 @@ removeUnnecessaryWildcards(char * t) if (strncmp(t, "^.*", 3) == 0) t += 3; - /* NOTE: an initial '.' might seem unnessary but is not; + /* NOTE: an initial '.' might seem unnecessary but is not; * it can be a valid requirement that cannot be optimised */ while (*t == '.' && *(t+1) == '*') { diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc index 645f23c1d6..736373806d 100644 --- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc +++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc @@ -986,7 +986,7 @@ SearchFilterLDAP(edui_ldap_t *l, char *group) /* * SearchLDAP() - * - * Initate LDAP query, under levels, filtering matches with and optionally + * Initiate LDAP query, under levels, filtering matches with and optionally * will generally be networkAddress ... * */ diff --git a/src/adaptation/Initiator.h b/src/adaptation/Initiator.h index 93d832a351..a5cdcd315b 100644 --- a/src/adaptation/Initiator.h +++ b/src/adaptation/Initiator.h @@ -14,7 +14,7 @@ #include "base/CbcPointer.h" /* - * The ICAP Initiator is an ICAP vectoring point that initates ICAP + * The ICAP Initiator is an ICAP vectoring point that initiates ICAP * transactions. This interface exists to allow ICAP transactions to * signal their initiators that they have the answer from the ICAP server * or that the ICAP query has aborted and there will be no answer. It diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index 5dfd0ebe3e..7f0bc3acbe 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -497,7 +497,7 @@ Adaptation::Ecap::XactionRep::updateHistory(Http::Message *adapted) // Store received meta headers for adapt::adaptLogHistory(); if (ah != nullptr) { HttpHeader meta(hoReply); diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index eb8e75eae4..7763beb69f 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -404,7 +404,7 @@ bool Adaptation::Icap::ModXact::virginBodyEndReached(const Adaptation::Icap::Vir size_t Adaptation::Icap::ModXact::virginContentSize(const Adaptation::Icap::VirginBodyAct &act) const { Must(act.active()); - // asbolute start of unprocessed data + // absolute start of unprocessed data const uint64_t dataStart = act.offset(); // absolute end of buffered data const uint64_t dataEnd = virginConsumed + virgin.body_pipe->buf().contentSize(); @@ -1924,11 +1924,11 @@ uint64_t Adaptation::Icap::VirginBodyAct::offset() const Adaptation::Icap::Preview::Preview(): theWritten(0), theAd(0), theState(stDisabled) {} -void Adaptation::Icap::Preview::enable(size_t anAd) +void Adaptation::Icap::Preview::enable(size_t anAdvertisedSize) { - // TODO: check for anAd not exceeding preview size limit + // TODO: check for anAdvertisedSize not exceeding preview size limit Must(!enabled()); - theAd = anAd; + theAd = anAdvertisedSize; theState = stWriting; } diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h index 4f10111481..ba4d73b8e0 100644 --- a/src/adaptation/icap/ModXact.h +++ b/src/adaptation/icap/ModXact.h @@ -20,9 +20,9 @@ /* * ICAPModXact implements ICAP REQMOD and RESPMOD transaction using * ICAPXaction as the base. The ICAPModXact receives a virgin HTTP message - * from an ICAP vecoring point, (a.k.a., initiator), communicates with the + * from an ICAP vectoring point, (a.k.a. initiator), communicates with the * ICAP server, and sends the adapted HTTP message headers back. - * Virgin/adapted HTTP message body is reveived/sent using BodyPipe + * Virgin/adapted HTTP message body is received/sent using BodyPipe * interface. The initiator (or its associate) is expected to send and/or * receive the HTTP body. */ @@ -88,7 +88,7 @@ class Preview public: Preview(); // disabled - void enable(size_t anAd); // enabled with advertised size + void enable(size_t anAdvertisedSize); // enabled with advertised size bool enabled() const; /* other members can be accessed iff enabled() */ diff --git a/src/adaptation/icap/Options.h b/src/adaptation/icap/Options.h index d94b03d91e..26c5e0a1fe 100644 --- a/src/adaptation/icap/Options.h +++ b/src/adaptation/icap/Options.h @@ -80,7 +80,7 @@ protected: TransferKind kind; // to simplify caller's life }; - // varios Transfer-* lists + // various Transfer-* lists struct Transfers { TransferList preview; TransferList ignore; diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 2c63aa9254..5f8b13ca7d 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -173,7 +173,7 @@ void Adaptation::Icap::ServiceRep::putConnection(const Comm::ConnectionPointer & void Adaptation::Icap::ServiceRep::noteConnectionUse(const Comm::ConnectionPointer &conn) { Must(Comm::IsConnOpen(conn)); - fd_table[conn->fd].noteUse(); // pconn re-use, albeit not via PconnPool API + fd_table[conn->fd].noteUse(); // pconn reuse, albeit not via PconnPool API } void Adaptation::Icap::ServiceRep::noteConnectionFailed(const char *comment) diff --git a/src/adaptation/notes.dox b/src/adaptation/notes.dox index 74b5a156cb..f8119f4fbf 100644 --- a/src/adaptation/notes.dox +++ b/src/adaptation/notes.dox @@ -56,7 +56,7 @@ and is parametrized by the kids (see the allServicesSame member). If an ICAP service with the routing=1 option in squid.conf returns an ICAP X-Next-Services response header during a successful REQMOD or RESPMOD -transaction, Squid abandones the original adaptation plan and forms a new +transaction, Squid abandons the original adaptation plan and forms a new adaptation chain consisting of services identified in the X-Next-Services header value (using a comma-separated list of adaptation service names from squid.conf). The dynamically created chain is destroyed once the new plan is diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h index 6273b51ce8..f67d941c5f 100644 --- a/src/auth/Scheme.h +++ b/src/auth/Scheme.h @@ -43,7 +43,7 @@ public: * After this all schemes will appear completely unsupported * until a call to InitAuthModules(). * Release the Auth::TheConfig handles instead to disable authentication - * without terminiating all support. + * without terminating all support. */ static void FreeAll(); diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h index 889360da63..a74e1d92ef 100644 --- a/src/auth/UserRequest.h +++ b/src/auth/UserRequest.h @@ -116,7 +116,7 @@ public: /** * Check a auth_user pointer for validity. - * Does not check passwords, just data sensability. Broken or Unknown auth_types are not valid for use... + * Does not check passwords, just data validity. Broken or Unknown auth_types are not valid for use... * * \retval false User credentials are missing. * \retval false User credentials use an unknown scheme type. diff --git a/src/auth/basic/LDAP/basic_ldap_auth.cc b/src/auth/basic/LDAP/basic_ldap_auth.cc index 4f3bb18cc4..e22b35a7af 100644 --- a/src/auth/basic/LDAP/basic_ldap_auth.cc +++ b/src/auth/basic/LDAP/basic_ldap_auth.cc @@ -338,7 +338,7 @@ validUsername(const char *user) return 0; while (p[0] && p[1]) { if (xisspace(p[0])) { - /* More than one consequitive space? */ + /* More than one consecutive space? */ if (xisspace(p[1])) return 0; /* or odd space type character used? */ diff --git a/src/auth/basic/PAM/basic_pam_auth.cc b/src/auth/basic/PAM/basic_pam_auth.cc index 59af907a7f..fe1b2d14bc 100644 --- a/src/auth/basic/PAM/basic_pam_auth.cc +++ b/src/auth/basic/PAM/basic_pam_auth.cc @@ -107,13 +107,13 @@ extern "C" int password_conversation(int num_msg, PAM_CONV_FUNC_CONST_PARM struc * A simple "conversation" function returning the supplied password. * Has a bit to much error control, but this is my first PAM application * so I'd rather check everything than make any mistakes. The function - * expects a single converstation message of type PAM_PROMPT_ECHO_OFF. + * expects a single conversation message of type PAM_PROMPT_ECHO_OFF. */ int password_conversation(int num_msg, PAM_CONV_FUNC_CONST_PARM struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) { if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) { - debug("ERROR: Unexpected PAM converstaion '%d/%s'\n", msg[0]->msg_style, msg[0]->msg); + debug("ERROR: Unexpected PAM conversation '%d/%s'\n", msg[0]->msg_style, msg[0]->msg); return PAM_CONV_ERR; } #if _SQUID_SOLARIS_ diff --git a/src/auth/basic/RADIUS/basic_radius_auth.cc b/src/auth/basic/RADIUS/basic_radius_auth.cc index 340faee37b..6df7eb84af 100644 --- a/src/auth/basic/RADIUS/basic_radius_auth.cc +++ b/src/auth/basic/RADIUS/basic_radius_auth.cc @@ -42,7 +42,7 @@ * * basic_radius_auth-1.0 is based on modules from the Cistron-radiusd-1.5.4. * - * Currently you should only start 1 authentificator at a time because the + * Currently you should only start 1 authenticator at a time because the * the ID's of the different programs can start to conflict. I'm not sure it * would help anyway. I think the RADIUS server is close by and I don't think * it will handle requests in parallel anyway (correct me if I'm wrong here) diff --git a/src/cf.data.pre b/src/cf.data.pre index 3fca75897c..c595256622 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -798,8 +798,8 @@ IF HAVE_AUTH_MODULE_BASIC forced to lower case before user credentials are checked or stored. Most user databases are case insensitive, allowing the same username to be - spelled using both lower and upper case letters. For such databases, any - casesenstive setting should work, but forcing usernames to lower case may + spelled using both lower and upper case letters. For such databases, + either setting should work, but forcing usernames to lower case may still make a big difference for Squid internal caches like those used by an external ACL with %un logformat code in FORMAT and a user_max_ip ACL. @@ -5288,7 +5288,7 @@ DOC_START Place: the filename and path to be written. daemon Very similar to stdio. But instead of writing to disk the log - line is passed to a daemon helper for asychronous handling instead. + line is passed to a daemon helper for asynchronous handling instead. Place: varies depending on the daemon. log_file_daemon Place: the file name and path to be written. diff --git a/src/client_side.cc b/src/client_side.cc index d8507bd5e9..5122cfb6f0 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -735,7 +735,7 @@ clientPackRangeHdr(const HttpReplyPointer &rep, const HttpHdrRangeSpec * spec, S /** returns expected content length for multi-range replies * note: assumes that httpHdrRangeCanonize has already been called * warning: assumes that HTTP headers for individual ranges at the - * time of the actuall assembly will be exactly the same as + * time of the actual assembly will be exactly the same as * the headers when clientMRangeCLen() is called */ int64_t ClientHttpRequest::mRangeCLen() const @@ -1081,7 +1081,7 @@ prepareAcceleratedURL(ConnStateData * conn, const Http1::RequestParserPointer &h /* BUG: Squid cannot deal with '*' URLs (RFC2616 5.1.2) */ - // XXX: re-use proper URL parser for this + // XXX: reuse proper URL parser for this SBuf url = hp->requestUri(); // use full provided URI if we abort do { // use a loop so we can break out of it ::Parser::Tokenizer tok(url); @@ -2090,7 +2090,7 @@ ConnStateData::requestTimeout(const CommTimeoutCbParams &io) * Just close the connection to not confuse browsers * using persistent connections. Some browsers open * a connection and then do not use it until much - * later (presumeably because the request triggering + * later (presumably because the request triggering * the open has already been completed on another * connection) */ @@ -2324,7 +2324,7 @@ clientNegotiateSSL(int fd, void *data) #elif (ALLOW_ALWAYS_SSL_SESSION_DETAIL == 1) /* When using gcc 3.3.x and OpenSSL 0.9.7x sometimes a compile error can occur here. - * This is caused by an unpredicatble gcc behaviour on a cast of the first argument + * This is caused by an unpredictable gcc behaviour on a cast of the first argument * of PEM_ASN1_write(). For this reason this code section is disabled. To enable it, * define ALLOW_ALWAYS_SSL_SESSION_DETAIL=1. * Because there are two possible usable cast, if you get an error here, try the other @@ -2604,7 +2604,7 @@ void ConnStateData::buildSslCertGenerationParams(Ssl::CertificateProperties &cer else if (ca->alg == Ssl::algSetValidBefore) certProperties.setValidBefore = true; - debugs(33, 5, "Matches certificate adaptation aglorithm: " << + debugs(33, 5, "Matches certificate adaptation algorithm: " << alg << " param: " << (param ? param : "-")); } } @@ -2808,7 +2808,7 @@ ConnStateData::switchToHttps(ClientHttpRequest *http, Ssl::BumpMode bumpServerMo // Fix timeout to request_start_timeout resetReadTimeout(Config.Timeout.request_start_timeout); // Also reset receivedFirstByte_ flag to allow this timeout work in the case we have - // a bumbed "connect" request on non transparent port. + // a bumped "connect" request on non transparent port. receivedFirstByte_ = false; // Get more data to peek at Tls parsingTlsHandshake = true; diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index d73bf3f99f..9af712660e 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -1035,7 +1035,7 @@ clientReplyContext::checkTransferDone() /* * Handle STORE_OK objects. - * objectLen(entry) will be set proprely. + * objectLen(entry) will be set properly. * RC: Does objectLen(entry) include the Headers? * RC: Yes. */ diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 797de8ee2d..6afcec7e25 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -935,7 +935,7 @@ clientInterpretRequestHeaders(ClientHttpRequest * http) /* XXX: This is suboptimal. We should give the stream the range set, * and thereby let the top of the stream set the offset when the * size becomes known. As it is, we will end up requesting from 0 - * for evey -X range specification. + * for every -X range specification. * RBC - this may be somewhat wrong. We should probably set the range * iter up at this point. */ diff --git a/src/clients/Client.cc b/src/clients/Client.cc index 6ad8dead8d..d488b16801 100644 --- a/src/clients/Client.cc +++ b/src/clients/Client.cc @@ -446,7 +446,7 @@ Client::getMoreRequestBody(MemBuf &buf) return requestBodySource->getMoreData(buf); } -// Compares hosts in urls, returns false if different, no sheme, or no host. +// Compares hosts in urls, returns false if different, no scheme, or no host. static bool sameUrlHosts(const char *url1, const char *url2) { @@ -983,7 +983,7 @@ Client::noteAdaptationAclCheckDone(Adaptation::ServiceGroupPointer group) // TODO: Should we check receivedBodyTooLarge as well? if (!group) { - debugs(11,3, "no adapation needed"); + debugs(11, 3, "no adaptation needed"); setFinalReply(virginReply()); processReplyBody(); return; diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc index fa773dcf54..b5bbb1def3 100644 --- a/src/clients/FtpGateway.cc +++ b/src/clients/FtpGateway.cc @@ -1216,7 +1216,7 @@ ftpReadWelcome(Ftp::Gateway * ftpState) /** * Translate FTP login failure into HTTP error - * this is an attmpt to get the 407 message to show up outside Squid. + * this is an attempt to get the 407 message to show up outside Squid. * its NOT a general failure. But a correct FTP response type. */ void @@ -1246,7 +1246,7 @@ Ftp::Gateway::loginFailed() } failed(ERR_NONE, ctrl.replycode, err); - // any other problems are general falures. + // any other problems are general failures. HttpReply *newrep = err->BuildHttpReply(); delete err; diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc index 79e91fc430..2b93281c86 100644 --- a/src/comm/ModSelect.cc +++ b/src/comm/ModSelect.cc @@ -529,7 +529,7 @@ Comm::SelectLoopInit(void) * I spend the day chasing this core dump that occurs when both the client * and the server side of a cache fetch simultaneoulsy abort the * connection. While I haven't really studied the code to figure out how - * it happens, the snippet below may prevent the cache from exitting: + * it happens, the snippet below may prevent the cache from exiting: * * Call this from where the select loop fails. */ diff --git a/src/defines.h b/src/defines.h index b3681ac22b..925153a955 100644 --- a/src/defines.h +++ b/src/defines.h @@ -66,7 +66,7 @@ #define EBIT_CLR(flag, bit) ((void)((flag) &= ~((1L<<(bit))))) #define EBIT_TEST(flag, bit) ((flag) & ((1L<<(bit)))) -/* bit opearations on a char[] mask of unlimited length */ +/* bit operations on a char[] mask of unlimited length */ #define CBIT_BIT(bit) (1<<((bit)%8)) #define CBIT_BIN(mask, bit) (mask)[(bit)>>3] #define CBIT_SET(mask, bit) ((void)(CBIT_BIN(mask, bit) |= CBIT_BIT(bit))) diff --git a/src/dns/rfc1035.cc b/src/dns/rfc1035.cc index 15a7350b43..2900508806 100644 --- a/src/dns/rfc1035.cc +++ b/src/dns/rfc1035.cc @@ -177,7 +177,7 @@ rfc1035QuestionPack(char *buf, * of the rfc1035_message structure. * * Updates the buffer offset, which is the same as number of - * octects unpacked since the header starts at offset 0. + * octets unpacked since the header starts at offset 0. * * Returns 0 (success) or 1 (error) */ diff --git a/src/dns_internal.cc b/src/dns_internal.cc index b2feeaa336..79c851da46 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -958,7 +958,7 @@ idnsSendQuery(idns_query * q) // sockets and server listening sockets) and the reconfigure completing // (Runner syncConfig() being run). Transactions which loose this race will // produce DNS timeouts (or whatever the caller set) as their queries never - // get queued to be re-tried after the DNS socekts are re-opened. + // get queued to be re-tried after the DNS sockets are re-opened. if (DnsSocketA < 0 && DnsSocketB < 0) { debugs(78, DBG_IMPORTANT, "WARNING: idnsSendQuery: Can't send query, no DNS socket!"); diff --git a/src/external_acl.cc b/src/external_acl.cc index 6a2147b9fa..47e9729c76 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -1058,7 +1058,7 @@ ACLExternal::startLookup(ACLFilledChecklist *ch, external_acl_data *acl, bool in state->queue = oldstate->queue; oldstate->queue = state; } else { - /* No pending lookup found. Sumbit to helper */ + /* No pending lookup found. Submit to helper */ MemBuf buf; buf.init(); diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 3e85598594..dcafe4a36c 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -964,7 +964,7 @@ Rock::SwapDir::full() const return freeSlots != nullptr && !freeSlots->size(); } -// storeSwapOutFileClosed calls this nethod on DISK_NO_SPACE_LEFT, +// storeSwapOutFileClosed calls this method on DISK_NO_SPACE_LEFT, // but it should not happen for us void Rock::SwapDir::diskFull() diff --git a/src/ftp/Elements.h b/src/ftp/Elements.h index c2a2f86bb9..b05de6273f 100644 --- a/src/ftp/Elements.h +++ b/src/ftp/Elements.h @@ -27,7 +27,7 @@ AnyP::ProtocolVersion ProtocolVersion(); /// Create an internal HttpReply structure to house FTP control response info. HttpReply *HttpReplyWrapper(const int ftpStatus, const char *ftpReason, const Http::StatusCode httpStatus, const int64_t clen); -/* FTP Commands used by Squid. ALLCAPS case. Safe for static initializaton. */ +/* FTP Commands used by Squid. ALLCAPS case. Safe for static initialization. */ const SBuf &cmdAppe(); const SBuf &cmdAuth(); const SBuf &cmdCwd(); diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h index 2c11402f42..966cb4f2fc 100644 --- a/src/http/one/Parser.h +++ b/src/http/one/Parser.h @@ -32,7 +32,7 @@ enum ParseState { /** HTTP/1.x protocol parser * * Works on a raw character I/O buffer and tokenizes the content into - * the major CRLF delimited segments of an HTTP/1 procotol message: + * the major CRLF delimited segments of an HTTP/1 protocol message: * * \li first-line (request-line / simple-request / status-line) * \li mime-header 0*( header-name ':' SP field-value CRLF) diff --git a/src/http/one/ResponseParser.h b/src/http/one/ResponseParser.h index 7899f85999..d869c842c8 100644 --- a/src/http/one/ResponseParser.h +++ b/src/http/one/ResponseParser.h @@ -21,9 +21,9 @@ namespace One { * upgrading HTTP/0.9 syntax responses to HTTP/1.1 * * Works on a raw character I/O buffer and tokenizes the content into - * the major CRLF delimited segments of an HTTP/1 respone message: + * the major CRLF delimited segments of an HTTP/1 response message: * - * \li status-line (version SP status SP reash-phrase) + * \li status-line (version SP status SP reason-phrase) * \li mime-header (set of RFC2616 syntax header fields) */ class ResponseParser : public Http1::Parser @@ -41,7 +41,7 @@ public: Http1::Parser::size_type firstLineSize() const override; bool parse(const SBuf &aBuf) override; - /* respone specific fields, read-only */ + /* response specific fields, read-only */ Http::StatusCode messageStatus() const { return statusCode_;} SBuf reasonPhrase() const { return reasonPhrase_;} diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc index 93a64472d7..77e2843267 100644 --- a/src/icmp/Icmp6.cc +++ b/src/icmp/Icmp6.cc @@ -20,7 +20,7 @@ #include "IcmpPinger.h" #include "time/gadgets.h" -// Some system headers are only neeed internally here. +// Some system headers are only needed internally here. // They should not be included via the header. #if HAVE_NETINET_IP6_H diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 87dd7d5559..6828404519 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -109,7 +109,7 @@ static STCB netdbExchangeHandleReply; /* We have to keep a local list of CachePeer names. The Peers structure * gets freed during a reconfigure. We want this database to - * remain persisitent, so _net_db_peer->peername points into this + * remain persistent, so _net_db_peer->peername points into this * linked list */ static wordlist *peer_names = nullptr; diff --git a/src/ip/Address.h b/src/ip/Address.h index 6774af3850..07efdae5a7 100644 --- a/src/ip/Address.h +++ b/src/ip/Address.h @@ -296,7 +296,7 @@ public: void getAddrInfo(struct addrinfo *&ai, int force = AF_UNSPEC) const; /** - * Equivalent to the sysem call freeaddrinfo() but for Ip::Address allocated data + * Equivalent to the system call freeaddrinfo() but for Ip::Address allocated data */ static void FreeAddr(struct addrinfo *&ai); @@ -327,7 +327,7 @@ public: * when moving from converted code to unconverted * these functions can be used to convert this object * and pull out the data needed by the unconverted code - * they are intentionaly hard to use, use getAddrInfo() instead. + * they are intentionally hard to use, use getAddrInfo() instead. * these functions WILL NOT be in the final public API after transition. */ diff --git a/src/ip/Intercept.h b/src/ip/Intercept.h index 6750bba89d..6590cc27ee 100644 --- a/src/ip/Intercept.h +++ b/src/ip/Intercept.h @@ -24,7 +24,7 @@ class Address; \par * There is no formal state-machine for transparency and interception * instead there is this neutral API which other connection state machines - * and the comm layer use to co-ordinate their own state for transparency. + * and the comm layer use to coordinate their own state for transparency. */ class Intercept { diff --git a/src/ipc/ReadWriteLock.h b/src/ipc/ReadWriteLock.h index 09306cb696..b0b015487e 100644 --- a/src/ipc/ReadWriteLock.h +++ b/src/ipc/ReadWriteLock.h @@ -21,7 +21,7 @@ class ReadWriteLockStats; /// an atomic readers-writer or shared-exclusive lock suitable for maps/tables /// Also supports reading-while-appending mode when readers and writer are -/// allowed to access the same locked object because the writer promisses +/// allowed to access the same locked object because the writer promises /// to only append new data and all size-related object properties are atomic. class ReadWriteLock { diff --git a/src/main.cc b/src/main.cc index f3177fe61b..e5d9a98ec9 100644 --- a/src/main.cc +++ b/src/main.cc @@ -408,7 +408,7 @@ mainHandleCommandLineOption(const int optId, const char *optValue) case 'C': /** \par C - * Unset/disabel global option for catchign signals. opt_catch_signals */ + * Unset/disable global option for catchign signals. opt_catch_signals */ opt_catch_signals = 0; break; @@ -1001,7 +1001,7 @@ setEffectiveUser(void) if (geteuid() == 0) { debugs(0, DBG_CRITICAL, "Squid is not safe to run as root! If you must"); debugs(0, DBG_CRITICAL, "start Squid as root, then you must configure"); - debugs(0, DBG_CRITICAL, "it to run as a non-priveledged user with the"); + debugs(0, DBG_CRITICAL, "it to run as a non-privileged user with the"); debugs(0, DBG_CRITICAL, "'cache_effective_user' option in the config file."); fatal("Don't run Squid as root, set 'cache_effective_user'!"); } diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc index ac78ebdf7c..7ab4eca755 100644 --- a/src/mem/old_api.cc +++ b/src/mem/old_api.cc @@ -262,7 +262,7 @@ memConfigure(void) new_pool_limit = Config.MemPools.limit; else { if (Config.MemPools.limit == 0) - debugs(13, DBG_IMPORTANT, "memory_pools_limit 0 has been chagned to memory_pools_limit none. Please update your config"); + debugs(13, DBG_IMPORTANT, "memory_pools_limit 0 has been changed to memory_pools_limit none. Please update your config"); new_pool_limit = -1; } diff --git a/src/pconn.cc b/src/pconn.cc index c3fe62d84d..813e788f40 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -223,7 +223,7 @@ IdleConnList::pop() continue; // our connection timeout handler is scheduled to run already. unsafe for now. - // TODO: cancel the pending timeout callback and allow re-use of the conn. + // TODO: cancel the pending timeout callback and allow reuse of the conn. if (fd_table[theList_[i]->fd].timeoutHandler == nullptr) continue; @@ -275,7 +275,7 @@ IdleConnList::findUseable(const Comm::ConnectionPointer &aKey) continue; // our connection timeout handler is scheduled to run already. unsafe for now. - // TODO: cancel the pending timeout callback and allow re-use of the conn. + // TODO: cancel the pending timeout callback and allow reuse of the conn. if (fd_table[theList_[i]->fd].timeoutHandler == nullptr) continue; diff --git a/src/peer_digest.cc b/src/peer_digest.cc index f1c71283b7..3139ceebf7 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -682,7 +682,7 @@ PeerDigest::noteFetchFinished(const DigestFetchState &finishedFetch, const char /* XXX: ugly condition, but how? */ if (fetch->entry->store_status == STORE_OK) - debugs(72, 2, "re-used old digest from " << host); + debugs(72, 2, "reused old digest from " << host); else debugs(72, 2, "received valid digest from " << host); } diff --git a/src/redirect.cc b/src/redirect.cc index 3ed07c1a75..54ba83c854 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -100,7 +100,7 @@ redirectHandleReply(void *data, const Helper::Reply &reply) size_t replySize = 0; if (const char *t = strchr(res, ' ')) { static int warn = 0; - debugs(61, (!(warn++%50)? DBG_CRITICAL:2), "WARNING: UPGRADE: URL rewriter reponded with garbage '" << t << + debugs(61, (!(warn++%50)? DBG_CRITICAL:2), "WARNING: UPGRADE: URL rewriter responded with garbage '" << t << "'. Future Squid will treat this as part of the URL."); replySize = t - res; } else diff --git a/src/sbuf/Algorithms.h b/src/sbuf/Algorithms.h index bd9d2527fc..351b4ea87f 100644 --- a/src/sbuf/Algorithms.h +++ b/src/sbuf/Algorithms.h @@ -38,7 +38,7 @@ private: SBufCaseSensitive sensitivity_; }; -/** SBuf size addition accumulator for STL contaniners +/** SBuf size addition accumulator for STL containers * * Equivalent to prefix_length + SBuf.length() + separator.length() */ diff --git a/src/sbuf/SBuf.h b/src/sbuf/SBuf.h index f0f1d97874..414a3b93f9 100644 --- a/src/sbuf/SBuf.h +++ b/src/sbuf/SBuf.h @@ -491,7 +491,7 @@ public: /** Extract a part of the current SBuf. * * Return a fresh a fresh copy of a portion the current SBuf, which is - * left untouched. The same parameter convetions apply as for chop. + * left untouched. The same parameter conventions apply as for chop. * \see trim, chop */ SBuf substr(size_type pos, size_type n = npos) const; diff --git a/src/security/PeerConnector.h b/src/security/PeerConnector.h index 6debffdb32..68cd81cc01 100644 --- a/src/security/PeerConnector.h +++ b/src/security/PeerConnector.h @@ -92,7 +92,7 @@ protected: /// Called after each negotiation step to handle the result void handleNegotiationResult(const Security::IoResult &); - /// Called when the openSSL SSL_connect fnction request more data from + /// Called when the openSSL SSL_connect function request more data from /// the remote SSL server. Sets the read timeout and sets the /// Squid COMM_SELECT_READ handler. void noteWantRead(); diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc index 6252476a05..4d3f8cecbb 100644 --- a/src/servers/FtpServer.cc +++ b/src/servers/FtpServer.cc @@ -1188,7 +1188,7 @@ Ftp::Server::writeForwardedReplyAndCall(const HttpReply *reply, AsyncCall::Point // TODO: Add connect timeout for passive connections listener? // TODO: Remember server response so that we can forward it? } else { - // Either the connection was establised and closed after the + // Either the connection was established and closed after the // data was transferred OR we failed to establish an active // data connection and already sent the error to the client. // In either case, there is nothing more to do. @@ -1467,7 +1467,7 @@ Ftp::Server::createDataConnection(Ip::Address cltAddr) // server IP the client is connecting to, it can be spoofed by Squid. // // In both cases some clients may refuse to accept data connections if - // these control connectin local-IP's are not used. + // these control connection local-IP's are not used. conn->setAddrs(clientConnection->local, cltAddr); // Using non-local addresses in TPROXY mode requires appropriate socket option. diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index 309cae8aef..8eff733be0 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -125,7 +125,7 @@ Ssl::ErrorDetailsManager::findDetail(const Security::ErrorCode value, const Http //Try to retrieve from cache size_t pos = 0; char lang[256]; - // Get the first ellement of the Accept-Language header + // Get the first element of the Accept-Language header strHdrAcptLangGetItem(hdr, lang, 256, pos); errDetails = getCachedDetails(lang); // search in cache diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc index 09bad6ddd1..a8406df39c 100644 --- a/src/ssl/gadgets.cc +++ b/src/ssl/gadgets.cc @@ -330,8 +330,8 @@ mimicAuthorityKeyId(Security::CertPointer &cert, Security::CertPointer const &mi if (addKeyId) { X509_EXTENSION *ext; // Check if the issuer has the Subject Key Identifier extension - const int indx = X509_get_ext_by_NID(issuerCert.get(), NID_subject_key_identifier, -1); - if (indx >= 0 && (ext = X509_get_ext(issuerCert.get(), indx))) { + const int index = X509_get_ext_by_NID(issuerCert.get(), NID_subject_key_identifier, -1); + if (index >= 0 && (ext = X509_get_ext(issuerCert.get(), index))) { issuerKeyId.reset((ASN1_OCTET_STRING *)X509V3_EXT_d2i(ext)); } } @@ -525,7 +525,7 @@ Ssl::ParseCommonNameAt(X509_NAME &name, const int cnIndex) return std::nullopt; } -/// Adds a new subjectAltName extension contining Subject CN or returns false +/// Adds a new subjectAltName extension containing Subject CN or returns false /// expects the caller to check for the existing subjectAltName extension static bool addAltNameWithSubjectCn(Security::CertPointer &cert) diff --git a/src/ssl/support.cc b/src/ssl/support.cc index f4a504cbaf..3105e49c0d 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -809,7 +809,7 @@ Ssl::InitClientContext(Security::ContextPointer &ctx, Security::PeerOptions &pee return false; if (!peer.sslCipher.isEmpty()) { - debugs(83, 5, "Using chiper suite " << peer.sslCipher << "."); + debugs(83, 5, "Using cipher suite " << peer.sslCipher << "."); const char *cipher = peer.sslCipher.c_str(); if (!SSL_CTX_set_cipher_list(ctx.get(), cipher)) { diff --git a/src/store/Disks.cc b/src/store/Disks.cc index 2ea1b5f242..6b39e3d26d 100644 --- a/src/store/Disks.cc +++ b/src/store/Disks.cc @@ -725,7 +725,7 @@ storeDirWriteCleanLogs(int reopen) /* * This may look inefficient as CPU wise it is more efficient to do this - * sequentially, but I/O wise the parallellism helps as it allows more + * sequentially, but I/O wise the parallelism helps as it allows more * hdd spindles to be active. */ while (notdone) { diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc index d5fd1c3dca..bc1ad9c2db 100644 --- a/src/test_cache_digest.cc +++ b/src/test_cache_digest.cc @@ -55,7 +55,7 @@ typedef struct { } RawAccessLogEntry; typedef enum { - frError = -2, frMore = -1, frEof = 0, frOk = 1 + frError = -2, frMore = -1, frEof = 0, frSuccess = 1 } fr_result; typedef struct _FileIterator FileIterator; @@ -369,7 +369,7 @@ swapStateReader(FileIterator * fi) exit(-3); } - return frOk; + return frSuccess; } static fr_result @@ -455,7 +455,7 @@ accessLogReader(FileIterator * fi) /*fprintf(stdout, "%s:%d: %s %s %s %s\n", * fname, count, method, storeKeyText(entry->key), url, hier); */ - return frOk; + return frSuccess; } static void diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc index f390056532..3cdbe811ec 100644 --- a/src/tests/testACLMaxUserIP.cc +++ b/src/tests/testACLMaxUserIP.cc @@ -86,7 +86,7 @@ TestACLMaxUserIP::testParseLine() /* we want a maximum of one, and strict to be true */ CPPUNIT_ASSERT_EQUAL(1, maxUserIpACL->getMaximum()); CPPUNIT_ASSERT_EQUAL(true, static_cast(maxUserIpACL->beStrict)); - /* the acl must be vaid */ + /* the acl must be valid */ CPPUNIT_ASSERT_EQUAL(true, maxUserIpACL->valid()); } Acl::FreeNamedAcls(&Config.namedAcls); diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc index 7076cdc1cd..b95c50ad75 100644 --- a/src/tests/testSBuf.cc +++ b/src/tests/testSBuf.cc @@ -426,7 +426,7 @@ TestSBuf::testComparisons() CPPUNIT_ASSERT(s1 < s2); // specifying the max-length and overhanging size CPPUNIT_ASSERT_EQUAL(1,SBuf("foolong").caseCmp(SBuf("foo"), 5)); - // case-insensive comaprison + // case-insensive comparison s1 = "foo"; s2 = "fOo"; CPPUNIT_ASSERT_EQUAL(0,s1.caseCmp(s2)); @@ -920,7 +920,7 @@ TestSBuf::testReserve() for (SBuf::size_type filled = 0; filled < requirements.maxCapacity +5; ++filled) { CPPUNIT_ASSERT_EQUAL(b.length(), min(filled, requirements.maxCapacity)); auto x = b.reserve(requirements); - // the amount of space advertized must not cause users to exceed capacity + // the amount of space advertised must not cause users to exceed capacity CPPUNIT_ASSERT(x <= requirements.maxCapacity - filled); CPPUNIT_ASSERT(b.spaceSize() <= requirements.maxCapacity - filled); // the total size of buffer must not cause users to exceed capacity diff --git a/src/tunnel.cc b/src/tunnel.cc index b2c8932ad3..15029c4c66 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -851,7 +851,7 @@ tunnelTimeout(const CommTimeoutCbParams &io) { TunnelStateData *tunnelState = static_cast(io.data); debugs(26, 3, io.conn); - /* Temporary lock to protect our own feets (comm_close -> tunnelClientClosed -> Free) */ + /* Temporary lock to protect our own feet (comm_close -> tunnelClientClosed -> Free) */ CbcPointer safetyLock(tunnelState); tunnelState->closeConnections(); @@ -1097,7 +1097,7 @@ tunnelErrorComplete(int fd/*const Comm::ConnectionPointer &*/, void *data, size_ TunnelStateData *tunnelState = (TunnelStateData *)data; debugs(26, 3, "FD " << fd); assert(tunnelState != nullptr); - /* temporary lock to save our own feets (comm_close -> tunnelClientClosed -> Free) */ + /* temporary lock to save our own feet (comm_close -> tunnelClientClosed -> Free) */ CbcPointer safetyLock(tunnelState); if (Comm::IsConnOpen(tunnelState->client.conn)) diff --git a/src/wccp2.cc b/src/wccp2.cc index 92e10efd58..37dbf57d32 100644 --- a/src/wccp2.cc +++ b/src/wccp2.cc @@ -50,7 +50,7 @@ static EVH wccp2AssignBuckets; #define WCCP2_NUMPORTS 8 #define WCCP2_PASSWORD_LEN 8 + 1 /* + 1 for C-string NUL terminator */ -/* WCCPv2 Pakcet format structures */ +/* WCCPv2 Packet format structures */ /* Defined in draft-wilson-wccp-v2-12-oct-2001.txt */ /** \interface WCCPv2_Protocol