From: Viktor Szakats Date: Thu, 15 Aug 2024 09:00:04 +0000 (+0200) Subject: tidy-up: misc spelling (bit, ASCII) X-Git-Tag: curl-8_10_0~247 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b042d5297d40c3427d229b3297eb2d622de5dce6;p=thirdparty%2Fcurl.git tidy-up: misc spelling (bit, ASCII) Closes #14559 --- diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words index cf2aabf537..5ff25f45b0 100644 --- a/.github/scripts/spellcheck.words +++ b/.github/scripts/spellcheck.words @@ -33,7 +33,6 @@ archivers Archos Arntsen Aros -ascii asynch AsynchDNS atime diff --git a/docs/TODO b/docs/TODO index 0b76108421..6e6747b8c7 100644 --- a/docs/TODO +++ b/docs/TODO @@ -347,7 +347,7 @@ 1.17 Add support for IRIs - IRIs (RFC 3987) allow localized, non-ascii, names in the URL. To properly + IRIs (RFC 3987) allow localized, non-ASCII, names in the URL. To properly support this, curl/libcurl would need to translate/encode the given input from the input string encoding into percent encoded output "over the wire". @@ -1234,7 +1234,7 @@ -J/--remote-header-name does not decode %-encoded filenames. RFC 6266 details how it should be done. The can of worm is basically that we have no charset - handling in curl and ascii >=128 is a challenge for us. Not to mention that + handling in curl and ASCII >=128 is a challenge for us. Not to mention that decoding also means that we need to check for nastiness that is attempted, like "../" sequences and the like. Probably everything to the left of any embedded slashes should be cut off. diff --git a/docs/URL-SYNTAX.md b/docs/URL-SYNTAX.md index e7b484f81a..3c921f8570 100644 --- a/docs/URL-SYNTAX.md +++ b/docs/URL-SYNTAX.md @@ -226,7 +226,7 @@ directory listing for the root / home directory is returned. FTP servers typically put the user in its "home directory" after login, which then differs between users. To explicitly specify the root directory of an FTP server, start the path with double slash `//` or `/%2f` (2F is the hexadecimal -value of the ascii code for the slash). +value of the ASCII code for the slash). ## FILE diff --git a/docs/examples/debug.c b/docs/examples/debug.c index 68d93039e2..ac21b8aed2 100644 --- a/docs/examples/debug.c +++ b/docs/examples/debug.c @@ -128,7 +128,7 @@ int main(void) CURLcode res; struct data config; - config.trace_ascii = 1; /* enable ascii tracing */ + config.trace_ascii = 1; /* enable ASCII tracing */ curl = curl_easy_init(); if(curl) { diff --git a/docs/libcurl/curl_version_info.md b/docs/libcurl/curl_version_info.md index 2a0220d294..271e935caf 100644 --- a/docs/libcurl/curl_version_info.md +++ b/docs/libcurl/curl_version_info.md @@ -116,13 +116,13 @@ new the libcurl you are using is. You are however guaranteed to get a struct that you have a matching struct for in the header, as you tell libcurl your "age" with the input argument. -*version* is just an ascii string for the libcurl version. +*version* is just an ASCII string for the libcurl version. *version_num* is a 24 bit number created like this: \<8 bits major number\> | \<8 bits minor number\> | \<8 bits patch number\>. Version 7.9.8 is therefore returned as 0x070908. -*host* is an ascii string showing what host information that this libcurl +*host* is an ASCII string showing what host information that this libcurl was built for. As discovered by a configure script or set by the build environment. diff --git a/docs/libcurl/libcurl-tutorial.md b/docs/libcurl/libcurl-tutorial.md index d9fb10aa1d..7c59e2f88c 100644 --- a/docs/libcurl/libcurl-tutorial.md +++ b/docs/libcurl/libcurl-tutorial.md @@ -1255,7 +1255,7 @@ curl_mime_subparts(3). Once it has been bound to its parent multi-part, a nth-level multi-part belongs to it and should not be freed explicitly. -Email messages data is not supposed to be non-ascii and line length is +Email messages data is not supposed to be non-ASCII and line length is limited: fortunately, some transfer encodings are defined by the standards to support the transmission of such incompatible data. Function curl_mime_encoder(3) tells a part that its source data must be encoded diff --git a/include/curl/curl.h b/include/curl/curl.h index e37394174a..29e025c318 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2645,7 +2645,7 @@ CURL_EXTERN char *curl_getenv(const char *variable); * * DESCRIPTION * - * Returns a static ascii string of the libcurl version. + * Returns a static ASCII string of the libcurl version. */ CURL_EXTERN char *curl_version(void); diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c index d91152fdfa..2136720602 100644 --- a/lib/asyn-thread.c +++ b/lib/asyn-thread.c @@ -371,7 +371,7 @@ query_complete(DWORD err, DWORD bytes, LPWSAOVERLAPPED overlapped) if(namelen) { size_t i; ca->ai_canonname = (void *)((char *)ca->ai_addr + ss_size); - for(i = 0; i < namelen; ++i) /* convert wide string to ascii */ + for(i = 0; i < namelen; ++i) /* convert wide string to ASCII */ ca->ai_canonname[i] = (char)ai->ai_canonname[i]; ca->ai_canonname[namelen] = '\0'; } diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 4dae41a896..734547d006 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -79,7 +79,7 @@ #define GZIP_MAGIC_1 0x8b /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ASCII text */ #define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ #define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ #define ORIG_NAME 0x08 /* bit 3 set: original filename present */ diff --git a/lib/ftp.c b/lib/ftp.c index fcb540a6b1..cbb89012cc 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -188,7 +188,7 @@ static CURLcode ftp_regular_transfer(struct Curl_easy *data, bool *done); #ifndef CURL_DISABLE_VERBOSE_STRINGS static void ftp_pasv_verbose(struct Curl_easy *data, struct Curl_addrinfo *ai, - char *newhost, /* ascii version */ + char *newhost, /* ASCII version */ int port); #endif static CURLcode ftp_state_prepare_transfer(struct Curl_easy *data); @@ -3694,7 +3694,7 @@ static CURLcode ftp_nb_type(struct Curl_easy *data, static void ftp_pasv_verbose(struct Curl_easy *data, struct Curl_addrinfo *ai, - char *newhost, /* ascii version */ + char *newhost, /* ASCII version */ int port) { char buf[256]; diff --git a/lib/mime.c b/lib/mime.c index a90e062620..9ba55fe3d2 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -92,7 +92,7 @@ static const char base64enc[] = /* Quoted-printable character class table. * * We cannot rely on ctype functions since quoted-printable input data - * is assumed to be ascii-compatible, even on non-ascii platforms. */ + * is assumed to be ASCII-compatible, even on non-ASCII platforms. */ #define QP_OK 1 /* Can be represented by itself. */ #define QP_SP 2 /* Space or tab. */ #define QP_CR 3 /* Carriage return. */ @@ -557,7 +557,7 @@ static size_t encoder_qp_read(char *buffer, size_t size, bool ateof, /* On all platforms, input is supposed to be ASCII compatible: for this reason, we use hexadecimal ASCII codes in this function rather than - character constants that can be interpreted as non-ascii on some + character constants that can be interpreted as non-ASCII on some platforms. Preserve ASCII encoding on output too. */ while(st->bufbeg < st->bufend) { size_t len = 1; diff --git a/lib/setup-vms.h b/lib/setup-vms.h index fc21560284..33b74db358 100644 --- a/lib/setup-vms.h +++ b/lib/setup-vms.h @@ -101,7 +101,7 @@ static char *vms_translate_path(const char *path) } } # else - /* VMS translate path is actually not needed on the current 64 bit */ + /* VMS translate path is actually not needed on the current 64-bit */ /* VMS platforms, so instead of figuring out the pointer settings */ /* Change it to a noop */ # define vms_translate_path(__path) __path diff --git a/lib/strtoofft.c b/lib/strtoofft.c index 8fac230f2e..f1c7ba2711 100644 --- a/lib/strtoofft.c +++ b/lib/strtoofft.c @@ -207,7 +207,7 @@ static int get_char(char c, int base) #endif /* Only present if we need strtoll, but do not have it. */ /* - * Parse a *positive* up to 64-bit number written in ascii. + * Parse a *positive* up to 64-bit number written in ASCII. */ CURLofft curlx_strtoofft(const char *str, char **endp, int base, curl_off_t *num) diff --git a/lib/tftp.c b/lib/tftp.c index c4cc8049d6..c9463802fd 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -434,7 +434,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, struct Curl_easy *data = state->data; CURLcode result = CURLE_OK; - /* Set ascii mode if -B flag was used */ + /* Set ASCII mode if -B flag was used */ if(data->state.prefer_ascii) mode = "netascii"; diff --git a/lib/urldata.h b/lib/urldata.h index d16e00dfe5..8cacf1b088 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -759,7 +759,7 @@ struct Curl_handler { HTTP proxy as HTTP proxies may know this protocol and act as a gateway */ #define PROTOPT_WILDCARD (1<<12) /* protocol supports wildcard matching */ -#define PROTOPT_USERPWDCTRL (1<<13) /* Allow "control bytes" (< 32 ascii) in +#define PROTOPT_USERPWDCTRL (1<<13) /* Allow "control bytes" (< 32 ASCII) in username and password */ #define PROTOPT_NOTCPPROXY (1<<14) /* this protocol cannot proxy over TCP */ @@ -1494,7 +1494,7 @@ enum dupstring { #ifdef USE_SSH STRING_SSH_PRIVATE_KEY, /* path to the private key file for auth */ STRING_SSH_PUBLIC_KEY, /* path to the public key file for auth */ - STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ascii hex */ + STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ASCII hex */ STRING_SSH_HOST_PUBLIC_KEY_SHA256, /* sha256 of host public key in base64 */ STRING_SSH_KNOWNHOSTS, /* filename of knownhosts file */ #endif diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index f00e6651f8..4fc5b1c28f 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -142,7 +142,7 @@ bool Curl_auth_digest_get_pair(const char *str, char *value, char *content, } #if !defined(USE_WINDOWS_SSPI) -/* Convert md5 chunk to RFC2617 (section 3.1.3) -suitable ascii string */ +/* Convert md5 chunk to RFC2617 (section 3.1.3) -suitable ASCII string */ static void auth_digest_md5_to_ascii(unsigned char *source, /* 16 bytes */ unsigned char *dest) /* 33 bytes */ { @@ -151,7 +151,7 @@ static void auth_digest_md5_to_ascii(unsigned char *source, /* 16 bytes */ msnprintf((char *) &dest[i * 2], 3, "%02x", source[i]); } -/* Convert sha256 or SHA-512/256 chunk to RFC7616 -suitable ascii string */ +/* Convert sha256 or SHA-512/256 chunk to RFC7616 -suitable ASCII string */ static void auth_digest_sha256_to_ascii(unsigned char *source, /* 32 bytes */ unsigned char *dest) /* 65 bytes */ { diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index b2d91cb99e..ef7dceb561 100644 --- a/lib/vtls/schannel_verify.c +++ b/lib/vtls/schannel_verify.c @@ -452,7 +452,7 @@ static DWORD cert_get_name_string(struct Curl_easy *data, } dns_w = entry->pwszDNSName; /* pwszDNSName is in ia5 string format and hence does not contain any - * non-ascii characters. */ + * non-ASCII characters. */ while(*dns_w != '\0') { *current_pos++ = (TCHAR)(*dns_w++); } diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com index 1b023649f4..d8f89f6ef4 100644 --- a/packages/vms/build_vms.com +++ b/packages/vms/build_vms.com @@ -20,10 +20,10 @@ $! $! 64 Compile with 64-bit pointers. $! Note, you must match the pointer size that the OpenSSL $! shared image expects. -$! Currently curl is not building properly with 64 bit pointers -$! on VMS because it is trying to cast pointers to 32 bit +$! Currently curl is not building properly with 64-bit pointers +$! on VMS because it is trying to cast pointers to 32-bit $! integers and some OpenVMS library routines called by curl -$! do not yet support 64 bit pointers. +$! do not yet support 64-bit pointers. $! CCQUAL=x Add "x" to the C compiler qualifiers. $! Default qualifiers are: $! /standard=relaxed @@ -638,21 +638,21 @@ $ libzshr_line = "" $ try_shr = "gnv$libzshr" $ if build_64 $ then -$! First look for 64 bit +$! First look for 64-bit $ if f$search("''try_shr'64") .eqs. "" $ then -$! Second look for the J.F. Pieronne 64 bit shared image +$! Second look for the J.F. Pieronne 64-bit shared image $ try_shr = "LIBZ_SHR64" $ if f$search(try_shr) .eqs. "" then nozlib = 1 $ endif $ else -$! First look for 32 bit +$! First look for 32-bit $ if f$search("''try_shr'32") .eqs. "" $ then -$! Second look for old 32 bit image +$! Second look for old 32-bit image $ if f$search(try_shr) .eqs. "" $ then -$! Third look for the J.F. Pieronne 32 bit shared image +$! Third look for the J.F. Pieronne 32-bit shared image $ try_shr = "LIBZ_SHR32" $ if f$search(try_shr) .eqs. "" then nozlib = 1 $ endif diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index b54a1a0f96..8d231f4c97 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -1319,7 +1319,7 @@ $ search/out=nl: 'tfile1' - $ severity = '$severity' $! $! -$! Of course the 64 bit stuff is different +$! Of course the 64-bit stuff is different $!--------------------------------------------------------- $ if severity .ne. 1 .and. key64 $ then diff --git a/packages/vms/gnv_link_curl.com b/packages/vms/gnv_link_curl.com index 552d7d45dd..2acd49a6ad 100644 --- a/packages/vms/gnv_link_curl.com +++ b/packages/vms/gnv_link_curl.com @@ -123,7 +123,7 @@ $ endif $ endif $! $! Create the a new option file with special fixup for HP SSL -$! For a shared image, we always want ZLIB and 32 bit HPSSL +$! For a shared image, we always want ZLIB and 32-bit HPSSL $! $ if f$search("gnv$libzshr32") .eqs. "" $ then diff --git a/packages/vms/readme b/packages/vms/readme index eaf23e9427..042a22b807 100644 --- a/packages/vms/readme +++ b/packages/vms/readme @@ -173,7 +173,7 @@ the GNV tool kit, building a shared libcurl, and producing a PCSI kit for distribution. The curl_gnv_build_steps.text is included in the release notes file of the PCSI kit. -The building with 64 bit pointers does not currently work. +The building with 64-bit pointers does not currently work. The build procedure will detect if HP OpenSSL, LDAP, and Kerberos are installed and default to building with them. diff --git a/packages/vms/setup_gnv_curl_build.com b/packages/vms/setup_gnv_curl_build.com index 1685b6a2f4..49882463f3 100644 --- a/packages/vms/setup_gnv_curl_build.com +++ b/packages/vms/setup_gnv_curl_build.com @@ -66,9 +66,9 @@ $! Set the compiler options for GNV CC wrapper to inherit. $ cc :== cc'clist''cnames'/nested_include_directory=none $ cxx :== cxx'clist''cnames'/nested_include_directory=none $ pointer_size = "32" -$! Note 64 bit pointers requires all libraries to either have -$! 64 bit pointers or have #pragma directives. -$! Currently building curl on VMS with 64 bit pointers does not work. +$! Note 64-bit pointers requires all libraries to either have +$! 64-bit pointers or have #pragma directives. +$! Currently building curl on VMS with 64-bit pointers does not work. $! $! A logical name to make it easier to find some of the hacks. $ define/job gnv_hacks 'base_dir' diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 1a2e5374e3..729cd5241a 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -111,7 +111,7 @@ struct OperationConfig { bool sasl_ir; /* Enable/disable SASL initial response */ bool proxytunnel; bool ftp_append; /* APPE on ftp */ - bool use_ascii; /* select ascii or text transfer */ + bool use_ascii; /* select ASCII or text transfer */ bool autoreferer; /* automatically set referer */ bool failonerror; /* fail on (HTTP) errors */ bool failwithbody; /* fail on (HTTP) errors but still store body */ diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index aac8cb3958..7bd67093f2 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -52,7 +52,7 @@ CURLcode test(char *URL) test_setopt(curl, CURLOPT_PROXY_TRANSFER_MODE, 1L); test_setopt(curl, CURLOPT_VERBOSE, 1L); if(libtest_arg3) { - /* enable ascii/text mode */ + /* enable ASCII/text mode */ test_setopt(curl, CURLOPT_TRANSFERTEXT, 1L); } diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 0ecc0d62e3..c0d30d68c8 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -174,7 +174,7 @@ CURLcode test(char *URL) size_t i; static const char fill[] = "test data"; - config.trace_ascii = 1; /* enable ascii tracing */ + config.trace_ascii = 1; /* enable ASCII tracing */ global_init(CURL_GLOBAL_ALL); easy_init(curl); diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index afef684a4a..bda44a9d36 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -343,7 +343,7 @@ static struct tftphdr *r_init(void) Free it and return next buffer filled with data. */ static int readit(struct testcase *test, struct tftphdr **dpp, - int convert /* if true, convert to ascii */) + int convert /* if true, convert to ASCII */) { struct bf *b; @@ -359,11 +359,11 @@ static int readit(struct testcase *test, struct tftphdr **dpp, } /* - * fill the input buffer, doing ascii conversions if requested + * fill the input buffer, doing ASCII conversions if requested * conversions are lf -> cr, lf and cr -> cr, nul */ static void read_ahead(struct testcase *test, - int convert /* if true, convert to ascii */) + int convert /* if true, convert to ASCII */) { int i; char *p;