docs: misc language polish

- CURLINFO_FILETIME*: improve language
- add '32bit' and '64bit' as bad words, use 32-bit and 64-bit
- mksymbolsmanpage.pl: avoid "will"

Closes #14070
This commit is contained in:
Daniel Stenberg 2024-07-01 10:37:43 +02:00
parent ecd654e12e
commit 816ac2a866
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
22 changed files with 65 additions and 63 deletions

View file

@ -862,7 +862,7 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
}
else {
/* poll for name lookup done with exponential backoff up to 250ms */
/* should be fine even if this converts to 32 bit */
/* should be fine even if this converts to 32-bit */
timediff_t elapsed = Curl_timediff(Curl_now(),
data->progress.t_startsingle);
if(elapsed < 0)

View file

@ -158,7 +158,7 @@ static void setup_des_key(const unsigned char *key_56,
{
DES_cblock key;
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, (char *) &key);
/* Set the key parity to odd */
@ -175,7 +175,7 @@ static void setup_des_key(const unsigned char *key_56,
{
char key[8];
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
@ -193,7 +193,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
mbedtls_des_context ctx;
char key[8];
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
@ -214,7 +214,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
size_t out_len;
CCCryptorStatus err;
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, key);
/* Set the key parity to odd */
@ -240,7 +240,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
ctl.Func_ID = ENCRYPT_ONLY;
ctl.Data_Len = sizeof(key);
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, ctl.Crypto_Key);
/* Set the key parity to odd */
@ -278,7 +278,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
blob.hdr.aiKeyAlg = CALG_DES;
blob.len = sizeof(blob.key);
/* Expand the 56-bit key to 64-bits */
/* Expand the 56-bit key to 64 bits */
extend_key_56_to_64(key_56, blob.key);
/* Set the key parity to odd */

View file

@ -447,7 +447,7 @@
#endif
#ifndef SIZEOF_TIME_T
/* assume default size of time_t to be 32 bit */
/* assume default size of time_t to be 32 bits */
#define SIZEOF_TIME_T 4
#endif

View file

@ -277,8 +277,8 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
case CURLINFO_LASTSOCKET:
sockfd = Curl_getconnectinfo(data, NULL);
/* note: this is not a good conversion for systems with 64 bit sockets and
32 bit longs */
/* note: this is not a good conversion for systems with 64-bit sockets and
32-bit longs */
if(sockfd != CURL_SOCKET_BAD)
*param_longp = (long)sockfd;
else

View file

@ -33,7 +33,7 @@ struct connectdata;
/*
* The longest possible hexadecimal number we support in a chunked transfer.
* Neither RFC2616 nor the later HTTP specs define a maximum chunk size.
* For 64 bit curl_off_t we support 16 digits. For 32 bit, 8 digits.
* For 64-bit curl_off_t we support 16 digits. For 32-bit, 8 digits.
*/
#define CHUNK_MAXNUM_LEN (SIZEOF_CURL_OFF_T * 2)

View file

@ -3406,8 +3406,8 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,
if(Curl_splaycomparekeys(multi->timetree->key, now) > 0) {
/* some time left before expiration */
timediff_t diff = Curl_timediff_ceil(multi->timetree->key, now);
/* this should be safe even on 32 bit archs, as we don't use that
overly long timeouts */
/* this should be safe even on 32-bit archs, as we don't use that overly
long timeouts */
*timeout_ms = (long)diff;
}
else
@ -3572,7 +3572,7 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
DEBUGASSERT(id < EXPIRE_LAST);
set = Curl_now();
set.tv_sec += (time_t)(milli/1000); /* might be a 64 to 32 bit conversion */
set.tv_sec += (time_t)(milli/1000); /* might be a 64 to 32 bits conversion */
set.tv_usec += (int)(milli%1000)*1000;
if(set.tv_usec >= 1000000) {

View file

@ -521,13 +521,13 @@ static int parsedate(const char *date, time_t *output)
#if (SIZEOF_TIME_T < 5)
#ifdef HAVE_TIME_T_UNSIGNED
/* an unsigned 32 bit time_t can only hold dates to 2106 */
/* an unsigned 32-bit time_t can only hold dates to 2106 */
if(yearnum > 2105) {
*output = TIME_T_MAX;
return PARSEDATE_LATER;
}
#else
/* a signed 32 bit time_t can only hold dates to the beginning of 2038 */
/* a signed 32-bit time_t can only hold dates to the beginning of 2038 */
if(yearnum > 2037) {
*output = TIME_T_MAX;
return PARSEDATE_LATER;
@ -549,7 +549,7 @@ static int parsedate(const char *date, time_t *output)
return PARSEDATE_FAIL; /* clearly an illegal date */
/* time2epoch() returns a time_t. time_t is often 32 bits, sometimes even on
architectures that feature 64 bit 'long' but ultimately time_t is the
architectures that feature a 64 bits 'long' but ultimately time_t is the
correct data type to use.
*/
t = time2epoch(secnum, minnum, hournum, mdaynum, monnum, yearnum);

View file

@ -2667,7 +2667,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
/*
* Use this scope id when using IPv6
* We always get longs when passed plain numericals so we should check
* that the value fits into an unsigned 32 bit integer.
* that the value fits into an unsigned 32-bit integer.
*/
uarg = va_arg(param, unsigned long);
#if SIZEOF_LONG > 4

View file

@ -144,7 +144,7 @@ static struct passwd *vms_getpwuid(uid_t uid)
{
struct passwd *my_passwd;
/* Hack needed to support 64 bit builds, decc_getpwnam is 32 bit only */
/* Hack needed to support 64-bit builds, decc_getpwnam is 32-bit only */
#ifdef __DECC
# if __INITIAL_POINTER_SIZE
__char_ptr32 unix_path;

View file

@ -30,7 +30,7 @@
* Determine which string to integral data type conversion function we use
* to implement string conversion to our curl_off_t integral data type.
*
* Notice that curl_off_t might be 64 or 32 bit wide, and that it might use
* Notice that curl_off_t might be 64 or 32 bits wide, and that it might use
* an underlying data type which might be 'long', 'int64_t', 'long long' or
* '__int64' and more remotely other data types.
*

View file

@ -26,7 +26,7 @@
#include "curl_setup.h"
/* Use a larger type even for 32 bit time_t systems so that we can keep
/* Use a larger type even for 32-bit time_t systems so that we can keep
microsecond accuracy in it */
typedef curl_off_t timediff_t;
#define CURL_FORMAT_TIMEDIFF_T CURL_FORMAT_CURL_OFF_T

View file

@ -57,7 +57,7 @@ struct ws_encoder {
curl_off_t payload_len; /* payload length of current frame */
curl_off_t payload_remain; /* remaining payload of current */
unsigned int xori; /* xor index */
unsigned char mask[4]; /* 32 bit mask for this connection */
unsigned char mask[4]; /* 32-bit mask for this connection */
unsigned char firstbyte; /* first byte of frame we encode */
bool contfragment; /* set TRUE if the previous fragment sent was not final */
};