From 4b6fd29f1a0e5e71b1863b843324a7bdc800ef0a Mon Sep 17 00:00:00 2001 From: Pedro Monreal Date: Sun, 2 Feb 2020 09:49:28 +0100 Subject: cleanup: fix typos and wording in docs and comments Closes #4869 Reviewed-by: Emil Engler and Daniel Gustafsson --- docs/KNOWN_BUGS | 2 +- docs/cmdline-opts/alt-svc.d | 2 +- lib/doh.c | 4 ++-- lib/http.c | 2 +- lib/url.c | 2 +- lib/vtls/schannel.c | 2 +- lib/vtls/sectransp.c | 4 ++-- m4/curl-confopts.m4 | 6 +++--- m4/curl-functions.m4 | 4 ++-- packages/vms/compare_curl_source.com | 2 +- packages/vms/curl_crtl_init.c | 2 +- packages/vms/readme | 4 ++-- tests/keywords.pl | 4 ++-- tests/runtests.pl | 4 ++-- tests/server/sws.c | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 93cac0f88..60221ff7b 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -151,7 +151,7 @@ problems may have been fixed or changed somewhat since this was written! 1.6 Unnecessary close when 401 received waiting for 100 libcurl closes the connection if an HTTP 401 reply is received while it is - waiting for the the 100-continue response. + waiting for the 100-continue response. https://curl.haxx.se/mail/lib-2008-08/0462.html 1.7 Deflate error after all content was received diff --git a/docs/cmdline-opts/alt-svc.d b/docs/cmdline-opts/alt-svc.d index df10bf257..15877a2fe 100644 --- a/docs/cmdline-opts/alt-svc.d +++ b/docs/cmdline-opts/alt-svc.d @@ -14,4 +14,4 @@ Specify a "" file name (zero length) to avoid loading/saving and make curl just handle the cache in memory. If this option is used several times, curl will load contents from all the -files but the the last one will be used for saving. +files but the last one will be used for saving. diff --git a/lib/doh.c b/lib/doh.c index 7f4eee5d8..aaa8f15ca 100644 --- a/lib/doh.c +++ b/lib/doh.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 2018 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -548,7 +548,7 @@ static DOHcode store_cname(unsigned char *doh, if((index + 1) >= dohlen) return DOH_DNS_OUT_OF_RANGE; - /* move to the the new index */ + /* move to the new index */ newpos = (length & 0x3f) << 8 | doh[index + 1]; index = newpos; continue; diff --git a/lib/http.c b/lib/http.c index 548ba07cc..c500ae0d7 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2388,7 +2388,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) return CURLE_OUT_OF_MEMORY; } } - /* Extract the the URL to use in the request. Store in STRING_TEMP_URL for + /* Extract the URL to use in the request. Store in STRING_TEMP_URL for clean-up reasons if the function returns before the free() further down. */ uc = curl_url_get(h, CURLUPART_URL, &data->set.str[STRING_TEMP_URL], 0); diff --git a/lib/url.c b/lib/url.c index 5bc20a05b..07d429e35 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1269,7 +1269,7 @@ ConnectionExists(struct Curl_easy *data, needle->conn_to_port == check->conn_to_port) && strcasecompare(needle->host.name, check->host.name) && needle->remote_port == check->remote_port) { - /* The schemes match or the the protocol family is the same and the + /* The schemes match or the protocol family is the same and the previous connection was TLS upgraded, and the hostname and host port match */ if(needle->handler->flags & PROTOPT_SSL) { diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index dc58ed0d3..0818d947a 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -718,7 +718,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) unsigned short* list_len = NULL; /* The first four bytes will be an unsigned int indicating number - of bytes of data in the rest of the the buffer. */ + of bytes of data in the rest of the buffer. */ extension_len = (unsigned int *)(&alpn_buffer[cur]); cur += sizeof(unsigned int); diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index 4eece89d5..7dd028fb7 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2012 - 2017, Nick Zitzmann, . - * Copyright (C) 2012 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 2012 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -1164,7 +1164,7 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath, * the Keychain. * * As this doesn't match iOS, and apps may not want to see their client - * certificate saved in the the user's keychain, we use SecItemImport + * certificate saved in the user's keychain, we use SecItemImport * with a NULL keychain to avoid importing it. * * This returns a SecCertificateRef from which we can construct a diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 index af15a85d9..eaae5b9c6 100644 --- a/m4/curl-confopts.m4 +++ b/m4/curl-confopts.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -107,7 +107,7 @@ AC_HELP_STRING([--disable-curldebug],[Disable curl debug memory tracking]), ;; default) dnl configure's curldebug option not specified. Initially we will - dnl handle this as a a request to use the same setting as option + dnl handle this as a request to use the same setting as option dnl --enable-debug. IOW, initially, for debug-enabled builds dnl this will be handled as a request to enable curldebug if dnl possible, and for debug-disabled builds this will be handled @@ -198,7 +198,7 @@ AC_HELP_STRING([--disable-optimize],[Disable compiler optimizations]), ;; default) dnl configure's optimize option not specified. Initially we will - dnl handle this as a a request contrary to configure's setting + dnl handle this as a request contrary to configure's setting dnl for --enable-debug. IOW, initially, for debug-enabled builds dnl this will be handled as a request to disable optimizations if dnl possible, and for debug-disabled builds this will be handled diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 9020f3942..e773f6700 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -6350,7 +6350,7 @@ dnl glibc-style strerror_r: dnl dnl char *strerror_r(int errnum, char *workbuf, size_t bufsize); dnl -dnl glibc-style strerror_r returns a pointer to the the error string, +dnl glibc-style strerror_r returns a pointer to the error string, dnl and might use the provided workbuf as a scratch area if needed. A dnl quick test on a few systems shows that it's usually not used at all. dnl diff --git a/packages/vms/compare_curl_source.com b/packages/vms/compare_curl_source.com index eeaec31dc..66f6a4598 100644 --- a/packages/vms/compare_curl_source.com +++ b/packages/vms/compare_curl_source.com @@ -17,7 +17,7 @@ $! me because VMS Backup can create a saveset of files from a $! NFS mounted volume. $! $! First the files in the original source directory which is assumed to be -$! under source codde control are compared with the copy directory. +$! under source code control are compared with the copy directory. $! $! Then the files are are only in the copy directory are listed. $! diff --git a/packages/vms/curl_crtl_init.c b/packages/vms/curl_crtl_init.c index 7a8d84743..9f7cf66c7 100644 --- a/packages/vms/curl_crtl_init.c +++ b/packages/vms/curl_crtl_init.c @@ -1,7 +1,7 @@ /* File: curl_crtl_init.c * * This file makes sure that the DECC Unix settings are correct for - * the mode the the program is run in. + * the mode the program is run in. * * The CRTL has not been initialized at the time that these routines * are called, so many routines can not be called. diff --git a/packages/vms/readme b/packages/vms/readme index ddfac747a..be1278fca 100644 --- a/packages/vms/readme +++ b/packages/vms/readme @@ -194,7 +194,7 @@ LDAP and Kerberos installed, you can use the GNV_LINK_CURL.COM file. The GNV_LINK_CURL.COM contains information on how to link and run with a newer version of HP SSL than what may be install on an Alpha or IA64 based system. -To build the PCSI kit, follow the the instructions in the file +To build the PCSI kit, follow the instructions in the file curl_gnv_build_steps.txt. Other Notes: @@ -206,7 +206,7 @@ The libcurl formdata.c module and Curl tools post form now have some understanding of VMS file types. Files will be posted in STREAM_LF format. The Curl tool now has some understanding of VMS file types and will upload the -files in STREAM_LF fomat. +files in STREAM_LF format. When CURL is uploading a VARIABLE format VMS file, it is less efficient as in order to get the file size, it will first read the entire file once, and then diff --git a/tests/keywords.pl b/tests/keywords.pl index 7ab907fe3..a84753ada 100755 --- a/tests/keywords.pl +++ b/tests/keywords.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -42,7 +42,7 @@ my $TESTCASES; # start with no test cases for(@cmds) { $_ =~ s/[a-z\/\.]*//g; } -# the the numbers from low to high +# the numbers from low to high for(sort { $a <=> $b } @cmds) { $TESTCASES .= " $_"; } diff --git a/tests/runtests.pl b/tests/runtests.pl index 8a8a6e02a..bef95574d 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -3152,7 +3152,7 @@ sub subVariables { $$thing =~ s/%USER/$USER/g; # The purpose of FTPTIME2 and FTPTIME3 is to provide times that can be - # used for time-out tests and that whould work on most hosts as these + # used for time-out tests and that would work on most hosts as these # adjust for the startup/check time for this particular host. We needed # to do this to make the test suite run better on very slow hosts. diff --git a/tests/server/sws.c b/tests/server/sws.c index 10982b63a..65f8aa619 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -605,7 +605,7 @@ static int ProcessRequest(struct httprequest *req) } if(req->testno == DOCNUMBER_NOTHING) { - /* Still no test case number. Try to get the the number off the last dot + /* Still no test case number. Try to get the number off the last dot instead, IE we consider the TLD to be the test number. Test 123 can then be written as "example.com.123". */ -- cgit v1.2.3