From 7e35eb77292fe6464889ddc8329c6a64136f969d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 23 Feb 2018 23:29:01 +0000 Subject: spelling fixes Detected using the `codespell` tool. Also contains one URL protocol upgrade. Closes https://github.com/curl/curl/pull/2334 --- lib/checksrc.pl | 10 +++++----- lib/curl_ntlm_wb.c | 2 +- lib/ftp.c | 2 +- lib/mk-ca-bundle.vbs | 2 +- lib/objnames.inc | 2 +- lib/parsedate.c | 2 +- lib/rtsp.c | 2 +- lib/sendf.c | 4 ++-- lib/sha256.c | 2 +- lib/telnet.c | 3 ++- lib/url.c | 2 +- lib/urldata.h | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/checksrc.pl b/lib/checksrc.pl index 92af9000c..c222bb87c 100755 --- a/lib/checksrc.pl +++ b/lib/checksrc.pl @@ -26,7 +26,7 @@ my $indent = 2; my $warnings; my $errors; -my $supressed; # whitelisted problems +my $suppressed; # whitelisted problems my $file; my $dir="."; my $wlist; @@ -60,7 +60,7 @@ my %warnings = ( 'ASTERISKNOSPACE' => 'pointer declared without space before asterisk', 'ASSIGNWITHINCONDITION' => 'assignment within conditional expression', 'EQUALSNOSPACE' => 'equals sign without following space', - 'NOSPACEEQUALS' => 'equals sign without preceeding space', + 'NOSPACEEQUALS' => 'equals sign without preceding space', 'SEMINOSPACE' => 'semicolon without following space', 'MULTISPACE' => 'multiple spaces used when not suitable', ); @@ -101,7 +101,7 @@ sub checkwarn { } if($nowarn) { - $supressed++; + $suppressed++; if($w) { $swarnings++; } @@ -422,7 +422,7 @@ sub scanfile { # There is a quote here, figure out whether the comma is # within a string or '' or not. if($pref =~ /\"/) { - # withing a string + # within a string } elsif($pref =~ /\'$/) { # a single letter @@ -596,7 +596,7 @@ sub scanfile { if($errors || $warnings || $verbose) { printf "checksrc: %d errors and %d warnings\n", $errors, $warnings; - if($supressed) { + if($suppressed) { printf "checksrc: %d errors and %d warnings suppressed\n", $serrors, $swarnings; diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c index 03f47a3a5..353a65645 100644 --- a/lib/curl_ntlm_wb.c +++ b/lib/curl_ntlm_wb.c @@ -364,7 +364,7 @@ CURLcode Curl_output_ntlm_wb(struct connectdata *conn, case NTLMSTATE_TYPE1: default: /* Use Samba's 'winbind' daemon to support NTLM authentication, - * by delegating the NTLM challenge/response protocal to a helper + * by delegating the NTLM challenge/response protocol to a helper * in ntlm_auth. * http://devel.squid-cache.org/ntlm/squid_helper_protocol.html * https://www.samba.org/samba/docs/man/manpages-3/winbindd.8.html diff --git a/lib/ftp.c b/lib/ftp.c index a119fe1b8..fec591918 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1538,7 +1538,7 @@ static CURLcode ftp_state_type(struct connectdata *conn) date. */ if(data->set.opt_no_body && ftpc->file && ftp_need_type(conn, data->set.prefer_ascii)) { - /* The SIZE command is _not_ RFC 959 specified, and therefor many servers + /* The SIZE command is _not_ RFC 959 specified, and therefore many servers may not support it! It is however the only way we have to get a file's size! */ diff --git a/lib/mk-ca-bundle.vbs b/lib/mk-ca-bundle.vbs index a9b983e9b..8da279268 100755 --- a/lib/mk-ca-bundle.vbs +++ b/lib/mk-ca-bundle.vbs @@ -314,7 +314,7 @@ Function RegExprFirst(SearchPattern, TheString) Set objRegExp = New RegExp ' create a regular expression. objRegExp.Pattern = SearchPattern ' sets the search pattern. objRegExp.IgnoreCase = TRUE ' set to ignores case. - objRegExp.Global = TRUE ' set to gloabal search. + objRegExp.Global = TRUE ' set to global search. Set Matches = objRegExp.Execute(TheString) ' do the search. If (Matches.Count) Then RegExprFirst = Matches(0).SubMatches(0) ' return first match. diff --git a/lib/objnames.inc b/lib/objnames.inc index 6a5b2a837..e362f6e8e 100644 --- a/lib/objnames.inc +++ b/lib/objnames.inc @@ -86,7 +86,7 @@ curl_10char_object_name() { # curl_8char_object_name # # Same as curl_10char_object_name() description and details above, except -# that object name is limited to 8 charcters maximum. +# that object name is limited to 8 characters maximum. # curl_8char_object_name() { diff --git a/lib/parsedate.c b/lib/parsedate.c index 23a787fc9..aa27303fc 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -433,7 +433,7 @@ static int parsedate(const char *date, time_t *output) tzoff = (val/100 * 60 + val%100)*60; /* the + and - prefix indicates the local time compared to GMT, - this we need ther reversed math to get what we want */ + this we need their reversed math to get what we want */ tzoff = date[-1]=='+'?-tzoff:tzoff; } diff --git a/lib/rtsp.c b/lib/rtsp.c index 168e24593..c60697290 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -47,7 +47,7 @@ * -incoming server requests * -server CSeq counter * -digest authentication - * -connect thru proxy + * -connect through proxy * -pipelining? */ diff --git a/lib/sendf.c b/lib/sendf.c index 227d1fc6a..27c0ccc73 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -389,7 +389,7 @@ ssize_t Curl_send_plain(struct connectdata *conn, int num, (WSAEWOULDBLOCK == err) #else /* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned - due to its inability to send off data without blocking. We therefor + due to its inability to send off data without blocking. We therefore treat both error codes the same here */ (EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err) || (EINPROGRESS == err) @@ -456,7 +456,7 @@ ssize_t Curl_recv_plain(struct connectdata *conn, int num, char *buf, (WSAEWOULDBLOCK == err) #else /* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned - due to its inability to send off data without blocking. We therefor + due to its inability to send off data without blocking. We therefore treat both error codes the same here */ (EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err) #endif diff --git a/lib/sha256.c b/lib/sha256.c index c2acb5265..55716c63b 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -242,7 +242,7 @@ static int SHA256_Final(unsigned char *out, sha256_compress(md, md->buf); md->curlen = 0; } - /* pad upto 56 bytes of zeroes */ + /* pad up to 56 bytes of zeroes */ while(md->curlen < 56) { md->buf[md->curlen++] = (unsigned char)0; } diff --git a/lib/telnet.c b/lib/telnet.c index 48b134ee3..78d3a853d 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -1460,7 +1460,8 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) if(n == 0) /* no bytes */ break; - readfile_read = (DWORD)n; /* fall thru with number of bytes read */ + /* fall through with number of bytes read */ + readfile_read = (DWORD)n; } else { /* read from stdin */ diff --git a/lib/url.c b/lib/url.c index 90afd03a6..f991ade5c 100644 --- a/lib/url.c +++ b/lib/url.c @@ -4117,7 +4117,7 @@ static CURLcode create_conn(struct Curl_easy *data, *************************************************************/ if(prot_missing) { /* We're guessing prefixes here and if we're told to use a proxy or if - we're gonna follow a Location: later or... then we need the protocol + we're going to follow a Location: later or... then we need the protocol part added so that we have a valid URL. */ char *reurl; char *ch_lower; diff --git a/lib/urldata.h b/lib/urldata.h index 975333867..3d7b9e5a5 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1166,7 +1166,7 @@ struct Curl_http2_dep { }; /* - * This struct is for holding data that was attemped to get sent to the user's + * This struct is for holding data that was attempted to get sent to the user's * callback but is held due to pausing. One instance per type (BOTH, HEADER, * BODY). */ -- cgit v1.2.3